Skip to content

Commit c2967cb

Browse files
committed
Merge remote-tracking branch 'upgrade/lastVueCLI4' into build/upgrade_ol_v6.7.0
2 parents e6ba048 + 5e66257 commit c2967cb

Some content is hidden

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

62 files changed

+6783
-3295
lines changed

.browserslistrc

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
> 1%
22
last 2 versions
3+
not dead

.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = {
99
'@vue/standard'
1010
],
1111
rules: {
12-
// 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
12+
// 'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
1313
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
1414

1515
// allow semicolons and the end of a statement

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
node_modules
33
/dist
44

5+
56
# local env files
67
.env.local
78
.env.*.local
@@ -10,6 +11,7 @@ node_modules
1011
npm-debug.log*
1112
yarn-debug.log*
1213
yarn-error.log*
14+
pnpm-debug.log*
1315

1416
# Unit tests coverage reports
1517
test/unit/coverage/

app-starter/WguAppTemplate.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
// make the refs (floating module window, which are not connected to their
130130
// related components, e.g. buttons to toggle them)
131131
const refs = this.$refs;
132-
let cmpLookup = {};
132+
const cmpLookup = {};
133133
for (const key of Object.keys(refs)) {
134134
cmpLookup[key] = refs[key][0];
135135
}
@@ -145,15 +145,15 @@
145145
*/
146146
getSidebarConfig () {
147147
const appConfig = Vue.prototype.$appConfig || {};
148-
return appConfig['sidebar'];
148+
return appConfig.sidebar;
149149
},
150150
/**
151151
* Returns the configuration object for the overview map from app-config.
152152
* @return {Object} Overview map configuration object.
153153
*/
154154
getOverviewMapConfig () {
155155
const appConfig = Vue.prototype.$appConfig || {};
156-
return appConfig['overviewMap'];
156+
return appConfig.overviewMap;
157157
},
158158
/**
159159
* Determines the module window configuration objects from app-config:
@@ -167,7 +167,7 @@
167167
getModuleWinData (target) {
168168
const appConfig = Vue.prototype.$appConfig || {};
169169
const modulesConfs = appConfig.modules || {};
170-
let moduleWins = [];
170+
const moduleWins = [];
171171
for (const key of Object.keys(modulesConfs)) {
172172
const moduleOpts = appConfig.modules[key];
173173
if (moduleOpts.win === target) {

app-starter/components/AppHeader.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export default {
102102
getModuleButtons (target) {
103103
const appConfig = Vue.prototype.$appConfig || {};
104104
const modulesConfs = appConfig.modules || {};
105-
let buttons = [];
105+
const buttons = [];
106106
for (const key of Object.keys(modulesConfs)) {
107107
const moduleOpts = appConfig.modules[key];
108108
if (moduleOpts.target === target) {

babel.config.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module.exports = {
22
presets: [
3-
'@vue/app'
3+
'@vue/cli-plugin-babel/preset'
44
],
5-
plugins: [
6-
'@babel/plugin-proposal-nullish-coalescing-operator',
7-
'@babel/plugin-proposal-optional-chaining'
8-
],
9-
'env': {
10-
'test': {
11-
'plugins': ['istanbul']
5+
env: {
6+
test: {
7+
plugins: [
8+
['istanbul', {
9+
extension: ['.js', '.vue']
10+
}]
11+
]
1212
}
1313
}
1414
}

0 commit comments

Comments
 (0)