Просмотр исходного кода

replace marked with 8fold-marked

Yuki Takei 8 лет назад
Родитель
Сommit
860cf64612
3 измененных файлов с 73 добавлено и 43 удалено
  1. 1 1
      package.json
  2. 1 1
      resource/js/util/CrowiRenderer.js
  3. 71 41
      yarn.lock

+ 1 - 1
package.json

@@ -44,6 +44,7 @@
     "webpack": "webpack"
     "webpack": "webpack"
   },
   },
   "dependencies": {
   "dependencies": {
+    "8fold-marked": "^0.3.7",
     "assets-webpack-plugin": "~3.5.1",
     "assets-webpack-plugin": "~3.5.1",
     "async": "^2.3.0",
     "async": "^2.3.0",
     "aws-sdk": "^2.80.0",
     "aws-sdk": "^2.80.0",
@@ -85,7 +86,6 @@
     "i18next-sprintf-postprocessor": "^0.2.2",
     "i18next-sprintf-postprocessor": "^0.2.2",
     "inline-attachment": "~2.0.3",
     "inline-attachment": "~2.0.3",
     "jquery.cookie": "~1.4.1",
     "jquery.cookie": "~1.4.1",
-    "marked": "~0.3.6",
     "md5": "^2.2.1",
     "md5": "^2.2.1",
     "method-override": "^2.3.10",
     "method-override": "^2.3.10",
     "mkdirp": "~0.5.1",
     "mkdirp": "~0.5.1",

+ 1 - 1
resource/js/util/CrowiRenderer.js

@@ -1,4 +1,4 @@
-import marked from 'marked';
+import marked from '8fold-marked';
 import hljs from 'highlight.js';
 import hljs from 'highlight.js';
 
 
 import MarkdownFixer from './PreProcessor/MarkdownFixer';
 import MarkdownFixer from './PreProcessor/MarkdownFixer';

+ 71 - 41
yarn.lock

@@ -2,6 +2,10 @@
 # yarn lockfile v1
 # yarn lockfile v1
 
 
 
 
+"8fold-marked@^0.3.7":
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/8fold-marked/-/8fold-marked-0.3.7.tgz#dd8b40de0b290520782f7d5f6acd105887e5227b"
+
 "@ciscospark/common-timers@1.1.11":
 "@ciscospark/common-timers@1.1.11":
   version "1.1.11"
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/@ciscospark/common-timers/-/common-timers-1.1.11.tgz#a30f6fccf2a151804b4a9c690b0500d19e2cc676"
   resolved "https://registry.yarnpkg.com/@ciscospark/common-timers/-/common-timers-1.1.11.tgz#a30f6fccf2a151804b4a9c690b0500d19e2cc676"
@@ -198,7 +202,7 @@ accepts@1.3.3:
     mime-types "~2.1.11"
     mime-types "~2.1.11"
     negotiator "0.6.1"
     negotiator "0.6.1"
 
 
-accepts@~1.3.3:
+accepts@~1.3.3, accepts@~1.3.4:
   version "1.3.4"
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
   dependencies:
   dependencies:
@@ -1206,7 +1210,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
 
 
-body-parser@^1.17.1:
+body-parser@1.18.2, body-parser@^1.17.1:
   version "1.18.2"
   version "1.18.2"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
   dependencies:
   dependencies:
@@ -2080,7 +2084,7 @@ debug@2.6.9:
   dependencies:
   dependencies:
     ms "2.0.0"
     ms "2.0.0"
 
 
-debug@^3.0.0:
+debug@^3.1.0:
   version "3.1.0"
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   dependencies:
   dependencies:
@@ -2626,38 +2630,40 @@ express@^4.15.2:
     utils-merge "1.0.0"
     utils-merge "1.0.0"
     vary "~1.1.1"
     vary "~1.1.1"
 
 
-express@~4.15.2:
-  version "4.15.5"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.15.5.tgz#670235ca9598890a5ae8170b83db722b842ed927"
+express@^4.16.1:
+  version "4.16.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.16.1.tgz#6b33b560183c9b253b7b62144df33a4654ac9ed0"
   dependencies:
   dependencies:
-    accepts "~1.3.3"
+    accepts "~1.3.4"
     array-flatten "1.1.1"
     array-flatten "1.1.1"
+    body-parser "1.18.2"
     content-disposition "0.5.2"
     content-disposition "0.5.2"
-    content-type "~1.0.2"
+    content-type "~1.0.4"
     cookie "0.3.1"
     cookie "0.3.1"
     cookie-signature "1.0.6"
     cookie-signature "1.0.6"
     debug "2.6.9"
     debug "2.6.9"
     depd "~1.1.1"
     depd "~1.1.1"
     encodeurl "~1.0.1"
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
     escape-html "~1.0.3"
-    etag "~1.8.0"
-    finalhandler "~1.0.6"
+    etag "~1.8.1"
+    finalhandler "1.1.0"
     fresh "0.5.2"
     fresh "0.5.2"
     merge-descriptors "1.0.1"
     merge-descriptors "1.0.1"
     methods "~1.1.2"
     methods "~1.1.2"
     on-finished "~2.3.0"
     on-finished "~2.3.0"
-    parseurl "~1.3.1"
+    parseurl "~1.3.2"
     path-to-regexp "0.1.7"
     path-to-regexp "0.1.7"
-    proxy-addr "~1.1.5"
-    qs "6.5.0"
+    proxy-addr "~2.0.2"
+    qs "6.5.1"
     range-parser "~1.2.0"
     range-parser "~1.2.0"
-    send "0.15.6"
-    serve-static "1.12.6"
-    setprototypeof "1.0.3"
+    safe-buffer "5.1.1"
+    send "0.16.1"
+    serve-static "1.13.1"
+    setprototypeof "1.1.0"
     statuses "~1.3.1"
     statuses "~1.3.1"
     type-is "~1.6.15"
     type-is "~1.6.15"
-    utils-merge "1.0.0"
-    vary "~1.1.1"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
 
 
 extend@^3.0.0, extend@~3.0.0:
 extend@^3.0.0, extend@~3.0.0:
   version "3.0.1"
   version "3.0.1"
@@ -2713,11 +2719,12 @@ fbjs@^0.8.9:
     setimmediate "^1.0.5"
     setimmediate "^1.0.5"
     ua-parser-js "^0.7.9"
     ua-parser-js "^0.7.9"
 
 
-file-loader@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.11.2.tgz#4ff1df28af38719a6098093b88c82c71d1794a34"
+file-loader@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.3.tgz#ad5d143d8b614114873df3661ab5c9b8ebd5345a"
   dependencies:
   dependencies:
     loader-utils "^1.0.2"
     loader-utils "^1.0.2"
+    schema-utils "^0.3.0"
 
 
 file-type@^3.9.0:
 file-type@^3.9.0:
   version "3.9.0"
   version "3.9.0"
@@ -2743,27 +2750,27 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
     repeat-string "^1.5.2"
 
 
-finalhandler@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.4.tgz#18574f2e7c4b98b8ae3b230c21f201f31bdb3fb7"
+finalhandler@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
   dependencies:
   dependencies:
-    debug "2.6.8"
+    debug "2.6.9"
     encodeurl "~1.0.1"
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
     escape-html "~1.0.3"
     on-finished "~2.3.0"
     on-finished "~2.3.0"
-    parseurl "~1.3.1"
+    parseurl "~1.3.2"
     statuses "~1.3.1"
     statuses "~1.3.1"
     unpipe "~1.0.0"
     unpipe "~1.0.0"
 
 
-finalhandler@~1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.6.tgz#007aea33d1a4d3e42017f624848ad58d212f814f"
+finalhandler@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.4.tgz#18574f2e7c4b98b8ae3b230c21f201f31bdb3fb7"
   dependencies:
   dependencies:
-    debug "2.6.9"
+    debug "2.6.8"
     encodeurl "~1.0.1"
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
     escape-html "~1.0.3"
     on-finished "~2.3.0"
     on-finished "~2.3.0"
-    parseurl "~1.3.2"
+    parseurl "~1.3.1"
     statuses "~1.3.1"
     statuses "~1.3.1"
     unpipe "~1.0.0"
     unpipe "~1.0.0"
 
 
@@ -2877,6 +2884,10 @@ forwarded@~0.1.0:
   version "0.1.1"
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.1.tgz#8a4e30c640b05395399a3549c730257728048961"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.1.tgz#8a4e30c640b05395399a3549c730257728048961"
 
 
+forwarded@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+
 fresh@0.5.0:
 fresh@0.5.0:
   version "0.5.0"
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
@@ -3341,6 +3352,10 @@ ipaddr.js@1.4.0:
   version "1.4.0"
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.4.0.tgz#296aca878a821816e5b85d0a285a99bcff4582f0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.4.0.tgz#296aca878a821816e5b85d0a285a99bcff4582f0"
 
 
+ipaddr.js@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"
+
 is-absolute-url@^2.0.0:
 is-absolute-url@^2.0.0:
   version "2.1.0"
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
@@ -4088,7 +4103,7 @@ marked-terminal@^1.6.2:
     lodash.assign "^4.2.0"
     lodash.assign "^4.2.0"
     node-emoji "^1.4.1"
     node-emoji "^1.4.1"
 
 
-marked@^0.3.6, marked@~0.3.6:
+marked@^0.3.6:
   version "0.3.6"
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.6.tgz#b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7"
   resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.6.tgz#b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7"
 
 
@@ -4147,7 +4162,7 @@ merge-descriptors@1.0.1:
   version "1.0.1"
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
 
 
-method-override@~2.3.1:
+method-override@^2.3.10:
   version "2.3.10"
   version "2.3.10"
   resolved "https://registry.yarnpkg.com/method-override/-/method-override-2.3.10.tgz#e3daf8d5dee10dd2dce7d4ae88d62bbee77476b4"
   resolved "https://registry.yarnpkg.com/method-override/-/method-override-2.3.10.tgz#e3daf8d5dee10dd2dce7d4ae88d62bbee77476b4"
   dependencies:
   dependencies:
@@ -4199,6 +4214,10 @@ mime@1.3.4:
   version "1.3.4"
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
 
+mime@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+
 mime@^1.2.11:
 mime@^1.2.11:
   version "1.4.0"
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.0.tgz#69e9e0db51d44f2a3b56e48b7817d7d137f1a343"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.0.tgz#69e9e0db51d44f2a3b56e48b7817d7d137f1a343"
@@ -5310,6 +5329,13 @@ proxy-addr@~1.1.5:
     forwarded "~0.1.0"
     forwarded "~0.1.0"
     ipaddr.js "1.4.0"
     ipaddr.js "1.4.0"
 
 
+proxy-addr@~2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec"
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.5.2"
+
 prr@~0.0.0:
 prr@~0.0.0:
   version "0.0.0"
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
   resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
@@ -5966,9 +5992,9 @@ send@0.15.4:
     range-parser "~1.2.0"
     range-parser "~1.2.0"
     statuses "~1.3.1"
     statuses "~1.3.1"
 
 
-send@0.15.6:
-  version "0.15.6"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.15.6.tgz#20f23a9c925b762ab82705fe2f9db252ace47e34"
+send@0.16.1:
+  version "0.16.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
   dependencies:
   dependencies:
     debug "2.6.9"
     debug "2.6.9"
     depd "~1.1.1"
     depd "~1.1.1"
@@ -5978,7 +6004,7 @@ send@0.15.6:
     etag "~1.8.1"
     etag "~1.8.1"
     fresh "0.5.2"
     fresh "0.5.2"
     http-errors "~1.6.2"
     http-errors "~1.6.2"
-    mime "1.3.4"
+    mime "1.4.1"
     ms "2.0.0"
     ms "2.0.0"
     on-finished "~2.3.0"
     on-finished "~2.3.0"
     range-parser "~1.2.0"
     range-parser "~1.2.0"
@@ -5993,14 +6019,14 @@ serve-static@1.12.4:
     parseurl "~1.3.1"
     parseurl "~1.3.1"
     send "0.15.4"
     send "0.15.4"
 
 
-serve-static@1.12.6:
-  version "1.12.6"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.6.tgz#b973773f63449934da54e5beba5e31d9f4211577"
+serve-static@1.13.1:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719"
   dependencies:
   dependencies:
     encodeurl "~1.0.1"
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
     escape-html "~1.0.3"
     parseurl "~1.3.2"
     parseurl "~1.3.2"
-    send "0.15.6"
+    send "0.16.1"
 
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   version "2.0.0"
@@ -6018,6 +6044,10 @@ setprototypeof@1.0.3:
   version "1.0.3"
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
 
 
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+
 sha.js@^2.4.0, sha.js@^2.4.8:
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.8"
   version "2.4.8"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f"