Merge pull request #113 from vuejs/dev

Compare changes across branches, commits, tags, and more below.

Author: GulajavaMinistudio

packages/@vue/cli-plugin-eslint/index.js

@@ -25,6 +25,7 @@ module.exports = (api, options) => {
         '.eslintrc.yml',
         '.eslintrc.json',
         '.eslintrc',
+        '.eslintignore',
         'package.json'
       ]
     )

packages/@vue/cli-service/lib/commands/build/index.js

@@ -37,7 +37,8 @@ module.exports = (api, options) => {
       '--report': `generate report.html to help analyze bundle content`,
       '--report-json': 'generate report.json to help analyze bundle content',
       '--skip-plugins': `comma-separated list of plugin names to skip for this run`,
-      '--watch': `watch for changes`
+      '--watch': `watch for changes`,
+      '--stdin': `close when stdin ends`
     }
   }, async (args, rawArgs) => {
     for (const key in defaults) {
@@ -155,6 +156,13 @@ async function build (args, api, options) {
     })
   }
 
+  if (args.stdin) {
+    process.stdin.on('end', () => {
+      process.exit(0)
+    })
+    process.stdin.resume()
+  }
+
   // Expose advanced stats
   if (args.dashboard) {
     const DashboardPlugin = require('../../webpack/DashboardPlugin')

packages/@vue/cli-service/lib/commands/serve.js

@@ -127,9 +127,10 @@ module.exports = (api, options) => {
 
     // inject dev & hot-reload middleware entries
     if (!isProduction) {
+      const sockPath = projectDevServerOptions.sockPath || '/sockjs-node'
       const sockjsUrl = publicUrl
         // explicitly configured via devServer.public
-        ? `?${publicUrl}/sockjs-node`
+        ? `?${publicUrl}&sockPath=${sockPath}`
         : isInContainer
           // can't infer public network url if inside a container...
           // use client-side inference (note this would break with non-root publicPath)
@@ -138,9 +139,8 @@ module.exports = (api, options) => {
           : `?` + url.format({
             protocol,
             port,
-            hostname: urls.lanUrlForConfig || 'localhost',
-            pathname: '/sockjs-node'
-          })
+            hostname: urls.lanUrlForConfig || 'localhost'
+          }) + `&sockPath=${sockPath}`
       const devClients = [
         // dev server client
         require.resolve(`webpack-dev-server/client`) + sockjsUrl,

packages/@vue/cli/lib/GeneratorAPI.js

@@ -8,7 +8,7 @@ const mergeDeps = require('./util/mergeDeps')
 const runCodemod = require('./util/runCodemod')
 const stringifyJS = require('./util/stringifyJS')
 const ConfigTransform = require('./ConfigTransform')
-const { semver, getPluginLink, toShortPluginId, loadModule } = require('@vue/cli-shared-utils')
+const { semver, error, getPluginLink, toShortPluginId, loadModule } = require('@vue/cli-shared-utils')
 
 const isString = val => typeof val === 'string'
 const isFunction = val => typeof val === 'function'
@@ -81,6 +81,20 @@ class GeneratorAPI {
     this.generator.fileMiddlewares.push(middleware)
   }
 
+  /**
+   * Normalize absolute path, Windows-style path
+   * to the relative path used as index in this.files
+   * @param {string} p the path to normalize
+   */
+  _normalizePath (p) {
+    if (path.isAbsolute(p)) {
+      p = path.relative(this.generator.context, p)
+    }
+    // The `files` tree always use `/` in its index.
+    // So we need to normalize the path string in case the user passes a Windows path.
+    return p.replace(/\\/g, '/')
+  }
+
   /**
    * Resolve path for a project.
    *
@@ -373,10 +387,20 @@ class GeneratorAPI {
    * @param {object} options additional options for the codemod
    */
   transformScript (file, codemod, options) {
+    const normalizedPath = this._normalizePath(file)
+
     this._injectFileMiddleware(files => {
-      files[file] = runCodemod(
+      if (typeof files[normalizedPath] === 'undefined') {
+        error(`Cannot find file ${normalizedPath}`)
+        return
+      }
+
+      files[normalizedPath] = runCodemod(
         codemod,
-        { path: this.resolve(file), source: files[file] },
+        {
+          path: this.resolve(normalizedPath),
+          source: files[normalizedPath]
+        },
         options
       )
     })

packages/@vue/cli/lib/util/ProjectPackageManager.js

@@ -290,20 +290,26 @@ class PackageManager {
   }
 
   async upgrade (packageName) {
-    const realname = stripVersion(packageName)
-    if (
-      isTestOrDebug &&
-      (packageName === '@vue/cli-service' || isOfficialPlugin(resolvePluginId(realname)))
-    ) {
-      // link packages in current repo for test
-      const src = path.resolve(__dirname, `../../../../${realname}`)
-      const dest = path.join(this.context, 'node_modules', realname)
-      await fs.remove(dest)
-      await fs.symlink(src, dest, 'dir')
-      return
+    // manage multiple packages separated by spaces
+    const packageNamesArray = []
+
+    for (const packname of packageName.split(' ')) {
+      const realname = stripVersion(packname)
+      if (
+        isTestOrDebug &&
+        (packname === '@vue/cli-service' || isOfficialPlugin(resolvePluginId(realname)))
+      ) {
+        // link packages in current repo for test
+        const src = path.resolve(__dirname, `../../../../${realname}`)
+        const dest = path.join(this.context, 'node_modules', realname)
+        await fs.remove(dest)
+        await fs.symlink(src, dest, 'dir')
+      } else {
+        packageNamesArray.push(packname)
+      }
     }
 
-    return await this.runCommand('add', [packageName])
+    if (packageNamesArray.length) return await this.runCommand('add', packageNamesArray)
   }
 }