GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-02 05:03:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Marko: Upgrade loader & config (#7459)

Browse Source 
Marko: Upgrade loader & config
This commit is contained in:
Michael Shilman 2019-07-20 10:40:09 +08:00 committed by GitHub
commit 9702d3a4bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/marko/package.json
View File

@ -26,18 +26,16 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@marko/webpack": "^1.2.0",
"@storybook/core": "5.2.0-beta.3",
"common-tags": "^1.8.0",
"core-js": "^3.0.1",
"global": "^4.3.2",
"marko-loader": "^1.5.0",
"raw-loader": "^2.0.0",
"regenerator-runtime": "^0.12.1"
},
"peerDependencies": {
"babel-loader": "^7.0.0 || ^8.0.0",
"marko": "^4.15.2",
"marko-widgets": "^7.0.1"
"marko": "^4.15.2"
},
"engines": {
"node": ">=8.0.0"

2
app/marko/src/server/framework-preset-marko.js
View File

@ -7,7 +7,7 @@ export function webpack(config) {
...config.module.rules,
{
test: /\.marko$/,
loader: require.resolve('marko-loader'),
loader: require.resolve('@marko/webpack/loader'),
options: {
compiler: require.resolve('marko/compiler'),
},

36
yarn.lock
View File

@ -3211,6 +3211,17 @@
npmlog "^4.1.2"
write-file-atomic "^2.3.0"
"@marko/webpack@^1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@marko/webpack/-/webpack-1.2.0.tgz#8678f2770b97edb2c0b2fa1357e2785601ef6835"
integrity sha512-iK+ANfVIkNUylLHJLPNXVJF9yBKYsxwm8d3SpcplLTDFYNOrSgpnfX0TedMXAEstQV8aLZA/nDBr4aCwYMlI3Q==
dependencies:
base-x "^3.0.5"
lasso-modules-client "^2.0.5"
loader-utils "^1.2.3"
sort-keys "^2.0.0"
webpack-virtual-modules "^0.1.10"
"@mdx-js/loader@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-1.1.0.tgz#1acc2b78ff30125f6c0ccf6d70c3cd4df8697cf4"
@ -7115,6 +7126,13 @@ balanced-match@^1.0.0:
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
base-x@^3.0.5:
version "3.0.6"
resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.6.tgz#de047ec95f5f7b99ae63d830a2a894c96538b2cd"
integrity sha512-4PaF8u2+AlViJxRVjurkLTxpp7CaFRD/jo5rPT9ONnKxyhQ8f59yzamEvq7EkriG56yn5On4ONyaG75HLqr46w==
dependencies:
safe-buffer "^5.0.1"
base32.js@0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/base32.js/-/base32.js-0.1.0.tgz#b582dec693c2f11e893cf064ee6ac5b6131a2202"
@ -10326,7 +10344,7 @@ debug@3.1.0, debug@~3.1.0:
dependencies:
ms "2.0.0"
debug@^3.0.1, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
version "3.2.6"
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@ -18390,7 +18408,7 @@ loader-runner@^2.3.0:
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
loader-utils@1.2.3, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.0.3, loader-utils@^1.1.0, loader-utils@^1.2.2, loader-utils@^1.2.3:
loader-utils@1.2.3, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.2, loader-utils@^1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
@ -19349,13 +19367,6 @@ markerwithlabel@^2.0.1:
resolved "https://registry.yarnpkg.com/markerwithlabel/-/markerwithlabel-2.0.2.tgz#fa6aee4abb0ee553e24e2b708226858f58b8729e"
integrity sha512-C/cbm1A0h/u54gwHk5ZJNdUU3V3+1BbCpRPMsMyFA7vF4yL+aB4rWpxACz29TpQ+cTg6/iQroExh0PMSRGtQFg==
marko-loader@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/marko-loader/-/marko-loader-1.5.0.tgz#bc09ee3a1b03f7258f3edf957f82746bf0746859"
integrity sha512-1j5KfsD2WjBWDHimDq/VoCt9B/Ia9U5CRNsRg5isx3br2D9ORqYmdPlatVYAG74V8mMqSosxN/3f4YGtaTBwsw==
dependencies:
loader-utils "^1.0.3"
marko-starter-generic-server@^1.0.0:
version "1.0.5"
resolved "https://registry.yarnpkg.com/marko-starter-generic-server/-/marko-starter-generic-server-1.0.5.tgz#95db60682523723cc10b7d623b2914ebeb3ce4cb"
@ -30946,6 +30957,13 @@ webpack-subresource-integrity@1.1.0-rc.6:
dependencies:
webpack-core "^0.6.8"
webpack-virtual-modules@^0.1.10:
version "0.1.10"
resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.1.10.tgz#2039529cbf1007e19f6e897c8d35721cc2c41f68"
integrity sha1-IDlSnL8QB+Gfbol8jTVyHMLEH2g=
dependencies:
debug "^3.0.0"
webpack@4.24.0:
version "4.24.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.24.0.tgz#d9822c91eeb595f7351aa5dd785a1952f9c4340a"