chore: merge branch 'dev' into next-minor

haoqunjiang · haoqunjiang · commit 9e317d20d745 · 2019-04-01T18:08:59.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,47 @@
+# [3.5.5](https://github.com/vuejs/vue-cli/compare/v3.5.4...v3.5.5) (2019-04-01)
+
+## babel-preset-app
+
+#### Reverts
+
+* "fix: should not add polyfills from transform-runtime plugin ([#3730](https://github.com/vuejs/vue-cli/issues/3730))" ([#3742](https://github.com/vuejs/vue-cli/issues/3742)) ([7228146](https://github.com/vuejs/vue-cli/commit/7228146)), closes [#3741](https://github.com/vuejs/vue-cli/issues/3741)
+
+
+
+# [3.5.4](https://github.com/vuejs/vue-cli/compare/v3.5.3...v3.5.4) (2019-03-31)
+
+## babel-preset-app
+
+#### Bug Fixes
+
+* should not add polyfills from transform-runtime plugin ([#3730](https://github.com/vuejs/vue-cli/issues/3730)) ([b987969](https://github.com/vuejs/vue-cli/commit/b987969))
+* should not use abosulte polyfill paths when `absoluteRuntime` is on ([#3732](https://github.com/vuejs/vue-cli/issues/3732)) ([9bdff3b](https://github.com/vuejs/vue-cli/commit/9bdff3b)), closes [#3725](https://github.com/vuejs/vue-cli/issues/3725)
+
+## cli-plugin-babel
+
+#### Bug Fixes
+
+* **generator:** add core-js as direct dependency of generated projects ([#3736](https://github.com/vuejs/vue-cli/issues/3736)) ([5eb1425](https://github.com/vuejs/vue-cli/commit/5eb1425))
+
+
+
+# [3.5.3](https://github.com/vuejs/vue-cli/compare/v3.5.2...v3.5.3) (2019-03-27)
+
+## babel-preset-app
+
+#### Bug Fixes
+
+* downgrade [@babel](https://github.com/babel)/preset-env temporarily ([#3716](https://github.com/vuejs/vue-cli/issues/3716)) ([f107623](https://github.com/vuejs/vue-cli/commit/f107623))
+
+## cli-service
+
+#### Bug Fixes
+
+* properly load non-js config files in genCacheConfig ([#3632](https://github.com/vuejs/vue-cli/issues/3632)) ([adac48d](https://github.com/vuejs/vue-cli/commit/adac48d)), closes [#3631](https://github.com/vuejs/vue-cli/issues/3631)
+* set the path of safari-no-module-fix.js correctly ([#3647](https://github.com/vuejs/vue-cli/issues/3647)) ([10296ff](https://github.com/vuejs/vue-cli/commit/10296ff)), closes [#3033](https://github.com/vuejs/vue-cli/issues/3033)
+
+
+
 # [3.5.2](https://github.com/vuejs/vue-cli/compare/v3.5.1...v3.5.2) (2019-03-27)
 
 ## babel-preset-app
diff --git a/lerna.json b/lerna.json
@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": false,
-  "version": "3.5.2",
+  "version": "3.5.5",
   "packages": [
     "packages/@vue/babel-preset-app",
     "packages/@vue/cli*"
diff --git a/packages/@vue/babel-preset-app/__tests__/babel-preset.spec.js b/packages/@vue/babel-preset-app/__tests__/babel-preset.spec.js
@@ -153,4 +153,5 @@ test('disable absoluteRuntime', () => {
   })
 
   expect(code).toMatch('import _toConsumableArray from "@babel/runtime-corejs2/helpers/esm/toConsumableArray"')
+  // expect(code).not.toMatch(genCoreJSImportRegExp('es6.promise'))
 })
diff --git a/packages/@vue/babel-preset-app/index.js b/packages/@vue/babel-preset-app/index.js
@@ -106,7 +106,10 @@ module.exports = (context, options = {}) => {
       ignoreBrowserslistConfig,
       configPath
     })
-    plugins.push([require('./polyfillsPlugin'), { polyfills, entryFiles }])
+    plugins.push([
+      require('./polyfillsPlugin'),
+      { polyfills, entryFiles, useAbsolutePath: !!absoluteRuntime }
+    ])
   } else {
     polyfills = []
   }
@@ -123,8 +126,7 @@ module.exports = (context, options = {}) => {
     include,
     exclude: polyfills.concat(exclude || []),
     shippedProposals,
-    forceAllTransforms,
-    corejs: 2
+    forceAllTransforms
   }
 
   // cli-plugin-jest sets this to true because Jest runs without bundling
diff --git a/packages/@vue/babel-preset-app/package.json b/packages/@vue/babel-preset-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/babel-preset-app",
-  "version": "3.5.2",
+  "version": "3.5.5",
   "description": "babel-preset-app for vue-cli",
   "main": "index.js",
   "publishConfig": {
@@ -28,7 +28,7 @@
     "@babel/plugin-syntax-dynamic-import": "^7.0.0",
     "@babel/plugin-syntax-jsx": "^7.0.0",
     "@babel/plugin-transform-runtime": "^7.4.0",
-    "@babel/preset-env": "^7.4.1",
+    "@babel/preset-env": "^7.0.0 < 7.4.0",
     "@babel/runtime": "^7.0.0",
     "@babel/runtime-corejs2": "^7.2.0",
     "@vue/babel-preset-jsx": "^1.0.0-beta.2",
diff --git a/packages/@vue/babel-preset-app/polyfillsPlugin.js b/packages/@vue/babel-preset-app/polyfillsPlugin.js
@@ -2,20 +2,23 @@ const { addSideEffect } = require('@babel/helper-module-imports')
 
 // slightly modifiled from @babel/preset-env/src/utils
 // use an absolute path for core-js modules, to fix conflicts of different core-js versions
-function getModulePath (mod) {
-  if (mod === 'regenerator-runtime') {
-    return require.resolve('regenerator-runtime/runtime')
-  }
-
-  return require.resolve(`core-js/modules/${mod}`)
+function getModulePath (mod, useAbsolutePath) {
+  const modPath =
+    mod === 'regenerator-runtime'
+      ? 'regenerator-runtime/runtime'
+      : `core-js/modules/${mod}`
+  return useAbsolutePath ? require.resolve(modPath) : modPath
 }
 
-function createImport (path, mod) {
-  return addSideEffect(path, getModulePath(mod))
+function createImport (path, mod, useAbsolutePath) {
+  return addSideEffect(path, getModulePath(mod, useAbsolutePath))
 }
 
 // add polyfill imports to the first file encountered.
-module.exports = ({ types }, { entryFiles = [] }) => {
+module.exports = (
+  { types },
+  { polyfills, entryFiles = [], useAbsolutePath }
+) => {
   return {
     name: 'vue-cli-inject-polyfills',
     visitor: {
@@ -24,13 +27,12 @@ module.exports = ({ types }, { entryFiles = [] }) => {
           return
         }
 
-        const { polyfills } = state.opts
         // imports are injected in reverse order
         polyfills
           .slice()
           .reverse()
           .forEach(p => {
-            createImport(path, p)
+            createImport(path, p, useAbsolutePath)
           })
       }
     }
diff --git a/packages/@vue/cli-plugin-babel/generator.js b/packages/@vue/cli-plugin-babel/generator.js
@@ -8,6 +8,9 @@ module.exports = api => {
   api.extendPackage({
     babel: {
       presets: ['@vue/app']
+    },
+    dependencies: {
+      'core-js': '^2.6.5'
     }
   })
 }
diff --git a/packages/@vue/cli-plugin-babel/package.json b/packages/@vue/cli-plugin-babel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-babel",
-  "version": "3.5.2",
+  "version": "3.5.5",
   "description": "babel plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -21,7 +21,7 @@
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-plugin-babel#readme",
   "dependencies": {
     "@babel/core": "^7.0.0",
-    "@vue/babel-preset-app": "^3.5.2",
+    "@vue/babel-preset-app": "^3.5.5",
     "@vue/cli-shared-utils": "^3.5.1",
     "babel-loader": "^8.0.5",
     "webpack": ">=4 < 4.29"
diff --git a/packages/@vue/cli-plugin-typescript/package.json b/packages/@vue/cli-plugin-typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-typescript",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "description": "typescript plugin for vue-cli",
   "main": "index.js",
   "repository": {
diff --git a/packages/@vue/cli-plugin-unit-jest/package.json b/packages/@vue/cli-plugin-unit-jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-unit-jest",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "description": "unit-jest plugin for vue-cli",
   "main": "index.js",
   "repository": {
diff --git a/packages/@vue/cli-service-global/package.json b/packages/@vue/cli-service-global/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-service-global",
-  "version": "3.5.2",
+  "version": "3.5.5",
   "description": "vue-cli-service global addon for vue-cli",
   "main": "index.js",
   "publishConfig": {
@@ -22,10 +22,10 @@
   },
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-build#readme",
   "dependencies": {
-    "@vue/babel-preset-app": "^3.5.2",
-    "@vue/cli-plugin-babel": "^3.5.2",
+    "@vue/babel-preset-app": "^3.5.5",
+    "@vue/cli-plugin-babel": "^3.5.5",
     "@vue/cli-plugin-eslint": "^3.5.1",
-    "@vue/cli-service": "^3.5.2",
+    "@vue/cli-service": "^3.5.3",
     "babel-eslint": "^10.0.1",
     "chalk": "^2.4.2",
     "eslint": "^4.19.1",
diff --git a/packages/@vue/cli-service/lib/PluginAPI.js b/packages/@vue/cli-service/lib/PluginAPI.js
@@ -167,6 +167,9 @@ class PluginAPI {
               return fs.readFileSync(absolutePath, 'utf-8')
             }
           }
+          else {
+            return fs.readFileSync(absolutePath, 'utf-8')
+          }
         }
       }
       if (!Array.isArray(configFiles)) {
diff --git a/packages/@vue/cli-service/lib/commands/build/resolveAppConfig.js b/packages/@vue/cli-service/lib/commands/build/resolveAppConfig.js
@@ -28,7 +28,10 @@ module.exports = (api, args, options) => {
         .use(ModernModePlugin, [{
           targetDir,
           isModernBuild: true,
-          unsafeInline: args['unsafe-inline']
+          unsafeInline: args['unsafe-inline'],
+          // as we may generate an addition file asset (if `no-unsafe-inline` specified)
+          // we need to provide the correct directory for that file to place in
+          jsDirectory: require('../../util/getAssetPath')(options, 'js')
         }])
     }
   }
diff --git a/packages/@vue/cli-service/lib/webpack/ModernModePlugin.js b/packages/@vue/cli-service/lib/webpack/ModernModePlugin.js
@@ -5,10 +5,11 @@ const path = require('path')
 const safariFix = `!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()},!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();`
 
 class ModernModePlugin {
-  constructor ({ targetDir, isModernBuild, unsafeInline }) {
+  constructor ({ targetDir, isModernBuild, unsafeInline, jsDirectory }) {
     this.targetDir = targetDir
     this.isModernBuild = isModernBuild
     this.unsafeInline = unsafeInline
+    this.jsDirectory = jsDirectory
   }
 
   apply (compiler) {
@@ -75,11 +76,8 @@ class ModernModePlugin {
           })
         } else {
           // inject the fix as an external script
-          const safariFixPath = legacyAssets[0].attributes.src
-            .split('/')
-            .slice(0, -1)
-            .concat(['safari-nomodule-fix.js'])
-            .join('/')
+          const safariFixPath = path.join(this.jsDirectory, 'safari-nomodule-fix.js')
+          const fullSafariFixPath = path.join(compilation.options.output.publicPath, safariFixPath)
           compilation.assets[safariFixPath] = {
             source: function () {
               return new Buffer(safariFix)
@@ -92,7 +90,7 @@ class ModernModePlugin {
             tagName: 'script',
             closeTag: true,
             attributes: {
-              src: safariFixPath
+              src: fullSafariFixPath
             }
           })
         }
diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-service",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "description": "local service for vue-cli projects",
   "main": "lib/Service.js",
   "typings": "types/index.d.ts",
diff --git a/packages/@vue/cli-ui-addon-webpack/package.json b/packages/@vue/cli-ui-addon-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui-addon-webpack",
-  "version": "3.5.2",
+  "version": "3.5.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -18,9 +18,9 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.5.2",
+    "@vue/cli-plugin-babel": "^3.5.5",
     "@vue/cli-plugin-eslint": "^3.5.1",
-    "@vue/cli-service": "^3.5.2",
+    "@vue/cli-service": "^3.5.3",
     "@vue/eslint-config-standard": "^4.0.0",
     "eslint": "^5.14.1",
     "stylus": "^0.54.5",
diff --git a/packages/@vue/cli-ui-addon-widgets/package.json b/packages/@vue/cli-ui-addon-widgets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui-addon-widgets",
-  "version": "3.5.2",
+  "version": "3.5.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -18,9 +18,9 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.5.2",
+    "@vue/cli-plugin-babel": "^3.5.5",
     "@vue/cli-plugin-eslint": "^3.5.1",
-    "@vue/cli-service": "^3.5.2",
+    "@vue/cli-service": "^3.5.3",
     "@vue/eslint-config-standard": "^4.0.0",
     "eslint": "^5.14.1",
     "stylus": "^0.54.5",
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui",
-  "version": "3.5.2",
+  "version": "3.5.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -61,10 +61,10 @@
     "watch": "^1.0.2"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.5.2",
+    "@vue/cli-plugin-babel": "^3.5.5",
     "@vue/cli-plugin-e2e-cypress": "^3.5.1",
     "@vue/cli-plugin-eslint": "^3.5.1",
-    "@vue/cli-service": "^3.5.2",
+    "@vue/cli-service": "^3.5.3",
     "@vue/eslint-config-standard": "^4.0.0",
     "@vue/ui": "^0.5.5",
     "ansi_up": "^3.0.0",
diff --git a/packages/@vue/cli/package.json b/packages/@vue/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli",
-  "version": "3.5.2",
+  "version": "3.5.5",
   "description": "Command line interface for rapid Vue.js development",
   "bin": {
     "vue": "bin/vue.js"
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@vue/cli-shared-utils": "^3.5.1",
-    "@vue/cli-ui": "^3.5.2",
-    "@vue/cli-ui-addon-webpack": "^3.5.2",
-    "@vue/cli-ui-addon-widgets": "^3.5.2",
+    "@vue/cli-ui": "^3.5.5",
+    "@vue/cli-ui-addon-webpack": "^3.5.5",
+    "@vue/cli-ui-addon-widgets": "^3.5.5",
     "chalk": "^2.4.1",
     "cmd-shim": "^2.0.2",
     "commander": "^2.16.0",
diff --git a/packages/vue-cli-version-marker/package.json b/packages/vue-cli-version-marker/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"npmClient": "yarn",`
`3`	`3`	`"useWorkspaces": false,`
`4`		`- "version": "3.5.2",`
	`4`	`+ "version": "3.5.5",`
`5`	`5`	`"packages": [`
`6`	`6`	`"packages/@vue/babel-preset-app",`
`7`	`7`	`"packages/@vue/cli*"`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,9 @@ module.exports = api => {`
`8`	`8`	`api.extendPackage({`
`9`	`9`	`babel: {`
`10`	`10`	`presets: ['@vue/app']`
	`11`	`+ },`
	`12`	`+ dependencies: {`
	`13`	`+ 'core-js': '^2.6.5'`
`11`	`14`	`}`
`12`	`15`	`})`
`13`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@vue/cli-plugin-typescript",`
`3`		`- "version": "3.5.2",`
	`3`	`+ "version": "3.5.3",`
`4`	`4`	`"description": "typescript plugin for vue-cli",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@vue/cli-plugin-unit-jest",`
`3`		`- "version": "3.5.2",`
	`3`	`+ "version": "3.5.3",`
`4`	`4`	`"description": "unit-jest plugin for vue-cli",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"repository": {`