Skip to content

Commit e6ba048

Browse files
committed
Merge remote-tracking branch 'upgrade/lastVueCLI3' into build/upgrade_ol_v6.7.0
2 parents fa91aae + 4a3b2a2 commit e6ba048

File tree

86 files changed

+11912
-12927
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+11912
-12927
lines changed

.babelrc

-39
This file was deleted.

.browserslistrc

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
> 1%
2+
last 2 versions

.dockerignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
app/
22
dist/
33
node_modules/
4+
test/unit/coverage/
5+
tests/unit/coverage/
46
.git/

.editorconfig

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
root = true
2-
3-
[*]
4-
charset = utf-8
1+
[*.{js,jsx,ts,tsx,vue}]
52
indent_style = space
63
indent_size = 2
7-
end_of_line = lf
8-
insert_final_newline = true
94
trim_trailing_whitespace = true
5+
insert_final_newline = true

.eslintrc.js

+20-22
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,17 @@
1-
// http://eslint.org/docs/user-guide/configuring
2-
31
module.exports = {
42
root: true,
5-
parserOptions: {
6-
parser: 'babel-eslint',
7-
sourceType: 'module'
8-
},
93
env: {
10-
browser: true,
4+
node: true,
115
},
126
extends: [
13-
// https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
147
// consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
15-
'plugin:vue/essential',
16-
// https://github.com/standard/standard/blob/master/docs/RULES-en.md
17-
'standard'
18-
],
19-
// required to lint *.vue files
20-
plugins: [
21-
'vue'
8+
'plugin:vue/essential',
9+
'@vue/standard'
2210
],
23-
// add your custom rules here
2411
rules: {
25-
// allow paren-less arrow functions
26-
'arrow-parens': 'off',
27-
// allow async-await
28-
'generator-star-spacing': 'off',
29-
// allow debugger during development
12+
// 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
3013
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
14+
3115
// allow semicolons and the end of a statement
3216
'semi': 'off',
3317

@@ -45,5 +29,19 @@ module.exports = {
4529
'padded-blocks': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
4630
'keyword-spacing': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
4731
'arrow-spacing': process.env.NODE_ENV === 'development' ? 'warn' : 'error'
48-
}
32+
},
33+
parserOptions: {
34+
parser: 'babel-eslint',
35+
},
36+
overrides: [
37+
{
38+
files: [
39+
'**/__tests__/*.{j,t}s?(x)',
40+
'**/tests/unit/**/*.spec.{j,t}s?(x)'
41+
],
42+
env: {
43+
mocha: true
44+
}
45+
}
46+
]
4947
}

.gitignore

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
.DS_Store
2-
node_modules/
3-
dist/
2+
node_modules
3+
/dist
4+
5+
# local env files
6+
.env.local
7+
.env.*.local
8+
9+
# Log files
410
npm-debug.log*
511
yarn-debug.log*
612
yarn-error.log*
13+
14+
# Unit tests coverage reports
715
test/unit/coverage/
16+
tests/unit/coverage/
817

918
# Editor directories and files
1019
.idea
@@ -13,3 +22,4 @@ test/unit/coverage/
1322
*.ntvs*
1423
*.njsproj
1524
*.sln
25+
*.sw?

.gitpod

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ports:
44
onOpen: open-preview
55
tasks:
66
- init: npm install && npm run init:app
7-
command: npm run dev
7+
command: npm run serve
88
vscode:
99
extensions:
1010
- dbaeumer.vscode-eslint

.postcssrc.js

-10
This file was deleted.

README.md

+23-5
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ npm run init:app
5151

5252
``` bash
5353
# serve with hot reload at localhost:8081
54-
npm run dev
54+
npm run serve
5555
```
5656

5757
### Unit tests
5858

59-
To run all unit tests execute the following:
59+
To run all unit tests using Karma test runner execute the following:
6060

6161
``` bash
6262
# run all tests
63-
npm test
63+
npm run test
6464
```
6565

6666
NB the unit tests require Chrome or Chromium browser executable to be found.
@@ -83,7 +83,25 @@ Run the build script in order to create a production build, which can be copied
8383
npm run build
8484
```
8585

86-
For detailed explanation on how things work, checkout the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
86+
### Linting your files
87+
88+
Run the lint script in order to lint all your files without fixing the errors. The problems will be reported in the console only.
89+
90+
``` bash
91+
npm run lint
92+
```
93+
94+
### Linting and fixing your files
95+
96+
Run the lint script in order to lint all your files and fix the errors at the same time.
97+
98+
``` bash
99+
npm run lint:fix
100+
```
101+
102+
### Customize configuration
103+
104+
See [Configuration Reference](https://cli.vuejs.org/config/).
87105

88106
## Run with Docker
89107

@@ -140,6 +158,6 @@ You need professional support or teachings for Wegue? Please contact a service p
140158

141159
## Credits
142160

143-
The basic project setup was created by https://github.com/vuejs-templates/webpack.
161+
The basic project setup was created with [Vue CLI](https://cli.vuejs.org).
144162

145163
Thanks for this great template! :+1:

babel.config.js

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
module.exports = {
2+
presets: [
3+
'@vue/app'
4+
],
5+
plugins: [
6+
'@babel/plugin-proposal-nullish-coalescing-operator',
7+
'@babel/plugin-proposal-optional-chaining'
8+
],
9+
'env': {
10+
'test': {
11+
'plugins': ['istanbul']
12+
}
13+
}
14+
}

build/build.js

-41
This file was deleted.

build/check-versions.js

-54
This file was deleted.

0 commit comments

Comments
 (0)