Skip to content

Commit 8974b8d

Browse files
kdydesignkdydesign
committed
chore(depd): upgrade all modules
1 parent 65bf3e0 commit 8974b8d

File tree

7 files changed

+185
-201
lines changed

7 files changed

+185
-201
lines changed

‎meta.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@ module.exports = {
166166
deps (plugins) {
167167
let output = ''
168168
const dependencies = {
169-
axios: '^0.19.2',
169+
axios: '^0.21.1',
170170
'vue-electron': '^1.0.6',
171-
'vue-router': '^3.2.0',
172-
vuex: '^3.4.0',
171+
'vue-router': '^3.4.9',
172+
vuex: '^3.6.0',
173173
'vuex-electron': '^1.0.3'
174174
}
175175

@@ -187,10 +187,10 @@ module.exports = {
187187

188188
switch (framework) {
189189
case 'vuetify':
190-
output = ', \n "vuetify": "^2.2.29"'
190+
output = ', \n "vuetify": "^2.4.0"'
191191
break
192192
case 'quasar':
193-
output = ', \n "quasar": "^1.11.3"'
193+
output = ', \n "quasar": "^1.14.7"'
194194
break
195195
}
196196

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
"standard-version": "latest"
5454
},
5555
"engines": {
56-
"node": ">= 12"
56+
"node": ">= 12.18.3"
5757
}
5858
}

‎template/.electron-vue/webpack.renderer.config.js

+19-44
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ const TerserPlugin = require('terser-webpack-plugin')
1010
const CopyWebpackPlugin = require('copy-webpack-plugin')
1111
const MiniCssExtractPlugin = require('mini-css-extract-plugin')
1212
const HtmlWebpackPlugin = require('html-webpack-plugin')
13-
const { VueLoaderPlugin } = require('vue-loader')
13+
const VueLoaderPlugin = require('vue-loader/lib/plugin')
14+
const ExtractTextPlugin = require('extract-text-webpack-plugin')
1415

1516
/**
1617
* List of node_modules to include in webpack bundle
@@ -19,10 +20,10 @@ const { VueLoaderPlugin } = require('vue-loader')
1920
* that provide pure *.vue files that need compiling
2021
* https://simulatedgreg.gitbooks.io/electron-vue/content/en/webpack-configurations.html#white-listing-externals
2122
*/
22-
let whiteListedModules = ['vue'{{#if_eq framework 'vuetify'}}, 'vuetify'{{/if_eq}}{{#if_eq framework 'quasar'}}, 'quasar'{{/if_eq}}]
23+
let whiteListedModules = ['vue', 'quasar']
2324

2425
let rendererConfig = {
25-
devtool: '#cheap-module-eval-source-map',
26+
devtool: 'source-map',
2627
entry: {
2728
renderer: path.join(__dirname, '../src/renderer/main.js')
2829
},
@@ -31,7 +32,6 @@ let rendererConfig = {
3132
],
3233
module: {
3334
rules: [
34-
{{#if eslint}}
3535
{
3636
test: /\.(js|vue)$/,
3737
enforce: 'pre',
@@ -43,32 +43,13 @@ let rendererConfig = {
4343
}
4444
}
4545
},
46-
{{/if}}
47-
{{#if_eq csspreprocessor 'sass'}}
48-
{
49-
test: /\.scss$/,
50-
use: ['vue-style-loader', 'css-loader', 'sass-loader']
51-
},
52-
{
53-
test: /\.sass$/,
54-
use: ['vue-style-loader', 'css-loader', 'sass-loader?indentedSyntax']
55-
},
56-
{{/if_eq}}
57-
{{#if_eq csspreprocessor 'less'}}
58-
{
59-
test: /\.less$/,
60-
use: ['vue-style-loader', 'css-loader', 'less-loader']
61-
},
62-
{{/if_eq}}
63-
{{#if_eq csspreprocessor 'stylus'}}
6446
{
6547
test: /\.styl$/,
66-
use: ['vue-style-loader', 'css-loader', 'stylus-loader']
48+
use: [MiniCssExtractPlugin.loader, 'css-loader', 'stylus-loader']
6749
},
68-
{{/if_eq}}
6950
{
7051
test: /\.css$/,
71-
use: ['vue-style-loader', 'css-loader']
52+
use: [MiniCssExtractPlugin.loader, 'css-loader']
7253
},
7354
{
7455
test: /\.html$/,
@@ -89,24 +70,18 @@ let rendererConfig = {
8970
loader: 'vue-loader',
9071
options: {
9172
extractCSS: process.env.NODE_ENV === 'production',
92-
loaders: {
93-
sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax=1',
94-
scss: 'vue-style-loader!css-loader!sass-loader',
95-
less: 'vue-style-loader!css-loader!less-loader',
96-
styl: 'vue-style-loader!css-loader!stylus-loader'
73+
loaders: {
74+
sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax=1',
75+
scss: 'vue-style-loader!css-loader!sass-loader',
76+
less: 'vue-style-loader!css-loader!less-loader',
77+
styl: 'vue-style-loader!css-loader!stylus-loader'
9778
}
9879
}
9980
}
10081
},
10182
{
102-
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
103-
use: {
104-
loader: 'url-loader',
105-
query: {
106-
limit: 10000,
107-
name: 'imgs/[name]--[folder].[ext]'
108-
}
109-
}
83+
test: /\.(png|jpe?g|gif)$/i,
84+
use: 'file-loader?name=[name].[ext]',
11085
},
11186
{
11287
test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
@@ -120,7 +95,7 @@ let rendererConfig = {
12095
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
12196
use: {
12297
loader: 'url-loader',
123-
query: {
98+
options: {
12499
limit: 10000,
125100
name: 'fonts/[name]--[folder].[ext]'
126101
}
@@ -144,8 +119,8 @@ let rendererConfig = {
144119
removeComments: true
145120
},
146121
nodeModules: process.env.NODE_ENV !== 'production'
147-
? path.resolve(__dirname, '../node_modules')
148-
: false
122+
? path.resolve(__dirname, '../node_modules')
123+
: false
149124
}),
150125
new webpack.HotModuleReplacementPlugin()
151126
],
@@ -172,9 +147,9 @@ let rendererConfig = {
172147
*/
173148
if (process.env.NODE_ENV !== 'production') {
174149
rendererConfig.plugins.push(
175-
new webpack.DefinePlugin({
176-
'__static': `"${path.join(__dirname, '../static').replace(/\\/g, '\\\\')}"`
177-
})
150+
new webpack.DefinePlugin({
151+
'__static': `"${path.join(__dirname, '../static').replace(/\\/g, '\\\\')}"`
152+
})
178153
)
179154
}
180155

‎template/package.json

+52-52
Original file line numberDiff line numberDiff line change
@@ -77,104 +77,104 @@
7777
},
7878
{{/if_eq}}
7979
"dependencies": {
80-
"vue": "^2.6.11"{{deps plugins}}{{depsf framework}}
80+
"vue": "^2.6.12"{{deps plugins}}{{depsf framework}}
8181
},
8282
"devDependencies": {
83-
"ajv": "^6.12.2",
84-
"@babel/core": "^7.9.6",
83+
"ajv": "^7.0.2",
84+
"@babel/core": "^7.12.10",
8585
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
86-
"@babel/plugin-transform-runtime": "^7.9.6",
87-
"@babel/preset-env": "^7.9.6",
88-
"@babel/preset-react": "^7.9.4",
86+
"@babel/plugin-transform-runtime": "^7.12.10",
87+
"@babel/preset-env": "^7.12.11",
88+
"@babel/preset-react": "^7.12.10",
8989
{{#if_eq framework 'quasar'}}
90-
"@quasar/extras": "^1.8.1",
90+
"@quasar/extras": "^1.9.12",
9191
{{/if_eq}}
92-
"babel-loader": "^8.1.0",
92+
"babel-loader": "^8.2.2",
9393
"babel-register": "^6.26.0",
94-
"cfonts": "^2.8.2",
95-
"chalk": "^4.0.0",
96-
"copy-webpack-plugin": "^6.0.1",
97-
"terser-webpack-plugin": "^3.0.1",
98-
"cross-env": "^7.0.2",
99-
"css-loader": "^3.5.3",
100-
"del": "^5.1.0",
94+
"cfonts": "^2.9.1",
95+
"chalk": "^4.1.0",
96+
"copy-webpack-plugin": "^6.2.1",
97+
"terser-webpack-plugin": "^4.2.3",
98+
"cross-env": "^7.0.3",
99+
"css-loader": "^5.0.1",
100+
"del": "^6.0.0",
101101
"devtron": "^1.4.0",
102-
"electron": "^9.0.0",
103-
"electron-debug": "^3.0.1",
104-
"electron-devtools-installer": "^3.0.0",
102+
"electron": "^11.1.1",
103+
"electron-debug": "^3.2.0",
104+
"electron-devtools-installer": "^3.1.1",
105105
{{#if_eq builder 'packager'}}
106-
"electron-packager": "^14.2.1",
107-
"electron-rebuild": "^1.11.0",
106+
"electron-packager": "^15.2.0",
107+
"electron-rebuild": "^2.3.4",
108108
{{else}}
109-
"electron-builder": "^22.6.1",
109+
"electron-builder": "^22.9.1",
110110
{{/if_eq}}
111111
{{#eslint}}
112112
"babel-eslint": "^10.1.0",
113-
"eslint": "^7.0.0",
113+
"eslint": "^7.16.0",
114114
"eslint-friendly-formatter": "^4.0.1",
115115
"eslint-loader": "^4.0.2",
116-
"eslint-plugin-html": "^6.0.2",
116+
"eslint-plugin-html": "^6.1.1",
117117
{{#if_eq eslintConfig 'standard'}}
118-
"eslint-config-standard": "^14.1.1",
119-
"eslint-plugin-import": "^2.20.2",
118+
"eslint-config-standard": "^16.0.2",
119+
"eslint-plugin-import": "^2.22.1",
120120
"eslint-plugin-node": "^11.1.0",
121121
"eslint-plugin-promise": "^4.2.1",
122-
"eslint-plugin-standard": "^4.0.1",
123-
"eslint-plugin-vue": "^6.2.2",
122+
"eslint-plugin-standard": "^5.0.0",
123+
"eslint-plugin-vue": "^7.4.0",
124124
{{/if_eq}}
125125
{{#if_eq eslintConfig 'airbnb'}}
126-
"eslint-config-airbnb-base": "^14.1.0",
127-
"eslint-import-resolver-webpack": "^0.12.1",
128-
"eslint-plugin-import": "^2.19.1",
126+
"eslint-config-airbnb-base": "^14.2.1",
127+
"eslint-import-resolver-webpack": "^0.13.0",
128+
"eslint-plugin-import": "^2.22.1",
129129
{{/if_eq}}
130130
{{/eslint}}
131-
"mini-css-extract-plugin": "^0.9.0",
132-
"file-loader": "^6.0.0",
133-
"html-webpack-plugin": "^4.3.0",
131+
"mini-css-extract-plugin": "^1.3.3",
132+
"file-loader": "^6.2.0",
133+
"html-webpack-plugin": "^4.5.0",
134134
{{#if unit}}
135135
"inject-loader": "^4.0.1",
136-
"karma": "^5.0.9",
136+
"karma": "^5.2.3",
137137
"karma-chai": "^0.1.0",
138-
"karma-coverage": "^2.0.2",
139-
"karma-electron": "^6.3.0",
138+
"karma-coverage": "^2.0.3",
139+
"karma-electron": "^6.3.1",
140140
"karma-mocha": "^2.0.1",
141-
"karma-sourcemap-loader": "^0.3.7",
141+
"karma-sourcemap-loader": "^0.3.8",
142142
"karma-spec-reporter": "^0.0.32",
143143
"karma-webpack": "^4.0.2",
144144
{{/if}}
145145
{{#if e2e}}
146146
"require-dir": "^1.2.0",
147-
"spectron": "^11.0.0",
147+
"spectron": "^13.0.0",
148148
{{/if}}
149149
{{#testing unit e2e}}
150150
"babel-plugin-istanbul": "^6.0.0",
151151
"chai": "^4.2.0",
152-
"mocha": "^7.1.2",
152+
"mocha": "^8.2.1",
153153
{{/testing}}
154154
"multispinner": "^0.2.1",
155-
"node-loader": "^0.6.0",
155+
"node-loader": "^1.0.2",
156156
{{#if_eq csspreprocessor 'sass'}}
157-
"node-sass": "^4.14.1",
158-
"sass-loader": "^8.0.2",
157+
"node-sass": "^5.0.0",
158+
"sass-loader": "^10.1.0",
159159
{{/if_eq}}
160160
{{#if_eq csspreprocessor 'less'}}
161-
"less": "^3.11.1",
162-
"less-loader": "^6.1.0",
161+
"less": "^4.0.0",
162+
"less-loader": "^7.2.0",
163163
{{/if_eq}}
164164
{{#if_eq csspreprocessor 'stylus'}}
165-
"stylus": "^0.54.7",
166-
"stylus-loader": "^3.0.2",
165+
"stylus": "^0.54.8",
166+
"stylus-loader": "^4.3.1",
167167
{{/if_eq}}
168-
"style-loader": "^1.2.1",
169-
"url-loader": "^4.1.0",
168+
"style-loader": "^2.0.0",
169+
"url-loader": "^4.1.1",
170170
"vue-html-loader": "^1.2.4",
171-
"vue-loader": "^15.9.2",
171+
"vue-loader": "^15.9.6",
172172
"vue-style-loader": "^4.1.2",
173-
"vue-template-compiler": "^2.6.11",
173+
"vue-template-compiler": "^2.6.12",
174174
"webpack": "^4.43.0",
175-
"webpack-cli": "^3.3.11",
175+
"webpack-cli": "^4.3.0",
176176
"webpack-dev-server": "^3.11.0",
177177
"webpack-hot-middleware": "^2.25.0",
178-
"webpack-merge": "^4.2.2"
178+
"webpack-merge": "^5.7.3"
179179
}
180180
}

‎template/src/main/index.dev.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
* environment.
66
*/
77

8-
/* eslint-disable */
8+
const { app } = require('electron')
99

1010
// Install `electron-debug` with `devtron`
1111
require('electron-debug')({ showDevTools: true })
1212

1313
// Install `vue-devtools`
14-
require('electron').app.on('ready', async () => {
15-
await require('devtron').install()
14+
app.whenReady().then(() => {
15+
require('devtron').install()
1616

17-
let installExtension = require('electron-devtools-installer')
17+
const installExtension = require('electron-devtools-installer')
1818
installExtension.default(installExtension.VUEJS_DEVTOOLS)
19-
.then(() => {})
20-
.catch(err => {
21-
console.log('Unable to install `vue-devtools`: \n', err)
22-
})
19+
.then(() => {})
20+
.catch(err => {
21+
console.log('Unable to install `vue-devtools`: \n', err)
22+
})
2323
})
2424

2525
// Require `main` process to boot app

‎template/src/main/index.js

+8-5
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@
22
'use strict'
33

44
{{/if_eq}}
5-
import { app, BrowserWindow } from 'electron'{{#if_eq eslintConfig 'airbnb'}} // eslint-disable-line{{/if_eq}}
5+
const { app, BrowserWindow } = require('electron')
6+
const { join } = require('path')
67

78
/**
89
* Set `__static` path to static files in production
910
* https://simulatedgreg.gitbooks.io/electron-vue/content/en/using-static-assets.html
1011
*/
1112
if (process.env.NODE_ENV !== 'development') {
12-
global.__static = require('path').join(__dirname, '/static').replace(/\\/g, '\\\\'){{#if_eq eslintConfig 'airbnb'}} // eslint-disable-line{{/if_eq}}
13+
global.__static = join(__dirname, '/static').replace(/\\/g, '\\\\')
1314
}
1415

1516
let mainWindow
1617
const winURL = process.env.NODE_ENV === 'development'
17-
? 'http://localhost:9080'
18-
: `file://${__dirname}/index.html`
18+
? 'http://localhost:9080'
19+
: join('file://', __dirname, '/index.html')
1920

2021
function createWindow () {
2122
/**
@@ -37,7 +38,9 @@ function createWindow () {
3738
})
3839
}
3940

40-
app.on('ready', createWindow)
41+
app.whenReady().then(() => {
42+
createWindow()
43+
})
4144

4245
app.on('window-all-closed', () => {
4346
if (process.platform !== 'darwin') {

0 commit comments

Comments
 (0)