From ecf651f71d414772de11d9acd143e07c87089ec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Sat, 31 Aug 2019 15:34:31 +0200 Subject: [PATCH 01/13] Enforces require.resolve for loaders --- packages/@vue/cli-plugin-babel/index.js | 6 ++--- packages/@vue/cli-plugin-babel/package.json | 2 ++ packages/@vue/cli-plugin-eslint/index.js | 2 +- .../__tests__/tsPluginBabel.spec.js | 6 ++--- packages/@vue/cli-plugin-typescript/index.js | 13 ++++++---- .../@vue/cli-plugin-typescript/package.json | 2 ++ packages/@vue/cli-service/lib/config/base.js | 18 +++++++------- packages/@vue/cli-service/lib/config/css.js | 10 ++++---- packages/@vue/cli-service/package.json | 24 ++++++++++++++++++- packages/@vue/cli-ui/index.js | 2 +- 10 files changed, 57 insertions(+), 28 deletions(-) diff --git a/packages/@vue/cli-plugin-babel/index.js b/packages/@vue/cli-plugin-babel/index.js index ac55104372..182b2f539b 100644 --- a/packages/@vue/cli-plugin-babel/index.js +++ b/packages/@vue/cli-plugin-babel/index.js @@ -45,7 +45,7 @@ module.exports = (api, options) => { }) .end() .use('cache-loader') - .loader('cache-loader') + .loader(require.resolve('cache-loader')) .options(api.genCacheConfig('babel-loader', { '@babel/core': require('@babel/core/package.json').version, '@vue/babel-preset-app': require('@vue/babel-preset-app/package.json').version, @@ -61,7 +61,7 @@ module.exports = (api, options) => { if (useThreads) { const threadLoaderConfig = jsRule .use('thread-loader') - .loader('thread-loader') + .loader(require.resolve('thread-loader')) if (typeof options.parallel === 'number') { threadLoaderConfig.options({ workers: options.parallel }) @@ -70,6 +70,6 @@ module.exports = (api, options) => { jsRule .use('babel-loader') - .loader('babel-loader') + .loader(require.resolve('babel-loader')) }) } diff --git a/packages/@vue/cli-plugin-babel/package.json b/packages/@vue/cli-plugin-babel/package.json index 59665ecf09..fe76f9a732 100644 --- a/packages/@vue/cli-plugin-babel/package.json +++ b/packages/@vue/cli-plugin-babel/package.json @@ -24,6 +24,8 @@ "@vue/babel-preset-app": "^4.0.0-rc.0", "@vue/cli-shared-utils": "^4.0.0-rc.0", "babel-loader": "^8.0.6", + "cache-loader": "^2.0.1", + "thread-loader": "^2.1.2", "webpack": "^4.0.0" }, "peerDependencies": { diff --git a/packages/@vue/cli-plugin-eslint/index.js b/packages/@vue/cli-plugin-eslint/index.js index 0051a0645f..adf045b673 100644 --- a/packages/@vue/cli-plugin-eslint/index.js +++ b/packages/@vue/cli-plugin-eslint/index.js @@ -45,7 +45,7 @@ module.exports = (api, options) => { .end() .test(/\.(vue|(j|t)sx?)$/) .use('eslint-loader') - .loader('eslint-loader') + .loader(require.resolve('eslint-loader')) .options({ extensions, cache: true, diff --git a/packages/@vue/cli-plugin-typescript/__tests__/tsPluginBabel.spec.js b/packages/@vue/cli-plugin-typescript/__tests__/tsPluginBabel.spec.js index 55c98790c1..42b1af65d9 100644 --- a/packages/@vue/cli-plugin-typescript/__tests__/tsPluginBabel.spec.js +++ b/packages/@vue/cli-plugin-typescript/__tests__/tsPluginBabel.spec.js @@ -16,9 +16,9 @@ test('using correct loader', () => { const config = service.resolveWebpackConfig() // eslint-disable-next-line no-shadow const rule = config.module.rules.find(rule => rule.test.test('foo.ts')) - expect(rule.use[0].loader).toMatch('cache-loader') - expect(rule.use[1].loader).toMatch('babel-loader') - expect(rule.use[2].loader).toMatch('ts-loader') + expect(rule.use[0].loader).toMatch(require.resolve('cache-loader')) + expect(rule.use[1].loader).toMatch(require.resolve('babel-loader')) + expect(rule.use[2].loader).toMatch(require.resolve('ts-loader')) }) const creatorOptions = { diff --git a/packages/@vue/cli-plugin-typescript/index.js b/packages/@vue/cli-plugin-typescript/index.js index e01d681cda..6a743454c6 100644 --- a/packages/@vue/cli-plugin-typescript/index.js +++ b/packages/@vue/cli-plugin-typescript/index.js @@ -28,7 +28,7 @@ module.exports = (api, projectOptions) => { } addLoader({ - loader: 'cache-loader', + loader: require.resolve('cache-loader'), options: api.genCacheConfig('ts-loader', { 'ts-loader': require('ts-loader/package.json').version, 'typescript': require('typescript/package.json').version, @@ -38,7 +38,7 @@ module.exports = (api, projectOptions) => { if (useThreads) { addLoader({ - loader: 'thread-loader', + loader: require.resolve('thread-loader'), options: typeof projectOptions.parallel === 'number' ? { workers: projectOptions.parallel } @@ -48,11 +48,14 @@ module.exports = (api, projectOptions) => { if (api.hasPlugin('babel')) { addLoader({ - loader: 'babel-loader' + // TODO: I guess the intent is to require the `babel-loader` provided by the Babel vue + // plugin, but that means we now rely on the hoisting. It should instead we queried + // against the plugin itself, or through a peer dependency. + loader: require.resolve('babel-loader') }) } addLoader({ - loader: 'ts-loader', + loader: require.resolve('ts-loader'), options: { transpileOnly: true, appendTsSuffixTo: ['\\.vue$'], @@ -61,7 +64,7 @@ module.exports = (api, projectOptions) => { } }) // make sure to append TSX suffix - tsxRule.use('ts-loader').loader('ts-loader').tap(options => { + tsxRule.use('ts-loader').loader(require.resolve('ts-loader')).tap(options => { options = Object.assign({}, options) delete options.appendTsSuffixTo options.appendTsxSuffixTo = ['\\.vue$'] diff --git a/packages/@vue/cli-plugin-typescript/package.json b/packages/@vue/cli-plugin-typescript/package.json index 25a5510ac4..0d144bd86b 100644 --- a/packages/@vue/cli-plugin-typescript/package.json +++ b/packages/@vue/cli-plugin-typescript/package.json @@ -25,8 +25,10 @@ "dependencies": { "@types/webpack-env": "^1.13.9", "@vue/cli-shared-utils": "^4.0.0-rc.0", + "cache-loader": "^2.0.1", "fork-ts-checker-webpack-plugin": "^1.3.4", "globby": "^9.2.0", + "thread-loader": "^2.1.2", "ts-loader": "^6.0.1", "tslint": "^5.16.0", "webpack": "^4.0.0", diff --git a/packages/@vue/cli-service/lib/config/base.js b/packages/@vue/cli-service/lib/config/base.js index 37a2281958..53da0601eb 100644 --- a/packages/@vue/cli-service/lib/config/base.js +++ b/packages/@vue/cli-service/lib/config/base.js @@ -79,11 +79,11 @@ module.exports = (api, options) => { .rule('vue') .test(/\.vue$/) .use('cache-loader') - .loader('cache-loader') + .loader(require.resolve('cache-loader')) .options(vueLoaderCacheConfig) .end() .use('vue-loader') - .loader('vue-loader') + .loader(require.resolve('vue-loader')) .options(Object.assign({ compilerOptions: { whitespace: 'condense' @@ -100,7 +100,7 @@ module.exports = (api, options) => { .rule('images') .test(/\.(png|jpe?g|gif|webp)(\?.*)?$/) .use('url-loader') - .loader('url-loader') + .loader(require.resolve('url-loader')) .options(genUrlLoaderOptions('img')) // do not base64-inline SVGs. @@ -109,7 +109,7 @@ module.exports = (api, options) => { .rule('svg') .test(/\.(svg)(\?.*)?$/) .use('file-loader') - .loader('file-loader') + .loader(require.resolve('file-loader')) .options({ name: genAssetSubPath('img') }) @@ -118,14 +118,14 @@ module.exports = (api, options) => { .rule('media') .test(/\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/) .use('url-loader') - .loader('url-loader') + .loader(require.resolve('url-loader')) .options(genUrlLoaderOptions('media')) webpackConfig.module .rule('fonts') .test(/\.(woff2?|eot|ttf|otf)(\?.*)?$/i) .use('url-loader') - .loader('url-loader') + .loader(require.resolve('url-loader')) .options(genUrlLoaderOptions('fonts')) // Other common pre-processors --------------------------------------------- @@ -136,15 +136,15 @@ module.exports = (api, options) => { .oneOf('pug-vue') .resourceQuery(/vue/) .use('pug-plain-loader') - .loader('pug-plain-loader') + .loader(require.resolve('pug-plain-loader')) .end() .end() .oneOf('pug-template') .use('raw') - .loader('raw-loader') + .loader(require.resolve('raw-loader')) .end() .use('pug-plain-loader') - .loader('pug-plain-loader') + .loader(require.resolve('pug-plain-loader')) .end() .end() diff --git a/packages/@vue/cli-service/lib/config/css.js b/packages/@vue/cli-service/lib/config/css.js index 2133924be4..d397734c91 100644 --- a/packages/@vue/cli-service/lib/config/css.js +++ b/packages/@vue/cli-service/lib/config/css.js @@ -113,7 +113,7 @@ module.exports = (api, rootOptions) => { } else { rule .use('vue-style-loader') - .loader('vue-style-loader') + .loader(require.resolve('vue-style-loader')) .options({ sourceMap, shadowMode @@ -140,13 +140,13 @@ module.exports = (api, rootOptions) => { rule .use('css-loader') - .loader('css-loader') + .loader(require.resolve('css-loader')) .options(cssLoaderOptions) if (needInlineMinification) { rule .use('cssnano') - .loader('postcss-loader') + .loader(require.resolve('postcss-loader')) .options({ sourceMap, plugins: [require('cssnano')(cssnanoOptions)] @@ -156,14 +156,14 @@ module.exports = (api, rootOptions) => { if (hasPostCSSConfig) { rule .use('postcss-loader') - .loader('postcss-loader') + .loader(require.resolve('postcss-loader')) .options(Object.assign({ sourceMap }, loaderOptions.postcss)) } if (loader) { rule .use(loader) - .loader(loader) + .loader(require.resolve(loader)) .options(Object.assign({ sourceMap }, options)) } } diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json index 0dd3464138..a1f8ea32c8 100644 --- a/packages/@vue/cli-service/package.json +++ b/packages/@vue/cli-service/package.json @@ -80,7 +80,29 @@ "webpack-merge": "^4.2.1" }, "peerDependencies": { - "vue-template-compiler": "^2.0.0" + "less-loader": "*", + "pug-plain-loader": "*", + "raw-loader": "*", + "sass-loader": "*", + "stylus-loader": "*", + "vue-template-compiler": "^2.0.0", + }, + "peerDependenciesMeta": { + "less-loader": { + "optional": true + }, + "pug-plain-loader": { + "optional": true + }, + "raw-loader": { + "optional": true + }, + "sass-loader": { + "optional": true + }, + "stylus-loader": { + "optional": true + } }, "devDependencies": { "fibers": ">= 3.1.1 <5.0.0", diff --git a/packages/@vue/cli-ui/index.js b/packages/@vue/cli-ui/index.js index 02cb14e15f..0f7722cb89 100644 --- a/packages/@vue/cli-ui/index.js +++ b/packages/@vue/cli-ui/index.js @@ -23,7 +23,7 @@ exports.clientAddonConfig = function ({ id, port = 8042 }) { .rule('gql') .test(/\.(gql|graphql)$/) .use('gql-loader') - .loader('graphql-tag/loader') + .loader(require.resolve('graphql-tag/loader')) .end() }, devServer: { From be03fb979d3b418ae800bb21a163121666913b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Sat, 31 Aug 2019 15:39:45 +0200 Subject: [PATCH 02/13] Updates the lockfile --- packages/@vue/cli-service/package.json | 2 +- yarn.lock | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json index a1f8ea32c8..c29f8355db 100644 --- a/packages/@vue/cli-service/package.json +++ b/packages/@vue/cli-service/package.json @@ -85,7 +85,7 @@ "raw-loader": "*", "sass-loader": "*", "stylus-loader": "*", - "vue-template-compiler": "^2.0.0", + "vue-template-compiler": "^2.0.0" }, "peerDependenciesMeta": { "less-loader": { diff --git a/yarn.lock b/yarn.lock index 6245800b79..cdd55184d2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4224,6 +4224,17 @@ cache-base@^1.0.1: union-value "^1.0.0" unset-value "^1.0.0" +cache-loader@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/cache-loader/-/cache-loader-2.0.1.tgz#5758f41a62d7c23941e3c3c7016e6faeb03acb07" + integrity sha512-V99T3FOynmGx26Zom+JrVBytLBsmUCzVG2/4NnUKgvXN4bEV42R1ERl1IyiH/cvFIDA1Ytq2lPZ9tXDSahcQpQ== + dependencies: + loader-utils "^1.1.0" + mkdirp "^0.5.1" + neo-async "^2.6.0" + normalize-path "^3.0.0" + schema-utils "^1.0.0" + cache-loader@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/cache-loader/-/cache-loader-3.0.1.tgz#cee6cf4b3cdc7c610905b26bad6c2fc439c821af" From d23d3113999a62b4fa8aeadd1625d11814100bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Sat, 31 Aug 2019 15:54:33 +0200 Subject: [PATCH 03/13] Fixes more things --- packages/@vue/babel-preset-app/package.json | 3 +++ packages/@vue/cli-service/lib/config/base.js | 14 +++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/packages/@vue/babel-preset-app/package.json b/packages/@vue/babel-preset-app/package.json index 186d61604a..96758591ae 100644 --- a/packages/@vue/babel-preset-app/package.json +++ b/packages/@vue/babel-preset-app/package.json @@ -36,5 +36,8 @@ "babel-plugin-module-resolver": "^3.2.0", "core-js": "^3.1.2", "core-js-compat": "^3.1.2" + }, + "peerDependencies": { + "@babel/core": "*" } } diff --git a/packages/@vue/cli-service/lib/config/base.js b/packages/@vue/cli-service/lib/config/base.js index 53da0601eb..1f48798264 100644 --- a/packages/@vue/cli-service/lib/config/base.js +++ b/packages/@vue/cli-service/lib/config/base.js @@ -130,21 +130,29 @@ module.exports = (api, options) => { // Other common pre-processors --------------------------------------------- + const maybeResolve = name => { + try { + return require.resolve(name) + } catch (error) { + return name + } + } + webpackConfig.module .rule('pug') .test(/\.pug$/) .oneOf('pug-vue') .resourceQuery(/vue/) .use('pug-plain-loader') - .loader(require.resolve('pug-plain-loader')) + .loader(maybeResolve('pug-plain-loader')) .end() .end() .oneOf('pug-template') .use('raw') - .loader(require.resolve('raw-loader')) + .loader(maybeResolve('raw-loader')) .end() .use('pug-plain-loader') - .loader(require.resolve('pug-plain-loader')) + .loader(maybeResolve('pug-plain-loader')) .end() .end() From bec95f6d9133ad42f470fbf3cf42248f3acb0033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Sat, 31 Aug 2019 16:07:59 +0200 Subject: [PATCH 04/13] Adds an extra check --- packages/@vue/cli-service/lib/config/css.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/@vue/cli-service/lib/config/css.js b/packages/@vue/cli-service/lib/config/css.js index d397734c91..d83cbf35d8 100644 --- a/packages/@vue/cli-service/lib/config/css.js +++ b/packages/@vue/cli-service/lib/config/css.js @@ -161,9 +161,16 @@ module.exports = (api, rootOptions) => { } if (loader) { + let resolvedLoader; + try { + resolvedLoader = require.resolve(loader) + } catch (error) { + resolvedLoader = loader + } + rule .use(loader) - .loader(require.resolve(loader)) + .loader(resolvedLoader) .options(Object.assign({ sourceMap }, options)) } } From 03101af0001a8dadf37bb9f4903ca2c1625feff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Mon, 2 Sep 2019 11:40:42 +0200 Subject: [PATCH 05/13] test(loaders): fix the tests --- packages/@vue/cli-service/__tests__/css.spec.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/@vue/cli-service/__tests__/css.spec.js b/packages/@vue/cli-service/__tests__/css.spec.js index 7d6d6a6e36..ad685d4d5d 100644 --- a/packages/@vue/cli-service/__tests__/css.spec.js +++ b/packages/@vue/cli-service/__tests__/css.spec.js @@ -44,7 +44,10 @@ const findLoaders = (config, lang, index) => { if (!rule) { throw new Error(`rule not found for ${lang}`) } - return rule.use.map(({ loader }) => loader.replace(/-loader$/, '')) + return rule.use.map(({ loader }) => { + const match = loader.match(/([^/]+)-loader/) + return match ? match[1] : loader + }) } const findOptions = (config, lang, _loader, index) => { From ceab89b902869306ac7ab5ee21cf86939cce4591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Mon, 2 Sep 2019 11:53:44 +0200 Subject: [PATCH 06/13] style(cli): fix the linting --- packages/@vue/cli-plugin-typescript/index.js | 3 ++- packages/@vue/cli-service/lib/config/css.js | 2 +- packages/@vue/cli-service/package.json | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/@vue/cli-plugin-typescript/index.js b/packages/@vue/cli-plugin-typescript/index.js index 6a743454c6..a6f8aef9e6 100644 --- a/packages/@vue/cli-plugin-typescript/index.js +++ b/packages/@vue/cli-plugin-typescript/index.js @@ -49,8 +49,9 @@ module.exports = (api, projectOptions) => { if (api.hasPlugin('babel')) { addLoader({ // TODO: I guess the intent is to require the `babel-loader` provided by the Babel vue - // plugin, but that means we now rely on the hoisting. It should instead we queried + // plugin, but that means we now rely on the hoisting. It should instead be queried // against the plugin itself, or through a peer dependency. + // eslint-disable-next-line node/no-extraneous-require loader: require.resolve('babel-loader') }) } diff --git a/packages/@vue/cli-service/lib/config/css.js b/packages/@vue/cli-service/lib/config/css.js index d83cbf35d8..43a399af80 100644 --- a/packages/@vue/cli-service/lib/config/css.js +++ b/packages/@vue/cli-service/lib/config/css.js @@ -161,7 +161,7 @@ module.exports = (api, rootOptions) => { } if (loader) { - let resolvedLoader; + let resolvedLoader try { resolvedLoader = require.resolve(loader) } catch (error) { diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json index c29f8355db..0efb11f53b 100644 --- a/packages/@vue/cli-service/package.json +++ b/packages/@vue/cli-service/package.json @@ -73,6 +73,7 @@ "thread-loader": "^2.1.2", "url-loader": "^2.1.0", "vue-loader": "^15.7.0", + "vue-style-loader": "^4.1.0", "webpack": "^4.0.0", "webpack-bundle-analyzer": "^3.3.2", "webpack-chain": "^6.0.0", From abc98bcc87a166dc0e1a1f00c5ebc7853314baf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Mon, 2 Sep 2019 12:40:18 +0200 Subject: [PATCH 07/13] style(cli): fix the linting (on windows) --- packages/@vue/cli-service/__tests__/css.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@vue/cli-service/__tests__/css.spec.js b/packages/@vue/cli-service/__tests__/css.spec.js index ad685d4d5d..5a681f6ec2 100644 --- a/packages/@vue/cli-service/__tests__/css.spec.js +++ b/packages/@vue/cli-service/__tests__/css.spec.js @@ -45,7 +45,7 @@ const findLoaders = (config, lang, index) => { throw new Error(`rule not found for ${lang}`) } return rule.use.map(({ loader }) => { - const match = loader.match(/([^/]+)-loader/) + const match = loader.match(/([^\\/]+)-loader/) return match ? match[1] : loader }) } From babecd33ec0b105d2b29bf460a5959e459d4a8d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Wed, 30 Oct 2019 14:07:16 +0100 Subject: [PATCH 08/13] Update package.json --- packages/@vue/cli-service/package.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json index 0efb11f53b..f2940fb391 100644 --- a/packages/@vue/cli-service/package.json +++ b/packages/@vue/cli-service/package.json @@ -81,11 +81,6 @@ "webpack-merge": "^4.2.1" }, "peerDependencies": { - "less-loader": "*", - "pug-plain-loader": "*", - "raw-loader": "*", - "sass-loader": "*", - "stylus-loader": "*", "vue-template-compiler": "^2.0.0" }, "peerDependenciesMeta": { From 3416d17d514f58014e946342aac0d48fe0996230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Wed, 30 Oct 2019 14:11:47 +0100 Subject: [PATCH 09/13] Updates the lockfile --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index 49cd19a612..2a32ac76c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7129,7 +7129,7 @@ eslint-plugin-vue-libs@^4.0.0: babel-eslint "^10.0.1" eslint-plugin-vue "^5.1.0" -eslint-plugin-vue@^5.0.0, eslint-plugin-vue@^5.1.0, eslint-plugin-vue@^5.2.2: +eslint-plugin-vue@^5.1.0, eslint-plugin-vue@^5.2.2: version "5.2.3" resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.2.3.tgz#3ee7597d823b5478804b2feba9863b1b74273961" integrity sha512-mGwMqbbJf0+VvpGR5Lllq0PMxvTdrZ/ZPjmhkacrCHbubJeJOt+T6E3HUzAifa2Mxi7RSdJfC9HFpOeSYVMMIw== @@ -16240,7 +16240,7 @@ thenify-all@^1.0.0: dependencies: any-promise "^1.0.0" -thread-loader@^2.1.3: +thread-loader@^2.1.2, thread-loader@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/thread-loader/-/thread-loader-2.1.3.tgz#cbd2c139fc2b2de6e9d28f62286ab770c1acbdda" integrity sha512-wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg== From 6898c0c5a0bfae589c0427d446092246a2aaa0b5 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Sat, 2 Nov 2019 01:23:14 +0800 Subject: [PATCH 10/13] chore: sync dependency versions --- packages/@vue/cli-plugin-babel/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@vue/cli-plugin-babel/package.json b/packages/@vue/cli-plugin-babel/package.json index 29152804c1..742b2e899c 100644 --- a/packages/@vue/cli-plugin-babel/package.json +++ b/packages/@vue/cli-plugin-babel/package.json @@ -24,8 +24,8 @@ "@vue/babel-preset-app": "^4.0.5", "@vue/cli-shared-utils": "^4.0.5", "babel-loader": "^8.0.6", - "cache-loader": "^2.0.1", - "thread-loader": "^2.1.2", + "cache-loader": "^4.1.0", + "thread-loader": "^2.1.3", "webpack": "^4.0.0" }, "peerDependencies": { From 4a48d7f09a2af32da7648e623f7870b9e1934c50 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Sat, 2 Nov 2019 01:24:45 +0800 Subject: [PATCH 11/13] chore: sync dependency versions --- packages/@vue/cli-plugin-typescript/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@vue/cli-plugin-typescript/package.json b/packages/@vue/cli-plugin-typescript/package.json index 83e2a92b7a..c4eea0d009 100644 --- a/packages/@vue/cli-plugin-typescript/package.json +++ b/packages/@vue/cli-plugin-typescript/package.json @@ -25,10 +25,10 @@ "dependencies": { "@types/webpack-env": "^1.13.9", "@vue/cli-shared-utils": "^4.0.5", - "cache-loader": "^2.0.1", + "cache-loader": "^4.1.0", "fork-ts-checker-webpack-plugin": "^1.5.1", "globby": "^9.2.0", - "thread-loader": "^2.1.2", + "thread-loader": "^2.1.3", "ts-loader": "^6.2.0", "tslint": "^5.16.0", "webpack": "^4.0.0", From be8e90d37e8d2bae7082db4240387c419d11e4a0 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Sat, 2 Nov 2019 01:27:06 +0800 Subject: [PATCH 12/13] chore: don't introduce unnecessary changes in yarn.lock --- yarn.lock | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2a32ac76c7..2194c16b8d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4599,17 +4599,6 @@ cache-base@^1.0.1: union-value "^1.0.0" unset-value "^1.0.0" -cache-loader@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/cache-loader/-/cache-loader-2.0.1.tgz#5758f41a62d7c23941e3c3c7016e6faeb03acb07" - integrity sha512-V99T3FOynmGx26Zom+JrVBytLBsmUCzVG2/4NnUKgvXN4bEV42R1ERl1IyiH/cvFIDA1Ytq2lPZ9tXDSahcQpQ== - dependencies: - loader-utils "^1.1.0" - mkdirp "^0.5.1" - neo-async "^2.6.0" - normalize-path "^3.0.0" - schema-utils "^1.0.0" - cache-loader@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/cache-loader/-/cache-loader-3.0.1.tgz#cee6cf4b3cdc7c610905b26bad6c2fc439c821af" @@ -7129,7 +7118,7 @@ eslint-plugin-vue-libs@^4.0.0: babel-eslint "^10.0.1" eslint-plugin-vue "^5.1.0" -eslint-plugin-vue@^5.1.0, eslint-plugin-vue@^5.2.2: +eslint-plugin-vue@^5.0.0, eslint-plugin-vue@^5.1.0, eslint-plugin-vue@^5.2.2: version "5.2.3" resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.2.3.tgz#3ee7597d823b5478804b2feba9863b1b74273961" integrity sha512-mGwMqbbJf0+VvpGR5Lllq0PMxvTdrZ/ZPjmhkacrCHbubJeJOt+T6E3HUzAifa2Mxi7RSdJfC9HFpOeSYVMMIw== @@ -16240,7 +16229,7 @@ thenify-all@^1.0.0: dependencies: any-promise "^1.0.0" -thread-loader@^2.1.2, thread-loader@^2.1.3: +thread-loader@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/thread-loader/-/thread-loader-2.1.3.tgz#cbd2c139fc2b2de6e9d28f62286ab770c1acbdda" integrity sha512-wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg== From 3b873102a54edc344789605306958d1147814d8e Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Sat, 2 Nov 2019 01:27:57 +0800 Subject: [PATCH 13/13] extraneous space --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 2194c16b8d..8c5c4d48d1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7118,7 +7118,7 @@ eslint-plugin-vue-libs@^4.0.0: babel-eslint "^10.0.1" eslint-plugin-vue "^5.1.0" -eslint-plugin-vue@^5.0.0, eslint-plugin-vue@^5.1.0, eslint-plugin-vue@^5.2.2: +eslint-plugin-vue@^5.0.0, eslint-plugin-vue@^5.1.0, eslint-plugin-vue@^5.2.2: version "5.2.3" resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.2.3.tgz#3ee7597d823b5478804b2feba9863b1b74273961" integrity sha512-mGwMqbbJf0+VvpGR5Lllq0PMxvTdrZ/ZPjmhkacrCHbubJeJOt+T6E3HUzAifa2Mxi7RSdJfC9HFpOeSYVMMIw==