Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vuejs/vue-cli
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bef7a67566585876d56fa0e41b364675467bba8f
Choose a base ref
...
head repository: vuejs/vue-cli
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4a0655f7ac09b64d2b47506e7f21e7923d43262b
Choose a head ref
Loading
Showing 429 changed files with 20,182 additions and 16,362 deletions.
64 changes: 36 additions & 28 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
version: 2
version: 2.1

defaults: &defaults
working_directory: ~/project/vue
docker:
- image: vuejs/ci
- image: circleci/node:lts-browsers

aliases:
- &restore-yarn-cache
key: v2-vue-cli-{{ checksum "yarn.lock" }}

- &save-yarn-cache
key: v2-vue-cli-{{ checksum "yarn.lock" }}
paths:
- node_modules/
- ~/.cache

workflow_filters: &filters
filters:
@@ -16,54 +26,46 @@ jobs:
<<: *defaults
steps:
- checkout
- restore_cache:
keys:
- v2-vue-cli-{{ checksum "yarn.lock" }}
- restore_cache: *restore-yarn-cache
- run: yarn --network-timeout 600000
- save_cache:
key: v2-vue-cli-{{ checksum "yarn.lock" }}
paths:
- node_modules/
- ~/.cache
- save_cache: *save-yarn-cache
- persist_to_workspace:
root: ~/
paths:
- project/vue
- .cache/Cypress

group-1:
e2e:
<<: *defaults
steps:
- attach_workspace:
at: ~/
- run: ./scripts/e2e-test/run-e2e-test.sh

core:
<<: *defaults
steps:
- attach_workspace:
at: ~/
- run: yarn test -p cli,cli-service,cli-shared-utils

group-2:
typescript:
<<: *defaults
steps:
- attach_workspace:
at: ~/
- run: yarn test 'ts(?:\w(?!E2e))+\.spec\.js$'

group-3:
plugins:
<<: *defaults
steps:
- attach_workspace:
at: ~/
- run: yarn lint-without-fix
- run: yarn check-links
- restore_cache:
keys:
# TODO: should use a more accurate cache key
- v2-vue-cli-offline-{{ checksum "yarn.lock" }}
- run: yarn config set yarn-offline-mirror ~/npm-packages-offline-cache
- run: yarn test -p cli-service-global,eslint,pwa,babel,babel-preset-app,vuex,router
- save_cache:
key: v2-vue-cli-offline-{{ checksum "yarn.lock" }}
paths:
- ~/npm-packages-offline-cache
- run: yarn test -p eslint,pwa,babel,babel-preset-app,vuex,router

group-4:
tests:
<<: *defaults
steps:
- attach_workspace:
@@ -82,30 +84,36 @@ jobs:
path: packages/@vue/cli-ui/tests/e2e/videos
- store_artifacts:
path: packages/@vue/cli-ui/tests/e2e/screenshots
- store_artifacts:
path: /home/circleci/.npm/_logs

workflows:
version: 2
test:
jobs:
- install:
<<: *filters
- group-1:
- core:
<<: *filters
requires:
- install
- group-2:
- typescript:
<<: *filters
requires:
- install
- group-3:
- plugins:
<<: *filters
requires:
- install
- group-4:
- tests:
<<: *filters
requires:
- install
- cli-ui:
<<: *filters
requires:
- install
- e2e:
<<: *filters
requires:
- install
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -3,6 +3,5 @@ template
template-vue3
packages/test
temp
entry-wc.js
dist
__testfixtures__
31 changes: 15 additions & 16 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
module.exports = {
extends: [
"plugin:vue-libs/recommended"
'@vue/standard'
],
plugins: [
"node"
],
env: {
"jest": true
},
globals: {
name: 'off'
},
rules: {
"indent": ["error", 2, {
"MemberExpression": "off"
indent: ['error', 2, {
MemberExpression: 'off'
}],
"no-shadow": ["error"],
"node/no-extraneous-require": ["error", {
"allowModules": [
"@vue/cli-service",
"@vue/cli-test-utils"
quotes: [2, 'single', { avoidEscape: true, allowTemplateLiterals: true }],
'quote-props': 'off',
'no-shadow': ['error'],
'node/no-extraneous-require': ['error', {
allowModules: [
'@vue/cli-service',
'@vue/cli-test-utils'
]
}]
},
overrides: [
{
files: ['**/__tests__/**/*.js', "**/cli-test-utils/**/*.js"],
files: ['**/__tests__/**/*.js', '**/cli-test-utils/**/*.js'],
env: {
jest: true
},
rules: {
"node/no-extraneous-require": "off"
'node/no-extraneous-require': 'off'
}
}
]
4 changes: 4 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
github: [yyx990803, sodatea]
patreon: evanyou
open_collective: vuejs
tidelift: npm/vue
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -10,3 +10,4 @@ temp
.versions
.changelog
package-lock.json
.vscode
Loading