chore: merge dev

Author: Guillaume Chau

.circleci/config.yml

@@ -1,29 +1,75 @@
 version: 2
-jobs:
-  build:
-    docker:
-      # specify the version you desire here
-      - image: vuejs/ci
 
-    working_directory: ~/repo
+defaults: &defaults
+  working_directory: ~/project/vue
+  docker:
+    - image: vuejs/ci
 
+jobs:
+  install:
+    <<: *defaults
     steps:
       - checkout
-
-      # Download and cache dependencies
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "yarn.lock" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
-
-      - run: yarn install
-
+            - v1-vue-{{ .Branch }}-{{ checksum "yarn.lock" }}
+            - v1-vue-{{ .Branch }}-
+            - v1-vue-
+      - run: yarn
       - save_cache:
+          key: v1-vue-{{ .Branch }}-{{ checksum "yarn.lock" }}
           paths:
-            - node_modules
+            - node_modules/
             - ~/.cache/yarn
-          key: v1-dependencies-{{ checksum "yarn.lock" }}
+      - persist_to_workspace:
+          root: ~/project
+          paths:
+            - vue
+
+  group-1:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/project
+      - run: yarn test -p cli,cli-service,cli-shared-utils
+
+  group-2:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/project
+      - run: yarn test 'ts(?:\w(?!E2e))+\.spec\.js$'
+
+  group-3:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/project
+      - run: yarn lint
+      - run: yarn test -p cli-service-global,eslint,pwa,babel,babel-preset-app
+
+  group-4:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/project
+      - run: yarn test -p unit-mocha,unit-jest,e2e-nightwatch,e2e-cypress
+      - run: yarn test tsPluginE2e
 
-      # run tests!
-      - run: yarn test
+workflows:
+  version: 2
+  test:
+    jobs:
+      - install
+      - group-1:
+          requires:
+            - install
+      - group-2:
+          requires:
+            - install
+      - group-3:
+          requires:
+            - install
+      - group-4:
+          requires:
+            - install

.eslintrc

@@ -4,7 +4,6 @@
     "jest": true
   },
   "rules": {
-    "indent": ["error", 2, { "MemberExpression": "off" }],
-    "vue-libs/no-async-functions": 2
+    "indent": ["error", 2, { "MemberExpression": "off" }]
   }
 }

.github/COMMIT_CONVENTION.md

@@ -1,6 +1,6 @@
 ## Git Commit Message Convention
 
-> This is adapted from [Angular's commit convention](https://github.com/conventional-changelog/conventional-changelog/blob/master/packages/conventional-changelog-angular/readme.md).
+> This is adapted from [Angular's commit convention](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-angular).
 
 #### TL;DR:
 

docs/env.md

@@ -30,14 +30,14 @@ Loaded variables will become available to all `vue-cli-service` commands, plugin
 **Mode** is an important concept in Vue CLI projects. By default, there are three modes in a Vue CLI project:
 
 - `development` is used by `vue-cli-service serve`
-- `production` is used by `vue-cli-service build`
-- `test` is used by `vue-cli-service test`
+- `production` is used by `vue-cli-service build` and `vue-cli-service test:e2e`
+- `test` is used by `vue-cli-service test:unit`
 
 Note that a mode is different from `NODE_ENV`, as a mode can contain multiple environment variables. That said, each mode does set `NODE_ENV` to the same value by default - for example, `NODE_ENV` will be set to `"development"` in development mode.
 
 You can set environment variables only available to a certain mode by postfixing the `.env` file. For example, if you create a file named `.env.development` in your project root, then the variables declared in that file will only be loaded in development mode.
 
-Passing the `--mode` option flag with [build command](https://github.com/vuejs/vue-cli/blob/dev/docs/cli-service.md#build) will use that mode's environment variables in the build. For example, if you want to use development variables in the build command, add this to your package.json scripts:
+You can overwrite the default mode used for a command by passing the `--mode` option flag. For example, if you want to use development variables in the build command, add this to your `package.json` scripts:
 
 ```
 "dev-build": "vue-cli-service build --mode development",

docs/plugin-dev.md

@@ -72,54 +72,52 @@ module.exports = (api, projectOptions) => {
 }
 ```
 
-#### Environment Variables in Service Plugins
+#### Specifying Mode for Commands
 
-An important thing to note about env variables is knowing when they are resolved. Typically, a command like `vue-cli-service serve` or `vue-cli-service build` will always call `api.setMode()` as the first thing it does. However, this also means those env variables may not yet be available when a service plugin is invoked:
+> Note: the way plugins set modes has been changed in beta.10.
+
+If a plugin-registered command needs to run in a specific default mode,
+the plugin needs to expose it via `module.exports.defaultModes` in the form
+of `{ [commandName]: mode }`:
 
 ``` js
 module.exports = api => {
-  process.env.NODE_ENV // may not be resolved yet
-
   api.registerCommand('build', () => {
-    api.setMode('production')
+    // ...
   })
 }
-```
-
-Instead, it's safer to rely on env variables in `configureWebpack` or `chainWebpack` functions, which are called lazily only when `api.resolveWebpackConfig()` is finally called:
 
-``` js
-module.exports = api => {
-  api.configureWebpack(config => {
-    if (process.env.NODE_ENV === 'production') {
-      // ...
-    }
-  })
+module.exports.defaultModes = {
+  build: 'production'
 }
 ```
 
+This is because the command's expected mode needs to be known before loading environment variables, which in turn needs to happen before loading user options / applying the plugins.
+
 #### Resolving Webpack Config in Plugins
 
 A plugin can retrieve the resolved webpack config by calling `api.resolveWebpackConfig()`. Every call generates a fresh webpack config which can be further mutated as needed:
 
 ``` js
-api.registerCommand('my-build', args => {
-  // make sure to set mode and load env variables
-  api.setMode('production')
+module.exports = api => {
+  api.registerCommand('my-build', args => {
+    const configA = api.resolveWebpackConfig()
+    const configB = api.resolveWebpackConfig()
 
-  const configA = api.resolveWebpackConfig()
-  const configB = api.resolveWebpackConfig()
+    // mutate configA and configB for different purposes...
+  })
+}
 
-  // mutate configA and configB for different purposes...
-})
+// make sure to specify the default mode for correct env variables
+module.exports.defaultModes = {
+  'my-build': 'production'
+}
 ```
 
 Alternatively, a plugin can also obtain a fresh [chainable config](https://github.com/mozilla-neutrino/webpack-chain) by calling `api.resolveChainableWebpackConfig()`:
 
 ``` js
 api.registerCommand('my-build', args => {
-  api.setMode('production')
-
   const configA = api.resolveChainableWebpackConfig()
   const configB = api.resolveChainableWebpackConfig()
 

package.json

@@ -55,6 +55,7 @@
     "puppeteer": "^1.0.0",
     "request": "^2.83.0",
     "request-promise-native": "^1.0.5",
+    "rimraf": "^2.6.2",
     "yorkie": "^1.0.2"
   }
 }

packages/@vue/cli-plugin-e2e-cypress/README.md

@@ -8,32 +8,24 @@ Cypress offers a rich interactive interface for running E2E tests, but currently
 
 ## Injected Commands
 
-- **`vue-cli-service e2e`**
+- **`vue-cli-service test:e2e`**
 
-  run e2e tests headlessly with `cypress run`.
+  Run e2e tests with `cypress run`.
 
-  Options:
-
-  ```
-  --url      run e2e tests against given url instead of auto-starting dev server
-  -s, --spec runs a specific spec file. defaults to "all"
-  ```
+  By default it launches Cypress in interactive mode with a GUI. If you want to run the tests in headless mode (e.g. for CI), you can do so with the `--headless` option.
 
-  Additionally, [all Cypress CLI options for `cypress run` are also supported](https://docs.cypress.io/guides/guides/command-line.html#cypress-run).
-
-- **`vue-cli-service e2e:open`**
-
-  run e2e tests in interactive mode with `cypress open`.
+  The command automatically starts a server in production mode to run the e2e tests against. If you want to run the tests multiple times without having to restart the server every time, you can start the server with `vue-cli-service serve --mode production` in one terminal, and then run e2e tests against that server using the `--url` option.
 
   Options:
 
   ```
+  --headless run in headless mode without GUI
+  --mode     specify the mode the dev server should run in. (default: production)
   --url      run e2e tests against given url instead of auto-starting dev server
+  -s, --spec (headless only) runs a specific spec file. defaults to "all"
   ```
 
-  Additionally, [all Cypress CLI options for `cypress open` are also supported](https://docs.cypress.io/guides/guides/command-line.html#cypress-open).
-
-  Both commands automatically starts a server in production mode to run the e2e tests against. If you want to run the tests multiple times without having to restart the server every time, you can start the server with `vue-cli-service serve --mode production` in one terminal, and then run e2e tests against that server using the `--url` option.
+  Additionally, [all Cypress CLI options for `cypress run` are also supported](https://docs.cypress.io/guides/guides/command-line.html#cypress-run).
 
 ## Configuration
 
@@ -42,6 +34,5 @@ We've pre-configured Cypress to place most of the e2e testing related files unde
 ## Installing in an Already Created Project
 
 ``` sh
-npm install -D @vue/cli-plugin-e2e-cypress
-vue invoke e2e-cypress
+vue add e2e-cypress
 ```

packages/@vue/cli-plugin-e2e-cypress/__tests__/.eslintrc

@@ -14,5 +14,5 @@ test('should work', async () => {
   config.videoRecording = false
   await project.write('cypress.json', JSON.stringify(config))
 
-  await project.run(`vue-cli-service e2e`)
+  await project.run(`vue-cli-service test:e2e --headless`)
 })

packages/@vue/cli-plugin-e2e-cypress/__tests__/cypressPlugin.spec.js

@@ -6,8 +6,7 @@ module.exports = api => {
 
   api.extendPackage({
     scripts: {
-      e2e: 'vue-cli-service e2e',
-      'e2e:open': 'vue-cli-service e2e:open'
+      'test:e2e': 'vue-cli-service test:e2e'
     }
   })
 }