umbrella22

将主进程修改为ts,主进程添加__lib文件路径,更新依赖

...@@ -2,13 +2,15 @@ ...@@ -2,13 +2,15 @@
2 2
3 process.env.BABEL_ENV = 'main' 3 process.env.BABEL_ENV = 'main'
4 4
5 -const os = require('os')
6 const path = require('path') 5 const path = require('path')
7 const { dependencies } = require('../package.json') 6 const { dependencies } = require('../package.json')
8 const webpack = require('webpack') 7 const webpack = require('webpack')
9 const MinifyPlugin = require("babel-minify-webpack-plugin"); 8 const MinifyPlugin = require("babel-minify-webpack-plugin");
10 -const HappyPack = require('happypack') 9 +const config = require('../config')
11 -const HappyThreadPool = HappyPack.ThreadPool({ size: os.cpus().length > 4 ? 4 : os.cpus().length }) 10 +
11 +// const os = require('os')
12 +// const HappyPack = require('happypack')
13 +// const HappyThreadPool = HappyPack.ThreadPool({ size: os.cpus().length > 4 ? 4 : os.cpus().length })
12 14
13 function resolve(dir) { 15 function resolve(dir) {
14 return path.join(__dirname, '..', dir) 16 return path.join(__dirname, '..', dir)
...@@ -16,7 +18,7 @@ function resolve(dir) { ...@@ -16,7 +18,7 @@ function resolve(dir) {
16 18
17 let mainConfig = { 19 let mainConfig = {
18 entry: { 20 entry: {
19 - main: path.join(__dirname, '../src/main/index.js') 21 + main: path.join(__dirname, '../src/main/index.ts')
20 }, 22 },
21 externals: [ 23 externals: [
22 ...Object.keys(dependencies || {}) 24 ...Object.keys(dependencies || {})
...@@ -34,10 +36,20 @@ let mainConfig = { ...@@ -34,10 +36,20 @@ let mainConfig = {
34 // } 36 // }
35 // } 37 // }
36 // }, 38 // },
39 + // {
40 + // test: /\.js$/,
41 + // use: 'happypack/loader?id=MainHappyBabel',
42 + // exclude: /node_modules/
43 + // },
37 { 44 {
38 - test: /\.js$/, 45 + test: /\.ts$/,
39 - use: 'happypack/loader?id=MainHappyBabel', 46 + use: [{
40 - exclude: /node_modules/ 47 + loader: 'babel-loader',
48 + options: {
49 + cacheDirectory: true
50 + }
51 + }, 'ts-loader'],
52 +
41 }, 53 },
42 { 54 {
43 test: /\.node$/, 55 test: /\.node$/,
...@@ -56,16 +68,16 @@ let mainConfig = { ...@@ -56,16 +68,16 @@ let mainConfig = {
56 }, 68 },
57 plugins: [ 69 plugins: [
58 new webpack.NoEmitOnErrorsPlugin(), 70 new webpack.NoEmitOnErrorsPlugin(),
59 - new HappyPack({ 71 + // new HappyPack({
60 - id: "MainHappyBabel", 72 + // id: "MainHappyBabel",
61 - loaders: [{ 73 + // loaders: [{
62 - loader: 'babel-loader', 74 + // loader: 'babel-loader',
63 - options: { 75 + // options: {
64 - cacheDirectory: true 76 + // cacheDirectory: true
65 - } 77 + // }
66 - }], 78 + // }],
67 - threadPool: HappyThreadPool 79 + // threadPool: HappyThreadPool
68 - }) 80 + // })
69 ], 81 ],
70 resolve: { 82 resolve: {
71 alias: { 83 alias: {
...@@ -82,7 +94,8 @@ let mainConfig = { ...@@ -82,7 +94,8 @@ let mainConfig = {
82 if (process.env.NODE_ENV !== 'production') { 94 if (process.env.NODE_ENV !== 'production') {
83 mainConfig.plugins.push( 95 mainConfig.plugins.push(
84 new webpack.DefinePlugin({ 96 new webpack.DefinePlugin({
85 - '__static': `"${path.join(__dirname, '../static').replace(/\\/g, '\\\\')}"` 97 + '__static': `"${path.join(__dirname, '../static').replace(/\\/g, '\\\\')}"`,
98 + '__lib': `"${path.join(__dirname, `../${config.DllFolder}`).replace(/\\/g, '\\\\')}"`
86 }) 99 })
87 ) 100 )
88 } 101 }
......
...@@ -9,7 +9,7 @@ module.exports = { ...@@ -9,7 +9,7 @@ module.exports = {
9 chineseLog: false, 9 chineseLog: false,
10 port: 9080 10 port: 9080
11 }, 11 },
12 - UseStartupChart: false, 12 + UseStartupChart: true,
13 IsUseSysTitle: true, 13 IsUseSysTitle: true,
14 DllFolder: '', 14 DllFolder: '',
15 BuiltInServerPort: 25565 15 BuiltInServerPort: 25565
......
...@@ -81,11 +81,11 @@ ...@@ -81,11 +81,11 @@
81 "js-cookie": "^2.2.1", 81 "js-cookie": "^2.2.1",
82 "nprogress": "^0.2.0", 82 "nprogress": "^0.2.0",
83 "vue": "^2.6.11", 83 "vue": "^2.6.11",
84 - "vue-router": "^3.3.2", 84 + "vue-router": "^3.4.3",
85 "vuex": "^3.5.1" 85 "vuex": "^3.5.1"
86 }, 86 },
87 "devDependencies": { 87 "devDependencies": {
88 - "@babel/core": "^7.11.0", 88 + "@babel/core": "^7.11.1",
89 "@babel/plugin-proposal-class-properties": "^7.10.4", 89 "@babel/plugin-proposal-class-properties": "^7.10.4",
90 "@babel/plugin-proposal-decorators": "^7.10.5", 90 "@babel/plugin-proposal-decorators": "^7.10.5",
91 "@babel/plugin-proposal-do-expressions": "^7.10.4", 91 "@babel/plugin-proposal-do-expressions": "^7.10.4",
...@@ -106,7 +106,9 @@ ...@@ -106,7 +106,9 @@
106 "@babel/polyfill": "^7.10.4", 106 "@babel/polyfill": "^7.10.4",
107 "@babel/preset-env": "^7.11.0", 107 "@babel/preset-env": "^7.11.0",
108 "@babel/register": "^7.10.5", 108 "@babel/register": "^7.10.5",
109 - "@babel/runtime": "^7.11.0", 109 + "@babel/runtime": "^7.11.2",
110 + "@types/fs-extra": "^9.0.1",
111 + "@types/node": "^14.0.27",
110 "ajv": "^6.12.3", 112 "ajv": "^6.12.3",
111 "babel-eslint": "^9.0.0", 113 "babel-eslint": "^9.0.0",
112 "babel-loader": "^8.1.0", 114 "babel-loader": "^8.1.0",
...@@ -116,16 +118,16 @@ ...@@ -116,16 +118,16 @@
116 "chalk": "^4.0.0", 118 "chalk": "^4.0.0",
117 "copy-webpack-plugin": "^6.0.3", 119 "copy-webpack-plugin": "^6.0.3",
118 "cross-env": "^7.0.2", 120 "cross-env": "^7.0.2",
119 - "css-loader": "^4.2.0", 121 + "css-loader": "^4.2.1",
120 "del": "^5.1.0", 122 "del": "^5.1.0",
121 - "electron": "^9.1.2", 123 + "electron": "^9.2.0",
122 - "electron-builder": "^22.6.1", 124 + "electron-builder": "^22.8.0",
123 "electron-devtools-installer": "^3.1.1", 125 "electron-devtools-installer": "^3.1.1",
124 "eslint": "^6.8.0", 126 "eslint": "^6.8.0",
125 "eslint-config-standard": "^14.1.1", 127 "eslint-config-standard": "^14.1.1",
126 "eslint-friendly-formatter": "^4.0.1", 128 "eslint-friendly-formatter": "^4.0.1",
127 "eslint-loader": "^3.0.4", 129 "eslint-loader": "^3.0.4",
128 - "eslint-plugin-html": "^6.0.2", 130 + "eslint-plugin-html": "^6.0.3",
129 "eslint-plugin-import": "^2.22.0", 131 "eslint-plugin-import": "^2.22.0",
130 "eslint-plugin-node": "^9.2.0", 132 "eslint-plugin-node": "^9.2.0",
131 "eslint-plugin-promise": "^4.2.1", 133 "eslint-plugin-promise": "^4.2.1",
...@@ -133,17 +135,19 @@ ...@@ -133,17 +135,19 @@
133 "file-loader": "^6.0.0", 135 "file-loader": "^6.0.0",
134 "happypack": "^5.0.1", 136 "happypack": "^5.0.1",
135 "html-webpack-plugin": "^4.3.0", 137 "html-webpack-plugin": "^4.3.0",
136 - "mini-css-extract-plugin": "0.9.0", 138 + "mini-css-extract-plugin": "0.10.0",
137 "multispinner": "^0.2.1", 139 "multispinner": "^0.2.1",
138 - "node-loader": "^1.0.0", 140 + "node-loader": "^1.0.1",
139 "portfinder": "^1.0.28", 141 "portfinder": "^1.0.28",
140 "sass": "^1.26.10", 142 "sass": "^1.26.10",
141 - "sass-loader": "^9.0.2", 143 + "sass-loader": "^9.0.3",
142 "split2": "^3.1.1", 144 "split2": "^3.1.1",
143 "style-loader": "^1.2.1", 145 "style-loader": "^1.2.1",
144 "svg-sprite-loader": "^5.0.0", 146 "svg-sprite-loader": "^5.0.0",
145 - "terser-webpack-plugin": "^3.0.8", 147 + "terser-webpack-plugin": "^4.1.0",
146 "through2-filter": "^3.0.0", 148 "through2-filter": "^3.0.0",
149 + "ts-loader": "^8.0.2",
150 + "typescript": "^3.9.7",
147 "url-loader": "^4.1.0", 151 "url-loader": "^4.1.0",
148 "vue-html-loader": "^1.2.4", 152 "vue-html-loader": "^1.2.4",
149 "vue-loader": "^15.9.3", 153 "vue-loader": "^15.9.3",
...@@ -153,6 +157,6 @@ ...@@ -153,6 +157,6 @@
153 "webpack-cli": "^3.3.12", 157 "webpack-cli": "^3.3.12",
154 "webpack-dev-server": "^3.11.0", 158 "webpack-dev-server": "^3.11.0",
155 "webpack-hot-middleware": "^2.25.0", 159 "webpack-hot-middleware": "^2.25.0",
156 - "webpack-merge": "^5.0.9" 160 + "webpack-merge": "^5.1.1"
157 } 161 }
158 } 162 }
......
1 import { globalShortcut } from 'electron' 1 import { globalShortcut } from 'electron'
2 -import config from '@config' 2 +import config from '@config/index'
3 3
4 export default { 4 export default {
5 Disablef12 () { 5 Disablef12 () {
......
1 -// 这里定义了静态文件路径的位置
2 -import path from 'path'
3 -
4 -/**
5 - * Set `__static` path to static files in production
6 - * https://simulatedgreg.gitbooks.io/electron-vue/content/en/using-static-assets.html
7 - */
8 -// 这个瓜皮全局变量只能在单个js中生效,而并不是整个主进程中
9 -if (process.env.NODE_ENV !== 'development') {
10 - global.__static = path.join(__dirname, '/static').replace(/\\/g, '\\\\')
11 -}
12 -
13 -export const winURL = process.env.NODE_ENV === 'development' ? `http://localhost:${process.env.PORT}` : `file://${__dirname}/index.html`
14 -export const loadingURL = process.env.NODE_ENV === 'development' ? `http://localhost:${process.env.PORT}/static/loader.html` : `file://${__static}/loader.html`
1 +// 这里定义了静态文件路径的位置
2 +import { join } from 'path'
3 +import { DllFolder } from '@config/index'
4 +
5 +var __static: string
6 +var __lib: string
7 +if (process.env.NODE_ENV !== 'development') {
8 + __static = join(__dirname, '/static').replace(/\\/g, '\\\\');
9 + __lib = join(__dirname, '..', '..', '..', '..', `${DllFolder}`).replace(/\\/g, '\\\\')
10 +}
11 +
12 +
13 +export const winURL = process.env.NODE_ENV === 'development' ? `http://localhost:${process.env.PORT}` : `file://${__dirname}/index.html`
14 +export const loadingURL = process.env.NODE_ENV === 'development' ? `http://localhost:${process.env.PORT}/static/loader.html` : `file://${__static}/loader.html`
15 +export const lib = __lib
...\ No newline at end of file ...\ No newline at end of file
1 // 这里是定义菜单的地方,详情请查看 https://electronjs.org/docs/api/menu 1 // 这里是定义菜单的地方,详情请查看 https://electronjs.org/docs/api/menu
2 -const { dialog } = require('electron') 2 +import { dialog } from 'electron'
3 -const os = require('os') 3 +import { type, arch, release } from 'os'
4 -const version = require('../../../package.json').version 4 +import { version } from '../../../package.json'
5 +
5 const menu = [ 6 const menu = [
6 { 7 {
7 label: '设置', 8 label: '设置',
...@@ -24,14 +25,15 @@ const menu = [ ...@@ -24,14 +25,15 @@ const menu = [
24 } 25 }
25 }] 26 }]
26 }] 27 }]
27 -function info () { 28 +function info() {
28 dialog.showMessageBox({ 29 dialog.showMessageBox({
29 title: '关于', 30 title: '关于',
30 type: 'info', 31 type: 'info',
31 message: 'electron-Vue框架', 32 message: 'electron-Vue框架',
32 - detail: `版本信息:${version}\n引擎版本:${process.versions.v8}\n当前系统:${os.type()} ${os.arch()} ${os.release()}`, 33 + detail: `版本信息:${version}\n引擎版本:${process.versions.v8}\n当前系统:${type()} ${arch()} ${release()}`,
33 noLink: true, 34 noLink: true,
34 buttons: ['查看github', '确定'] 35 buttons: ['查看github', '确定']
35 }) 36 })
36 } 37 }
38 +
37 export default menu 39 export default menu
......
...@@ -5,7 +5,7 @@ import initWindow from './services/windowManager' ...@@ -5,7 +5,7 @@ import initWindow from './services/windowManager'
5 import DisableButton from './config/DisableButton' 5 import DisableButton from './config/DisableButton'
6 6
7 function onAppReady () { 7 function onAppReady () {
8 - initWindow() 8 + new initWindow().initWindow()
9 DisableButton.Disablef12() 9 DisableButton.Disablef12()
10 } 10 }
11 11
......
1 /* eslint-disable prefer-promise-reject-errors */ 1 /* eslint-disable prefer-promise-reject-errors */
2 import app from './server' 2 import app from './server'
3 -import http from 'http' 3 +import { createServer } from 'http'
4 -import config from '@config' 4 +import config from '@config/index'
5 const port = config.BuiltInServerPort 5 const port = config.BuiltInServerPort
6 var server = null 6 var server = null
7 app.set('port', port) 7 app.set('port', port)
8 8
9 export default { 9 export default {
10 - StatrServer () { 10 + StatrServer() {
11 return new Promise((resolve, reject) => { 11 return new Promise((resolve, reject) => {
12 - server = http.createServer(app) 12 + server = createServer(app)
13 server.listen(port) 13 server.listen(port)
14 server.on('error', (error) => { 14 server.on('error', (error) => {
15 switch (error.code) { 15 switch (error.code) {
...@@ -28,9 +28,8 @@ export default { ...@@ -28,9 +28,8 @@ export default {
28 }) 28 })
29 }) 29 })
30 }, 30 },
31 - StopServer () { 31 + StopServer() {
32 return new Promise((resolve, reject) => { 32 return new Promise((resolve, reject) => {
33 - console.log(server)
34 if (server) { 33 if (server) {
35 server.close() 34 server.close()
36 server.on('close', () => { 35 server.on('close', () => {
......
1 import { autoUpdater } from 'electron-updater' 1 import { autoUpdater } from 'electron-updater'
2 -import { ipcMain } from 'electron' 2 +import { ipcMain, BrowserWindow } from 'electron'
3 /** 3 /**
4 * -1 检查更新失败 0 正在检查更新 1 检测到新版本,准备下载 2 未检测到新版本 3 下载中 4 下载完成 4 * -1 检查更新失败 0 正在检查更新 1 检测到新版本,准备下载 2 未检测到新版本 3 下载中 4 下载完成
5 **/ 5 **/
6 -function Message (mainWindow, type, data) { 6 +class Update {
7 - const senddata = { 7 + public mainWindow: BrowserWindow
8 - state: type, 8 + constructor(mainWindow: BrowserWindow) {
9 - msg: data
10 - }
11 - mainWindow.webContents.send('UpdateMsg', senddata)
12 -}
13 -
14 -export default {
15 - Update (mainWindow) {
16 - // 设置地址要和package中的一样
17 autoUpdater.setFeedURL('http://127.0.0.1:25565/') 9 autoUpdater.setFeedURL('http://127.0.0.1:25565/')
10 + this.mainWindow = mainWindow
11 + // 注册事件
12 + this.checkUpdate()
13 + this.start()
14 + this.hasData()
15 + this.noData()
16 + this.listen()
17 + this.done()
18 + this.quitInstall()
19 + this.error()
20 + }
21 + // 负责向渲染进程发送信息
22 + Message(mainWindow: BrowserWindow, type: Number, data?: String) {
23 + const senddata = {
24 + state: type,
25 + msg: data || ''
26 + }
27 + mainWindow.webContents.send('UpdateMsg', senddata)
28 + }
18 29
19 - // 当更新发生错误的时候触发。 30 + // 当更新发生错误的时候触发。
31 + error() {
20 autoUpdater.on('error', (err) => { 32 autoUpdater.on('error', (err) => {
21 - console.log('更新出现错误') 33 + console.log('更新出现错误', err.message)
22 - console.log(err.message)
23 if (err.message.includes('sha512 checksum mismatch')) { 34 if (err.message.includes('sha512 checksum mismatch')) {
24 - Message(mainWindow, -1, 'sha512校验失败') 35 + this.Message(this.mainWindow, -1, 'sha512校验失败')
25 } 36 }
26 }) 37 })
38 + }
39 + // 当开始检查更新的时候触发
27 40
28 - // 当开始检查更新的时候触发 41 + start() {
29 autoUpdater.on('checking-for-update', (event, arg) => { 42 autoUpdater.on('checking-for-update', (event, arg) => {
30 console.log('开始检查更新') 43 console.log('开始检查更新')
31 - Message(mainWindow, 0) 44 + this.Message(this.mainWindow, 0)
32 }) 45 })
46 + }
33 47
34 - // 发现可更新数据时 48 + // 发现可更新数据时
49 + hasData() {
35 autoUpdater.on('update-available', (event, arg) => { 50 autoUpdater.on('update-available', (event, arg) => {
36 console.log('有更新') 51 console.log('有更新')
37 - Message(mainWindow, 1) 52 + this.Message(this.mainWindow, 1)
38 }) 53 })
54 + }
39 55
40 - // 没有可更新数据时 56 + // 没有可更新数据时
57 + noData() {
41 autoUpdater.on('update-not-available', (event, arg) => { 58 autoUpdater.on('update-not-available', (event, arg) => {
42 console.log('没有更新') 59 console.log('没有更新')
43 - Message(mainWindow, 2) 60 + this.Message(this.mainWindow, 2)
44 }) 61 })
62 + }
45 63
46 - // 下载监听 64 + // 下载监听
65 + listen() {
47 autoUpdater.on('download-progress', (progressObj) => { 66 autoUpdater.on('download-progress', (progressObj) => {
48 - Message(mainWindow, 3, progressObj) 67 + this.Message(this.mainWindow, 3, progressObj)
49 }) 68 })
69 + }
50 70
51 - // 下载完成 71 + // 下载完成
72 + done() {
52 autoUpdater.on('update-downloaded', () => { 73 autoUpdater.on('update-downloaded', () => {
53 console.log('下载完成') 74 console.log('下载完成')
54 - Message(mainWindow, 4) 75 + this.Message(this.mainWindow, 4)
55 }) 76 })
56 - // 执行自动更新检查 77 + }
78 +
79 + // 执行自动更新检查
80 + checkUpdate() {
57 ipcMain.handle('check-update', () => { 81 ipcMain.handle('check-update', () => {
58 autoUpdater.checkForUpdates().catch(err => { 82 autoUpdater.checkForUpdates().catch(err => {
59 console.log('网络连接问题', err) 83 console.log('网络连接问题', err)
60 }) 84 })
61 }) 85 })
62 - // 渲染进程执行更新操作 86 + }
87 +
88 + // 退出并安装
89 + quitInstall() {
63 ipcMain.handle('confirm-update', () => { 90 ipcMain.handle('confirm-update', () => {
64 autoUpdater.quitAndInstall() 91 autoUpdater.quitAndInstall()
65 }) 92 })
66 } 93 }
67 } 94 }
95 +
96 +export default Update
......
1 -/* eslint-disable no-case-declarations */
2 -import { app, ipcMain, dialog } from 'electron'
3 -import path from 'path'
4 -import os from 'os'
5 -// 版本以package.json为基准。
6 -const version = require('../../../package.json').version
7 -// 您的下载地址
8 -const baseUrl = 'http://127.0.0.1:25565/'
9 -var Sysarch = null
10 -var defaultDownloadUrL = null
11 -// 识别操作系统位数D
12 -os.arch().includes('64') ? Sysarch = 'win64' : Sysarch = 'win32'
13 -// 识别操作系统
14 -// linux自己修改后缀名哦,我没有linux就没有测试了
15 -if (os.platform().includes('win32')) {
16 - defaultDownloadUrL = baseUrl + `electron_${version}_${Sysarch}.exe?${new Date().getTime()}`
17 -} else if (os.platform().includes('linux')) {
18 - defaultDownloadUrL = baseUrl + `electron_${version}_${Sysarch}?${new Date().getTime()}`
19 -} else {
20 - defaultDownloadUrL = baseUrl + `electron_${version}_mac.dmg?${new Date().getTime()}`
21 -}
22 -export default {
23 - download (mainWindow) {
24 - ipcMain.handle('start-download', (event, msg) => {
25 - mainWindow.webContents.downloadURL(msg.downloadUrL || defaultDownloadUrL)
26 - mainWindow.webContents.session.on('will-download', (event, item, webContents) => {
27 - // 将文件保存在系统的下载目录
28 - const filePath = path.join(app.getPath('downloads'), item.getFilename())
29 - // 自动保存
30 - item.setSavePath(filePath)
31 - // 下载进度
32 - item.on('updated', (event, state) => {
33 - switch (state) {
34 - case 'progressing':
35 - mainWindow.webContents.send('download-progress', (item.getReceivedBytes() / item.getTotalBytes() * 100).toFixed(0))
36 - break
37 - case 'interrupted ':
38 - mainWindow.webContents.send('download-paused', true)
39 - break
40 - default:
41 -
42 - break
43 - }
44 - })
45 - // 下载完成或失败
46 - item.once('done', (event, state) => {
47 - switch (state) {
48 - case 'completed':
49 - const data = {
50 - filePath
51 - }
52 - mainWindow.webContents.send('download-done', data)
53 - break
54 - case 'interrupted':
55 - mainWindow.webContents.send('download-error', true)
56 - dialog.showErrorBox('下载出错', '由于网络或其他未知原因导致客户端下载出错,请前往官网进行重新安装')
57 - break
58 - default:
59 - break
60 - }
61 - })
62 - })
63 - })
64 - }
65 -}
1 +import { app, ipcMain, BrowserWindow, dialog } from 'electron'
2 +import { join } from 'path'
3 +import { arch, platform } from 'os'
4 +import { exists, remove } from 'fs-extra'
5 +import { version } from '../../../package.json'
6 +
7 +
8 +/**
9 + *
10 + * @description
11 + * @returns {void} 下载类
12 + * @param {mainWindow} 主窗口
13 + * @param {downloadUrl} 下载地址,当未传入时则会使用预先设置好的baseUrl拼接名称
14 + * @author Sky
15 + * @date 2020-08-12
16 + */
17 +
18 +class Main {
19 +
20 + public mainWindow: BrowserWindow = null
21 + public downloadUrl: string = ""
22 + public version: string = version
23 + public baseUrl: string = ''
24 + public Sysarch: string = arch().includes('64') ? 'win64' : 'win32'
25 + public HistoryFilePath = join(app.getPath('downloads'), platform().includes('win32') ? `electron_${this.version}_${this.Sysarch}.exe` : `electron_${this.version}_mac.dmg`)
26 +
27 +
28 + constructor(mainWindow: BrowserWindow, downloadUrl?: string) {
29 + this.mainWindow = mainWindow
30 + this.downloadUrl = downloadUrl || platform().includes('win32') ? this.baseUrl + `electron_${this.version}_${this.Sysarch}.exe?${new Date().getTime()}` : this.baseUrl + `electron_${this.version}_mac.dmg?${new Date().getTime()}`
31 + }
32 +
33 + start() {
34 + ipcMain.on('satrt-download', (event, msg) => {
35 + // 更新时检查有无同名文件,若有就删除,若无就开始下载
36 + exists(this.HistoryFilePath, async (e) => {
37 + try {
38 + if (e) {
39 + await remove(this.HistoryFilePath)
40 + }
41 + this.mainWindow.webContents.downloadURL(this.downloadUrl)
42 + } catch (error) { console.log(error) }
43 + })
44 + this.mainWindow.webContents.session.on('will-download', (event: any, item: any, webContents: any) => {
45 + const filePath = join(app.getPath('downloads'), item.getFilename())
46 + item.setSavePath(filePath)
47 + item.on('updated', (event: any, state: String) => {
48 + switch (state) {
49 + case 'progressing':
50 + this.mainWindow.webContents.send('download-progress', (item.getReceivedBytes() / item.getTotalBytes() * 100).toFixed(0))
51 + break
52 + default:
53 + this.mainWindow.webContents.send('download-error', true)
54 + dialog.showErrorBox('下载出错', '由于网络或其他未知原因导致客户端下载出错,请前往官网进行重新安装')
55 + break
56 + }
57 + })
58 + item.once('done', (event: any, state: String) => {
59 + switch (state) {
60 + case 'completed':
61 + const data = {
62 + filePath
63 + }
64 + this.mainWindow.webContents.send('download-done', data)
65 + break
66 + case 'interrupted':
67 + this.mainWindow.webContents.send('download-error', true)
68 + dialog.showErrorBox('下载出错', '由于网络或其他未知原因导致客户端下载出错,请前往官网进行重新安装')
69 + break
70 + default:
71 + break
72 + }
73 + })
74 + })
75 + })
76 + }
77 +}
78 +
79 +export default Main
1 import { ipcMain, dialog, BrowserWindow } from 'electron' 1 import { ipcMain, dialog, BrowserWindow } from 'electron'
2 -import Server from '../server/index' 2 +import Server from '../server'
3 import { winURL } from '../config/StaticPath' 3 import { winURL } from '../config/StaticPath'
4 4
5 export default { 5 export default {
6 - Mainfunc (mainWindow, IsUseSysTitle) { 6 + Mainfunc(mainWindow: BrowserWindow, IsUseSysTitle: Boolean) {
7 ipcMain.handle('IsUseSysTitle', async () => { 7 ipcMain.handle('IsUseSysTitle', async () => {
8 return IsUseSysTitle 8 return IsUseSysTitle
9 }) 9 })
......
1 -import { BrowserWindow, Menu } from 'electron'
2 -import menuconfig from '../config/menu'
3 -import config from '@config'
4 -import setIpc from './ipcMain'
5 -import electronDevtoolsInstaller, { VUEJS_DEVTOOLS } from 'electron-devtools-installer'
6 -import upload from './checkupdate'
7 -import DownloadUpdate from './downloadFile'
8 -import { winURL, loadingURL } from '../config/StaticPath'
9 -
10 -var loadWindow = null
11 -var mainWindow = null
12 -
13 -function createMainWindow () {
14 - /**
15 - * Initial window options
16 - */
17 - mainWindow = new BrowserWindow({
18 - height: 800,
19 - useContentSize: true,
20 - width: 1700,
21 - minWidth: 1366,
22 - show: false,
23 - frame: config.IsUseSysTitle,
24 - titleBarStyle: 'hidden',
25 - webPreferences: {
26 - nodeIntegration: true,
27 - webSecurity: false,
28 - // 如果是开发模式可以使用devTools
29 - devTools: process.env.NODE_ENV === 'development',
30 - // devTools: true,
31 - // 在macos中启用橡皮动画
32 - scrollBounce: process.platform === 'darwin'
33 - }
34 - })
35 - // 这里设置只有开发环境才注入显示开发者模式
36 - if (process.env.NODE_ENV === 'development') {
37 - menuconfig.push({
38 - label: '开发者设置',
39 - submenu: [{
40 - label: '切换到开发者模式',
41 - accelerator: 'CmdOrCtrl+I',
42 - role: 'toggledevtools'
43 - }]
44 - })
45 - }
46 - // 载入菜单
47 - const menu = Menu.buildFromTemplate(menuconfig)
48 - Menu.setApplicationMenu(menu)
49 - mainWindow.loadURL(winURL)
50 -
51 - setIpc.Mainfunc(mainWindow, config.IsUseSysTitle)
52 - upload.Update(mainWindow)
53 - DownloadUpdate.download(mainWindow)
54 -
55 - if (process.env.NODE_ENV === 'development') {
56 - mainWindow.webContents.once('dom-ready', () => {
57 - mainWindow.show()
58 - electronDevtoolsInstaller(VUEJS_DEVTOOLS)
59 - .then((name) => console.log(`installed: ${name}`))
60 - .catch(err => console.log('Unable to install `vue-devtools`: \n', err))
61 - })
62 - if (config.UseStartupChart) loadWindow.destroy()
63 -
64 - mainWindow.webContents.openDevTools(true)
65 - } else {
66 - mainWindow.webContents.once('dom-ready', () => {
67 - mainWindow.show()
68 - if (config.UseStartupChart) loadWindow.destroy()
69 - })
70 - }
71 -
72 - mainWindow.on('closed', () => {
73 - mainWindow = null
74 - })
75 -}
76 -
77 -function loadindWindow () {
78 - loadWindow = new BrowserWindow({
79 - width: 400,
80 - height: 600,
81 - frame: false,
82 - backgroundColor: '#222',
83 - skipTaskbar: true,
84 - transparent: true,
85 - resizable: false,
86 - webPreferences: { experimentalFeatures: true }
87 - })
88 -
89 - loadWindow.loadURL(loadingURL)
90 -
91 - loadWindow.show()
92 -
93 - setTimeout(() => {
94 - createMainWindow()
95 - }, 2000)
96 -
97 - loadWindow.on('closed', () => {
98 - loadWindow = null
99 - })
100 -}
101 -
102 -function initWindow () {
103 - if (config.UseStartupChart) {
104 - return loadindWindow()
105 - } else {
106 - return createMainWindow()
107 - }
108 -}
109 -export default initWindow
1 +import setIpc from './ipcMain'
2 +import config from '@config/index'
3 +import menuconfig from '../config/menu'
4 +import DownloadUpdate from './downloadFile'
5 +import Update from './checkupdate';
6 +import { app, BrowserWindow, Menu, dialog } from 'electron'
7 +import { winURL, loadingURL } from '../config/StaticPath'
8 +import electronDevtoolsInstaller, { VUEJS_DEVTOOLS } from 'electron-devtools-installer'
9 +
10 +class MainInit {
11 +
12 + public winURL: string = ''
13 + public shartURL: string = ''
14 + public loadWindow: BrowserWindow = null
15 + public mainWindow: BrowserWindow = null
16 +
17 + constructor() {
18 + this.winURL = winURL
19 + this.shartURL = loadingURL
20 + if (process.env.NODE_ENV === 'development') {
21 + menuconfig.push({
22 + label: '开发者设置',
23 + submenu: [{
24 + label: '切换到开发者模式',
25 + accelerator: 'CmdOrCtrl+I',
26 + role: 'toggledevtools'
27 + }]
28 + })
29 + }
30 + }
31 + // 主窗口函数
32 + createMainWindow() {
33 + this.mainWindow = new BrowserWindow({
34 + height: 800,
35 + useContentSize: true,
36 + width: 1700,
37 + minWidth: 1366,
38 + show: false,
39 + frame: config.IsUseSysTitle,
40 + titleBarStyle: 'hidden',
41 + webPreferences: {
42 + nodeIntegration: true,
43 + webSecurity: false,
44 + // 如果是开发模式可以使用devTools
45 + devTools: process.env.NODE_ENV === 'development',
46 + // devTools: true,
47 + // 在macos中启用橡皮动画
48 + scrollBounce: process.platform === 'darwin'
49 + }
50 + })
51 + // 赋予模板
52 + const menu = Menu.buildFromTemplate(menuconfig as any)
53 + // 加载模板
54 + Menu.setApplicationMenu(menu)
55 + // 加载主窗口
56 + this.mainWindow.loadURL(this.winURL)
57 + // 下载文件
58 + new DownloadUpdate(this.mainWindow).start()
59 + // electron-update注册
60 + new Update(this.mainWindow)
61 + // 启用协议,这里暂时只用于自定义头部的时候使用
62 + setIpc.Mainfunc(this.mainWindow, config.IsUseSysTitle)
63 + // 安装devtools
64 + if (process.env.NODE_ENV === 'development') {
65 + this.mainWindow.webContents.once('dom-ready', () => {
66 + this.mainWindow.show()
67 + electronDevtoolsInstaller(VUEJS_DEVTOOLS)
68 + .then((name) => console.log(`已安装: ${name}`))
69 + .catch(err => console.log('无法安装 `vue-devtools`: \n 可能发生得错误:网络连接问题 \n', err))
70 + if (config.UseStartupChart) this.loadWindow.destroy()
71 + this.mainWindow.webContents.openDevTools({ mode: 'undocked', activate: true })
72 + })
73 + } else {
74 + this.mainWindow.webContents.once('dom-ready', () => {
75 + this.mainWindow.show()
76 + if (config.UseStartupChart) this.loadWindow.destroy()
77 + })
78 + }
79 + // 当确定渲染进程卡死时
80 + this.mainWindow.webContents.on('crashed', () => {
81 + dialog.showMessageBox(this.mainWindow, {
82 + type: 'warning',
83 + title: '警告',
84 + buttons: ['重载', '退出'],
85 + message: '图形化进程失去响应,是否等待其恢复?',
86 + noLink: true
87 + }).then(res => {
88 + if (res.response === 0) this.mainWindow.reload()
89 + else this.mainWindow.close()
90 + })
91 + })
92 + // 不知道什么原因,反正就是这个窗口里的页面触发了假死时执行
93 + this.mainWindow.on('unresponsive', () => {
94 + dialog.showMessageBox(this.mainWindow, {
95 + type: 'warning',
96 + title: '警告',
97 + buttons: ['重载', '退出'],
98 + message: '图形化进程失去响应,是否等待其恢复?',
99 + noLink: true
100 + }).then(res => {
101 + if (res.response === 0) this.mainWindow.reload()
102 + else this.mainWindow.close()
103 + })
104 + })
105 + app.on('gpu-process-crashed', () => {
106 + dialog.showMessageBox(this.mainWindow, {
107 + type: 'warning',
108 + title: '',
109 + buttons: ['切换', '退出'],
110 + message: '侦测到图形处理设备丢失,若继续则会导致软件出现意外故障,是否切换到通用模式,若切换后仍然黑屏请联系我们。',
111 + noLink: true
112 + }).then(res => {
113 + // 当显卡出现崩溃现象时使用该设置禁用显卡加速模式。
114 + if (res.response === 0) {
115 + app.disableHardwareAcceleration()
116 + this.mainWindow.reload()
117 + } else {
118 + this.mainWindow.close()
119 + }
120 + })
121 + })
122 + this.mainWindow.on('closed', () => {
123 + this.mainWindow = null
124 + })
125 + }
126 + // 加载窗口函数
127 + loadindWindow(loadingURL: string) {
128 + this.loadWindow = new BrowserWindow({
129 + width: 400,
130 + height: 600,
131 + frame: false,
132 + skipTaskbar: true,
133 + transparent: true,
134 + resizable: false,
135 + webPreferences: { experimentalFeatures: true }
136 + })
137 +
138 + this.loadWindow.loadURL(loadingURL)
139 + this.loadWindow.show()
140 + this.loadWindow.setAlwaysOnTop(true)
141 + // 延迟两秒可以根据情况后续调快,= =,就相当于个,sleep吧,就那种。 = =。。。
142 + setTimeout(() => {
143 + this.createMainWindow()
144 + }, 1500)
145 + }
146 + // 初始化窗口函数
147 + initWindow() {
148 + if (config.UseStartupChart) {
149 + return this.loadindWindow(this.shartURL)
150 + } else {
151 + return this.createMainWindow()
152 + }
153 +
154 + }
155 +}
156 +export default MainInit
1 import { ipcRenderer } from 'electron' 1 import { ipcRenderer } from 'electron'
2 export default { 2 export default {
3 - send (name, data = {}) { 3 + send (name, data) {
4 return new Promise((resolve, reject) => { 4 return new Promise((resolve, reject) => {
5 ipcRenderer.invoke(name, data).then(res => { 5 ipcRenderer.invoke(name, data).then(res => {
6 resolve(res) 6 resolve(res)
......
1 +{
2 + "compileOnSave": false,
3 + "compilerOptions": {
4 + "resolveJsonModule": true,
5 + "baseUrl": ".",
6 + "outDir": "./dist/electron",
7 + "sourceMap": true,
8 + "declaration": false,
9 + "module": "es2015",
10 + "moduleResolution": "node",
11 + "allowSyntheticDefaultImports": true,
12 + "emitDecoratorMetadata": true,
13 + "experimentalDecorators": true,
14 + "importHelpers": true,
15 + "target": "es5",
16 + "paths": {
17 + "@config/*": [
18 + "config/*"
19 + ]
20 + },
21 + "typeRoots": [
22 + "node_modules/@types"
23 + ],
24 + "lib": [
25 + "es2018",
26 + "dom"
27 + ]
28 + }
29 +}
...\ No newline at end of file ...\ No newline at end of file
...@@ -32,16 +32,16 @@ ...@@ -32,16 +32,16 @@
32 invariant "^2.2.4" 32 invariant "^2.2.4"
33 semver "^5.5.0" 33 semver "^5.5.0"
34 34
35 -"@babel/core@^7.11.0": 35 +"@babel/core@^7.11.1":
36 - version "7.11.0" 36 + version "7.11.1"
37 - resolved "https://registry.npm.taobao.org/@babel/core/download/@babel/core-7.11.0.tgz#73b9c33f1658506887f767c26dae07798b30df76" 37 + resolved "https://registry.npm.taobao.org/@babel/core/download/@babel/core-7.11.1.tgz?cache=0&sync_timestamp=1596578841407&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fcore%2Fdownload%2F%40babel%2Fcore-7.11.1.tgz#2c55b604e73a40dc21b0e52650b11c65cf276643"
38 - integrity sha1-c7nDPxZYUGiH92fCba4HeYsw33Y= 38 + integrity sha1-LFW2BOc6QNwhsOUmULEcZc8nZkM=
39 dependencies: 39 dependencies:
40 "@babel/code-frame" "^7.10.4" 40 "@babel/code-frame" "^7.10.4"
41 "@babel/generator" "^7.11.0" 41 "@babel/generator" "^7.11.0"
42 "@babel/helper-module-transforms" "^7.11.0" 42 "@babel/helper-module-transforms" "^7.11.0"
43 "@babel/helpers" "^7.10.4" 43 "@babel/helpers" "^7.10.4"
44 - "@babel/parser" "^7.11.0" 44 + "@babel/parser" "^7.11.1"
45 "@babel/template" "^7.10.4" 45 "@babel/template" "^7.10.4"
46 "@babel/traverse" "^7.11.0" 46 "@babel/traverse" "^7.11.0"
47 "@babel/types" "^7.11.0" 47 "@babel/types" "^7.11.0"
...@@ -331,6 +331,11 @@ ...@@ -331,6 +331,11 @@
331 resolved "https://registry.npm.taobao.org/@babel/parser/download/@babel/parser-7.11.0.tgz?cache=0&sync_timestamp=1596141177149&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fparser%2Fdownload%2F%40babel%2Fparser-7.11.0.tgz#a9d7e11aead25d3b422d17b2c6502c8dddef6a5d" 331 resolved "https://registry.npm.taobao.org/@babel/parser/download/@babel/parser-7.11.0.tgz?cache=0&sync_timestamp=1596141177149&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fparser%2Fdownload%2F%40babel%2Fparser-7.11.0.tgz#a9d7e11aead25d3b422d17b2c6502c8dddef6a5d"
332 integrity sha1-qdfhGurSXTtCLReyxlAsjd3val0= 332 integrity sha1-qdfhGurSXTtCLReyxlAsjd3val0=
333 333
334 +"@babel/parser@^7.11.1":
335 + version "7.11.3"
336 + resolved "https://registry.npm.taobao.org/@babel/parser/download/@babel/parser-7.11.3.tgz#9e1eae46738bcd08e23e867bab43e7b95299a8f9"
337 + integrity sha1-nh6uRnOLzQjiPoZ7q0PnuVKZqPk=
338 +
334 "@babel/plugin-proposal-async-generator-functions@^7.10.4": 339 "@babel/plugin-proposal-async-generator-functions@^7.10.4":
335 version "7.10.4" 340 version "7.10.4"
336 resolved "https://registry.npm.taobao.org/@babel/plugin-proposal-async-generator-functions/download/@babel/plugin-proposal-async-generator-functions-7.10.4.tgz?cache=0&sync_timestamp=1593522968669&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-proposal-async-generator-functions%2Fdownload%2F%40babel%2Fplugin-proposal-async-generator-functions-7.10.4.tgz#4b65abb3d9bacc6c657aaa413e56696f9f170fc6" 341 resolved "https://registry.npm.taobao.org/@babel/plugin-proposal-async-generator-functions/download/@babel/plugin-proposal-async-generator-functions-7.10.4.tgz?cache=0&sync_timestamp=1593522968669&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-proposal-async-generator-functions%2Fdownload%2F%40babel%2Fplugin-proposal-async-generator-functions-7.10.4.tgz#4b65abb3d9bacc6c657aaa413e56696f9f170fc6"
...@@ -1010,10 +1015,10 @@ ...@@ -1010,10 +1015,10 @@
1010 core-js-pure "^3.0.0" 1015 core-js-pure "^3.0.0"
1011 regenerator-runtime "^0.13.4" 1016 regenerator-runtime "^0.13.4"
1012 1017
1013 -"@babel/runtime@^7.11.0": 1018 +"@babel/runtime@^7.11.2":
1014 - version "7.11.0" 1019 + version "7.11.2"
1015 - resolved "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.11.0.tgz#f10245877042a815e07f7e693faff0ae9d3a2aac" 1020 + resolved "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.11.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
1016 - integrity sha1-8QJFh3BCqBXgf35pP6/wrp06Kqw= 1021 + integrity sha1-9UnBPHVMxAuHZEufqfCaapX+BzY=
1017 dependencies: 1022 dependencies:
1018 regenerator-runtime "^0.13.4" 1023 regenerator-runtime "^0.13.4"
1019 1024
...@@ -1171,7 +1176,7 @@ ...@@ -1171,7 +1176,7 @@
1171 1176
1172 "@types/fs-extra@^9.0.1": 1177 "@types/fs-extra@^9.0.1":
1173 version "9.0.1" 1178 version "9.0.1"
1174 - resolved "https://registry.npm.taobao.org/@types/fs-extra/download/@types/fs-extra-9.0.1.tgz?cache=0&sync_timestamp=1589913391537&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Ffs-extra%2Fdownload%2F%40types%2Ffs-extra-9.0.1.tgz#91c8fc4c51f6d5dbe44c2ca9ab09310bd00c7918" 1179 + resolved "https://registry.npm.taobao.org/@types/fs-extra/download/@types/fs-extra-9.0.1.tgz#91c8fc4c51f6d5dbe44c2ca9ab09310bd00c7918"
1175 integrity sha1-kcj8TFH21dvkTCypqwkxC9AMeRg= 1180 integrity sha1-kcj8TFH21dvkTCypqwkxC9AMeRg=
1176 dependencies: 1181 dependencies:
1177 "@types/node" "*" 1182 "@types/node" "*"
...@@ -1214,6 +1219,11 @@ ...@@ -1214,6 +1219,11 @@
1214 resolved "https://registry.npm.taobao.org/@types/node/download/@types/node-12.12.48.tgz?cache=0&sync_timestamp=1594068001359&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-12.12.48.tgz#4135f064eeed9fcfb4756deea5ba2caa11603391" 1219 resolved "https://registry.npm.taobao.org/@types/node/download/@types/node-12.12.48.tgz?cache=0&sync_timestamp=1594068001359&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-12.12.48.tgz#4135f064eeed9fcfb4756deea5ba2caa11603391"
1215 integrity sha1-QTXwZO7tn8+0dW3upbosqhFgM5E= 1220 integrity sha1-QTXwZO7tn8+0dW3upbosqhFgM5E=
1216 1221
1222 +"@types/node@^14.0.27":
1223 + version "14.0.27"
1224 + resolved "https://registry.npm.taobao.org/@types/node/download/@types/node-14.0.27.tgz?cache=0&sync_timestamp=1596839423560&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-14.0.27.tgz#a151873af5a5e851b51b3b065c9e63390a9e0eb1"
1225 + integrity sha1-oVGHOvWl6FG1GzsGXJ5jOQqeDrE=
1226 +
1217 "@types/semver@^7.1.0": 1227 "@types/semver@^7.1.0":
1218 version "7.3.1" 1228 version "7.3.1"
1219 resolved "https://registry.npm.taobao.org/@types/semver/download/@types/semver-7.3.1.tgz#7a9a5d595b6d873f338c867dcef64df289468cfa" 1229 resolved "https://registry.npm.taobao.org/@types/semver/download/@types/semver-7.3.1.tgz#7a9a5d595b6d873f338c867dcef64df289468cfa"
...@@ -1597,23 +1607,23 @@ app-builder-bin@3.5.9: ...@@ -1597,23 +1607,23 @@ app-builder-bin@3.5.9:
1597 resolved "https://registry.npm.taobao.org/app-builder-bin/download/app-builder-bin-3.5.9.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fapp-builder-bin%2Fdownload%2Fapp-builder-bin-3.5.9.tgz#a3ac0c25286bac68357321cb2eaf7128b0bc0a4f" 1607 resolved "https://registry.npm.taobao.org/app-builder-bin/download/app-builder-bin-3.5.9.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fapp-builder-bin%2Fdownload%2Fapp-builder-bin-3.5.9.tgz#a3ac0c25286bac68357321cb2eaf7128b0bc0a4f"
1598 integrity sha1-o6wMJShrrGg1cyHLLq9xKLC8Ck8= 1608 integrity sha1-o6wMJShrrGg1cyHLLq9xKLC8Ck8=
1599 1609
1600 -app-builder-lib@22.7.0: 1610 +app-builder-lib@22.8.0:
1601 - version "22.7.0" 1611 + version "22.8.0"
1602 - resolved "https://registry.npm.taobao.org/app-builder-lib/download/app-builder-lib-22.7.0.tgz#ccd3e7ece2d46bc209423a77aa142f74aaf65db0" 1612 + resolved "https://registry.npm.taobao.org/app-builder-lib/download/app-builder-lib-22.8.0.tgz?cache=0&sync_timestamp=1596720347275&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fapp-builder-lib%2Fdownload%2Fapp-builder-lib-22.8.0.tgz#342a8976f50ae35cfd07412dbfd4f6c895b32eac"
1603 - integrity sha1-zNPn7OLUa8IJQjp3qhQvdKr2XbA= 1613 + integrity sha1-NCqJdvUK41z9B0Etv9T2yJWzLqw=
1604 dependencies: 1614 dependencies:
1605 "7zip-bin" "~5.0.3" 1615 "7zip-bin" "~5.0.3"
1606 "@develar/schema-utils" "~2.6.5" 1616 "@develar/schema-utils" "~2.6.5"
1607 async-exit-hook "^2.0.1" 1617 async-exit-hook "^2.0.1"
1608 bluebird-lst "^1.0.9" 1618 bluebird-lst "^1.0.9"
1609 - builder-util "22.7.0" 1619 + builder-util "22.8.0"
1610 - builder-util-runtime "8.7.1" 1620 + builder-util-runtime "8.7.2"
1611 chromium-pickle-js "^0.2.0" 1621 chromium-pickle-js "^0.2.0"
1612 - debug "^4.2.0" 1622 + debug "^4.1.1"
1613 ejs "^3.1.3" 1623 ejs "^3.1.3"
1614 - electron-publish "22.7.0" 1624 + electron-publish "22.8.0"
1615 - fs-extra "^9.0.0" 1625 + fs-extra "^9.0.1"
1616 - hosted-git-info "^3.0.4" 1626 + hosted-git-info "^3.0.5"
1617 is-ci "^2.0.0" 1627 is-ci "^2.0.0"
1618 isbinaryfile "^4.0.6" 1628 isbinaryfile "^4.0.6"
1619 js-yaml "^3.14.0" 1629 js-yaml "^3.14.0"
...@@ -2440,28 +2450,28 @@ builder-util-runtime@8.7.0: ...@@ -2440,28 +2450,28 @@ builder-util-runtime@8.7.0:
2440 debug "^4.1.1" 2450 debug "^4.1.1"
2441 sax "^1.2.4" 2451 sax "^1.2.4"
2442 2452
2443 -builder-util-runtime@8.7.1: 2453 +builder-util-runtime@8.7.2:
2444 - version "8.7.1" 2454 + version "8.7.2"
2445 - resolved "https://registry.npm.taobao.org/builder-util-runtime/download/builder-util-runtime-8.7.1.tgz#23c808cddd650d4376a7a1518ec1e80e85c10f00" 2455 + resolved "https://registry.npm.taobao.org/builder-util-runtime/download/builder-util-runtime-8.7.2.tgz?cache=0&sync_timestamp=1594883084352&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuilder-util-runtime%2Fdownload%2Fbuilder-util-runtime-8.7.2.tgz#d93afc71428a12789b437e13850e1fa7da956d72"
2446 - integrity sha1-I8gIzd1lDUN2p6FRjsHoDoXBDwA= 2456 + integrity sha1-2Tr8cUKKEnibQ34ThQ4fp9qVbXI=
2447 dependencies: 2457 dependencies:
2448 - debug "^4.2.0" 2458 + debug "^4.1.1"
2449 sax "^1.2.4" 2459 sax "^1.2.4"
2450 2460
2451 -builder-util@22.7.0: 2461 +builder-util@22.8.0:
2452 - version "22.7.0" 2462 + version "22.8.0"
2453 - resolved "https://registry.npm.taobao.org/builder-util/download/builder-util-22.7.0.tgz#0776a66e6d6e408a78bed7f17a7ad22516d9e7f0" 2463 + resolved "https://registry.npm.taobao.org/builder-util/download/builder-util-22.8.0.tgz?cache=0&sync_timestamp=1596720310546&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuilder-util%2Fdownload%2Fbuilder-util-22.8.0.tgz#01684085d1f2370b1bd182f69cbd007426f63f64"
2454 - integrity sha1-B3ambm1uQIp4vtfxenrSJRbZ5/A= 2464 + integrity sha1-AWhAhdHyNwsb0YL2nL0AdCb2P2Q=
2455 dependencies: 2465 dependencies:
2456 "7zip-bin" "~5.0.3" 2466 "7zip-bin" "~5.0.3"
2457 "@types/debug" "^4.1.5" 2467 "@types/debug" "^4.1.5"
2458 "@types/fs-extra" "^9.0.1" 2468 "@types/fs-extra" "^9.0.1"
2459 app-builder-bin "3.5.9" 2469 app-builder-bin "3.5.9"
2460 bluebird-lst "^1.0.9" 2470 bluebird-lst "^1.0.9"
2461 - builder-util-runtime "8.7.1" 2471 + builder-util-runtime "8.7.2"
2462 - chalk "^4.0.0" 2472 + chalk "^4.1.0"
2463 - debug "^4.2.0" 2473 + debug "^4.1.1"
2464 - fs-extra "^9.0.0" 2474 + fs-extra "^9.0.1"
2465 is-ci "^2.0.0" 2475 is-ci "^2.0.0"
2466 js-yaml "^3.14.0" 2476 js-yaml "^3.14.0"
2467 source-map-support "^0.5.19" 2477 source-map-support "^0.5.19"
...@@ -2658,7 +2668,7 @@ chalk@^1.1.1, chalk@^1.1.3: ...@@ -2658,7 +2668,7 @@ chalk@^1.1.1, chalk@^1.1.3:
2658 strip-ansi "^3.0.0" 2668 strip-ansi "^3.0.0"
2659 supports-color "^2.0.0" 2669 supports-color "^2.0.0"
2660 2670
2661 -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.2: 2671 +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.2:
2662 version "2.4.2" 2672 version "2.4.2"
2663 resolved "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" 2673 resolved "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
2664 integrity sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ= 2674 integrity sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=
...@@ -3240,10 +3250,10 @@ crypto-random-string@^2.0.0: ...@@ -3240,10 +3250,10 @@ crypto-random-string@^2.0.0:
3240 resolved "https://registry.npm.taobao.org/crypto-random-string/download/crypto-random-string-2.0.0.tgz?cache=0&sync_timestamp=1583560482221&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcrypto-random-string%2Fdownload%2Fcrypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" 3250 resolved "https://registry.npm.taobao.org/crypto-random-string/download/crypto-random-string-2.0.0.tgz?cache=0&sync_timestamp=1583560482221&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcrypto-random-string%2Fdownload%2Fcrypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
3241 integrity sha1-7yp6lm7BEIM4g2m6oC6+rSKbMNU= 3251 integrity sha1-7yp6lm7BEIM4g2m6oC6+rSKbMNU=
3242 3252
3243 -css-loader@^4.2.0: 3253 +css-loader@^4.2.1:
3244 - version "4.2.0" 3254 + version "4.2.1"
3245 - resolved "https://registry.npm.taobao.org/css-loader/download/css-loader-4.2.0.tgz#b57efb92ac8f0cd85bf92d89df9634ef1f51b8bf" 3255 + resolved "https://registry.npm.taobao.org/css-loader/download/css-loader-4.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-loader%2Fdownload%2Fcss-loader-4.2.1.tgz#9f48fd7eae1219d629a3f085ba9a9102ca1141a7"
3246 - integrity sha1-tX77kqyPDNhb+S2J35Y07x9RuL8= 3256 + integrity sha1-n0j9fq4SGdYpo/CFupqRAsoRQac=
3247 dependencies: 3257 dependencies:
3248 camelcase "^6.0.0" 3258 camelcase "^6.0.0"
3249 cssesc "^3.0.0" 3259 cssesc "^3.0.0"
...@@ -3322,13 +3332,6 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: ...@@ -3322,13 +3332,6 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
3322 dependencies: 3332 dependencies:
3323 ms "^2.1.1" 3333 ms "^2.1.1"
3324 3334
3325 -debug@^4.2.0:
3326 - version "4.2.0"
3327 - resolved "https://registry.npm.taobao.org/debug/download/debug-4.2.0.tgz?cache=0&sync_timestamp=1589891993007&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
3328 - integrity sha1-fxUPk5IOlMWPVXTC/QGjEQ7/5/E=
3329 - dependencies:
3330 - ms "2.1.2"
3331 -
3332 decamelize@^1.0.0, decamelize@^1.2.0: 3335 decamelize@^1.0.0, decamelize@^1.2.0:
3333 version "1.2.0" 3336 version "1.2.0"
3334 resolved "https://registry.npm.taobao.org/decamelize/download/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" 3337 resolved "https://registry.npm.taobao.org/decamelize/download/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
...@@ -3505,15 +3508,15 @@ dir-glob@^3.0.1: ...@@ -3505,15 +3508,15 @@ dir-glob@^3.0.1:
3505 dependencies: 3508 dependencies:
3506 path-type "^4.0.0" 3509 path-type "^4.0.0"
3507 3510
3508 -dmg-builder@22.7.0: 3511 +dmg-builder@22.8.0:
3509 - version "22.7.0" 3512 + version "22.8.0"
3510 - resolved "https://registry.npm.taobao.org/dmg-builder/download/dmg-builder-22.7.0.tgz?cache=0&sync_timestamp=1590494290308&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdmg-builder%2Fdownload%2Fdmg-builder-22.7.0.tgz#ead7e7c046cbdc52d29d302a4455f6668cdf7d45" 3513 + resolved "https://registry.npm.taobao.org/dmg-builder/download/dmg-builder-22.8.0.tgz?cache=0&sync_timestamp=1596720311175&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdmg-builder%2Fdownload%2Fdmg-builder-22.8.0.tgz#2b17127837ed444db3086317eda5cf8912f6e6a9"
3511 - integrity sha1-6tfnwEbL3FLSnTAqRFX2ZozffUU= 3514 + integrity sha1-KxcSeDftRE2zCGMX7aXPiRL25qk=
3512 dependencies: 3515 dependencies:
3513 - app-builder-lib "22.7.0" 3516 + app-builder-lib "22.8.0"
3514 - builder-util "22.7.0" 3517 + builder-util "22.8.0"
3515 - fs-extra "^9.0.0" 3518 + fs-extra "^9.0.1"
3516 - iconv-lite "^0.5.1" 3519 + iconv-lite "^0.6.2"
3517 js-yaml "^3.14.0" 3520 js-yaml "^3.14.0"
3518 sanitize-filename "^1.6.3" 3521 sanitize-filename "^1.6.3"
3519 3522
...@@ -3685,19 +3688,19 @@ ejs@^3.1.3: ...@@ -3685,19 +3688,19 @@ ejs@^3.1.3:
3685 dependencies: 3688 dependencies:
3686 jake "^10.6.1" 3689 jake "^10.6.1"
3687 3690
3688 -electron-builder@^22.6.1: 3691 +electron-builder@^22.8.0:
3689 - version "22.7.0" 3692 + version "22.8.0"
3690 - resolved "https://registry.npm.taobao.org/electron-builder/download/electron-builder-22.7.0.tgz#a42d08a1654ffc2f7d9e2860829d3cc55d4a0c81" 3693 + resolved "https://registry.npm.taobao.org/electron-builder/download/electron-builder-22.8.0.tgz#d2c9fc5438c834e41fd794a271fca200165a3bad"
3691 - integrity sha1-pC0IoWVP/C99nihggp08xV1KDIE= 3694 + integrity sha1-0sn8VDjINOQf15SicfyiABZaO60=
3692 dependencies: 3695 dependencies:
3693 "@types/yargs" "^15.0.5" 3696 "@types/yargs" "^15.0.5"
3694 - app-builder-lib "22.7.0" 3697 + app-builder-lib "22.8.0"
3695 bluebird-lst "^1.0.9" 3698 bluebird-lst "^1.0.9"
3696 - builder-util "22.7.0" 3699 + builder-util "22.8.0"
3697 - builder-util-runtime "8.7.1" 3700 + builder-util-runtime "8.7.2"
3698 - chalk "^4.0.0" 3701 + chalk "^4.1.0"
3699 - dmg-builder "22.7.0" 3702 + dmg-builder "22.8.0"
3700 - fs-extra "^9.0.0" 3703 + fs-extra "^9.0.1"
3701 is-ci "^2.0.0" 3704 is-ci "^2.0.0"
3702 lazy-val "^1.0.4" 3705 lazy-val "^1.0.4"
3703 read-config-file "6.0.0" 3706 read-config-file "6.0.0"
...@@ -3714,19 +3717,19 @@ electron-devtools-installer@^3.1.1: ...@@ -3714,19 +3717,19 @@ electron-devtools-installer@^3.1.1:
3714 semver "^7.2.1" 3717 semver "^7.2.1"
3715 unzip-crx-3 "^0.2.0" 3718 unzip-crx-3 "^0.2.0"
3716 3719
3717 -electron-publish@22.7.0: 3720 +electron-publish@22.8.0:
3718 - version "22.7.0" 3721 + version "22.8.0"
3719 - resolved "https://registry.npm.taobao.org/electron-publish/download/electron-publish-22.7.0.tgz?cache=0&sync_timestamp=1590494972105&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-publish%2Fdownload%2Felectron-publish-22.7.0.tgz#d92ba7c4007c9ac1dd070593e48028184fb2dc19" 3722 + resolved "https://registry.npm.taobao.org/electron-publish/download/electron-publish-22.8.0.tgz?cache=0&sync_timestamp=1596720311499&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-publish%2Fdownload%2Felectron-publish-22.8.0.tgz#7f410fe043abc5d3d896c4ee9eea7a43ea352c7d"
3720 - integrity sha1-2SunxAB8msHdBwWT5IAoGE+y3Bk= 3723 + integrity sha1-f0EP4EOrxdPYlsTunup6Q+o1LH0=
3721 dependencies: 3724 dependencies:
3722 "@types/fs-extra" "^9.0.1" 3725 "@types/fs-extra" "^9.0.1"
3723 bluebird-lst "^1.0.9" 3726 bluebird-lst "^1.0.9"
3724 - builder-util "22.7.0" 3727 + builder-util "22.8.0"
3725 - builder-util-runtime "8.7.1" 3728 + builder-util-runtime "8.7.2"
3726 - chalk "^4.0.0" 3729 + chalk "^4.1.0"
3727 - fs-extra "^9.0.0" 3730 + fs-extra "^9.0.1"
3728 lazy-val "^1.0.4" 3731 lazy-val "^1.0.4"
3729 - mime "^2.4.5" 3732 + mime "^2.4.6"
3730 3733
3731 electron-to-chromium@^1.3.488: 3734 electron-to-chromium@^1.3.488:
3732 version "1.3.488" 3735 version "1.3.488"
...@@ -3746,10 +3749,10 @@ electron-updater@^4.3.1: ...@@ -3746,10 +3749,10 @@ electron-updater@^4.3.1:
3746 lodash.isequal "^4.5.0" 3749 lodash.isequal "^4.5.0"
3747 semver "^7.1.3" 3750 semver "^7.1.3"
3748 3751
3749 -electron@^9.1.2: 3752 +electron@^9.2.0:
3750 - version "9.1.2" 3753 + version "9.2.0"
3751 - resolved "https://registry.npm.taobao.org/electron/download/electron-9.1.2.tgz#bfa26d6b192ea13abb6f1461371fd731a8358988" 3754 + resolved "https://registry.npm.taobao.org/electron/download/electron-9.2.0.tgz#d9fc8c8c9e5109669c366bd7b9ba83b06095d7a4"
3752 - integrity sha1-v6JtaxkuoTq7bxRhNx/XMag1iYg= 3755 + integrity sha1-2fyMjJ5RCWacNmvXubqDsGCV16Q=
3753 dependencies: 3756 dependencies:
3754 "@electron/get" "^1.0.1" 3757 "@electron/get" "^1.0.1"
3755 "@types/node" "^12.0.12" 3758 "@types/node" "^12.0.12"
...@@ -3812,19 +3815,19 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: ...@@ -3812,19 +3815,19 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
3812 dependencies: 3815 dependencies:
3813 once "^1.4.0" 3816 once "^1.4.0"
3814 3817
3815 -enhanced-resolve@^4.1.1: 3818 +enhanced-resolve@^4.0.0, enhanced-resolve@^4.3.0:
3816 - version "4.2.0" 3819 + version "4.3.0"
3817 - resolved "https://registry.npm.taobao.org/enhanced-resolve/download/enhanced-resolve-4.2.0.tgz?cache=0&sync_timestamp=1594067886559&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-4.2.0.tgz#5d43bda4a0fd447cb0ebbe71bef8deff8805ad0d" 3820 + resolved "https://registry.npm.taobao.org/enhanced-resolve/download/enhanced-resolve-4.3.0.tgz?cache=0&sync_timestamp=1594972208431&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
3818 - integrity sha1-XUO9pKD9RHyw675xvvje/4gFrQ0= 3821 + integrity sha1-O4BvO/r8HsfeaVUe+TzKRsFwQSY=
3819 dependencies: 3822 dependencies:
3820 graceful-fs "^4.1.2" 3823 graceful-fs "^4.1.2"
3821 memory-fs "^0.5.0" 3824 memory-fs "^0.5.0"
3822 tapable "^1.0.0" 3825 tapable "^1.0.0"
3823 3826
3824 -enhanced-resolve@^4.3.0: 3827 +enhanced-resolve@^4.1.1:
3825 - version "4.3.0" 3828 + version "4.2.0"
3826 - resolved "https://registry.npm.taobao.org/enhanced-resolve/download/enhanced-resolve-4.3.0.tgz?cache=0&sync_timestamp=1594972208431&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126" 3829 + resolved "https://registry.npm.taobao.org/enhanced-resolve/download/enhanced-resolve-4.2.0.tgz?cache=0&sync_timestamp=1594067886559&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-4.2.0.tgz#5d43bda4a0fd447cb0ebbe71bef8deff8805ad0d"
3827 - integrity sha1-O4BvO/r8HsfeaVUe+TzKRsFwQSY= 3830 + integrity sha1-XUO9pKD9RHyw675xvvje/4gFrQ0=
3828 dependencies: 3831 dependencies:
3829 graceful-fs "^4.1.2" 3832 graceful-fs "^4.1.2"
3830 memory-fs "^0.5.0" 3833 memory-fs "^0.5.0"
...@@ -3975,10 +3978,10 @@ eslint-plugin-es@^1.4.1: ...@@ -3975,10 +3978,10 @@ eslint-plugin-es@^1.4.1:
3975 eslint-utils "^1.4.2" 3978 eslint-utils "^1.4.2"
3976 regexpp "^2.0.1" 3979 regexpp "^2.0.1"
3977 3980
3978 -eslint-plugin-html@^6.0.2: 3981 +eslint-plugin-html@^6.0.3:
3979 - version "6.0.2" 3982 + version "6.0.3"
3980 - resolved "https://registry.npm.taobao.org/eslint-plugin-html/download/eslint-plugin-html-6.0.2.tgz?cache=0&sync_timestamp=1586953892199&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-plugin-html%2Fdownload%2Feslint-plugin-html-6.0.2.tgz#fcbd293e218d03dd72c147fc999d185c6f5989fe" 3983 + resolved "https://registry.npm.taobao.org/eslint-plugin-html/download/eslint-plugin-html-6.0.3.tgz#8d9d2c187d1a48ed78d84f45e29820f102425e51"
3981 - integrity sha1-/L0pPiGNA91ywUf8mZ0YXG9Zif4= 3984 + integrity sha1-jZ0sGH0aSO142E9F4pgg8QJCXlE=
3982 dependencies: 3985 dependencies:
3983 htmlparser2 "^4.1.0" 3986 htmlparser2 "^4.1.0"
3984 3987
...@@ -5003,12 +5006,12 @@ hosted-git-info@^2.1.4: ...@@ -5003,12 +5006,12 @@ hosted-git-info@^2.1.4:
5003 resolved "https://registry.npm.taobao.org/hosted-git-info/download/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" 5006 resolved "https://registry.npm.taobao.org/hosted-git-info/download/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
5004 integrity sha1-dTm9S8Hg4KiVgVouAmJCCxKFhIg= 5007 integrity sha1-dTm9S8Hg4KiVgVouAmJCCxKFhIg=
5005 5008
5006 -hosted-git-info@^3.0.4: 5009 +hosted-git-info@^3.0.5:
5007 - version "3.0.4" 5010 + version "3.0.5"
5008 - resolved "https://registry.npm.taobao.org/hosted-git-info/download/hosted-git-info-3.0.4.tgz#be4973eb1fd2737b11c9c7c19380739bb249f60d" 5011 + resolved "https://registry.npm.taobao.org/hosted-git-info/download/hosted-git-info-3.0.5.tgz?cache=0&sync_timestamp=1594427917138&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhosted-git-info%2Fdownload%2Fhosted-git-info-3.0.5.tgz#bea87905ef7317442e8df3087faa3c842397df03"
5009 - integrity sha1-vklz6x/Sc3sRycfBk4Bzm7JJ9g0= 5012 + integrity sha1-vqh5Be9zF0QujfMIf6o8hCOX3wM=
5010 dependencies: 5013 dependencies:
5011 - lru-cache "^5.1.1" 5014 + lru-cache "^6.0.0"
5012 5015
5013 hpack.js@^2.1.6: 5016 hpack.js@^2.1.6:
5014 version "2.1.6" 5017 version "2.1.6"
...@@ -5192,12 +5195,12 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24: ...@@ -5192,12 +5195,12 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24:
5192 dependencies: 5195 dependencies:
5193 safer-buffer ">= 2.1.2 < 3" 5196 safer-buffer ">= 2.1.2 < 3"
5194 5197
5195 -iconv-lite@^0.5.1: 5198 +iconv-lite@^0.6.2:
5196 - version "0.5.2" 5199 + version "0.6.2"
5197 - resolved "https://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.5.2.tgz?cache=0&sync_timestamp=1593323684821&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ficonv-lite%2Fdownload%2Ficonv-lite-0.5.2.tgz#af6d628dccfb463b7364d97f715e4b74b8c8c2b8" 5200 + resolved "https://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.6.2.tgz?cache=0&sync_timestamp=1594184250387&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ficonv-lite%2Fdownload%2Ficonv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
5198 - integrity sha1-r21ijcz7RjtzZNl/cV5LdLjIwrg= 5201 + integrity sha1-zhPRh1sMOmdL1qBLf3awGxtt7QE=
5199 dependencies: 5202 dependencies:
5200 - safer-buffer ">= 2.1.2 < 3" 5203 + safer-buffer ">= 2.1.2 < 3.0.0"
5201 5204
5202 icss-utils@^4.0.0, icss-utils@^4.1.1: 5205 icss-utils@^4.0.0, icss-utils@^4.1.1:
5203 version "4.1.1" 5206 version "4.1.1"
...@@ -5663,11 +5666,12 @@ jake@^10.6.1: ...@@ -5663,11 +5666,12 @@ jake@^10.6.1:
5663 filelist "^1.0.1" 5666 filelist "^1.0.1"
5664 minimatch "^3.0.4" 5667 minimatch "^3.0.4"
5665 5668
5666 -jest-worker@^26.1.0: 5669 +jest-worker@^26.3.0:
5667 - version "26.1.0" 5670 + version "26.3.0"
5668 - resolved "https://registry.npm.taobao.org/jest-worker/download/jest-worker-26.1.0.tgz#65d5641af74e08ccd561c240e7db61284f82f33d" 5671 + resolved "https://registry.npm.taobao.org/jest-worker/download/jest-worker-26.3.0.tgz?cache=0&sync_timestamp=1597057481462&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjest-worker%2Fdownload%2Fjest-worker-26.3.0.tgz#7c8a97e4f4364b4f05ed8bca8ca0c24de091871f"
5669 - integrity sha1-ZdVkGvdOCMzVYcJA59thKE+C8z0= 5672 + integrity sha1-fIqX5PQ2S08F7YvKjKDCTeCRhx8=
5670 dependencies: 5673 dependencies:
5674 + "@types/node" "*"
5671 merge-stream "^2.0.0" 5675 merge-stream "^2.0.0"
5672 supports-color "^7.0.0" 5676 supports-color "^7.0.0"
5673 5677
...@@ -5832,9 +5836,9 @@ kind-of@^6.0.0, kind-of@^6.0.2: ...@@ -5832,9 +5836,9 @@ kind-of@^6.0.0, kind-of@^6.0.2:
5832 resolved "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" 5836 resolved "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
5833 integrity sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0= 5837 integrity sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0=
5834 5838
5835 -klona@^1.1.1: 5839 +klona@^1.1.2:
5836 version "1.1.2" 5840 version "1.1.2"
5837 - resolved "https://registry.npm.taobao.org/klona/download/klona-1.1.2.tgz?cache=0&sync_timestamp=1594031401487&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fklona%2Fdownload%2Fklona-1.1.2.tgz#a79e292518a5a5412ec8d097964bff1571a64db0" 5841 + resolved "https://registry.npm.taobao.org/klona/download/klona-1.1.2.tgz?cache=0&sync_timestamp=1594031499693&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fklona%2Fdownload%2Fklona-1.1.2.tgz#a79e292518a5a5412ec8d097964bff1571a64db0"
5838 integrity sha1-p54pJRilpUEuyNCXlkv/FXGmTbA= 5842 integrity sha1-p54pJRilpUEuyNCXlkv/FXGmTbA=
5839 5843
5840 latest-version@^5.0.0: 5844 latest-version@^5.0.0:
...@@ -6344,7 +6348,7 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: ...@@ -6344,7 +6348,7 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
6344 snapdragon "^0.8.1" 6348 snapdragon "^0.8.1"
6345 to-regex "^3.0.2" 6349 to-regex "^3.0.2"
6346 6350
6347 -micromatch@^4.0.2: 6351 +micromatch@^4.0.0, micromatch@^4.0.2:
6348 version "4.0.2" 6352 version "4.0.2"
6349 resolved "https://registry.npm.taobao.org/micromatch/download/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" 6353 resolved "https://registry.npm.taobao.org/micromatch/download/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
6350 integrity sha1-T8sJmb+fvC/L3SEvbWKbmlbDklk= 6354 integrity sha1-T8sJmb+fvC/L3SEvbWKbmlbDklk=
...@@ -6377,7 +6381,7 @@ mime@1.6.0: ...@@ -6377,7 +6381,7 @@ mime@1.6.0:
6377 resolved "https://registry.npm.taobao.org/mime/download/mime-1.6.0.tgz?cache=0&sync_timestamp=1590596706367&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmime%2Fdownload%2Fmime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" 6381 resolved "https://registry.npm.taobao.org/mime/download/mime-1.6.0.tgz?cache=0&sync_timestamp=1590596706367&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmime%2Fdownload%2Fmime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
6378 integrity sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE= 6382 integrity sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE=
6379 6383
6380 -mime@^2.4.4, mime@^2.4.5: 6384 +mime@^2.4.4, mime@^2.4.6:
6381 version "2.4.6" 6385 version "2.4.6"
6382 resolved "https://registry.npm.taobao.org/mime/download/mime-2.4.6.tgz?cache=0&sync_timestamp=1590596706367&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmime%2Fdownload%2Fmime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1" 6386 resolved "https://registry.npm.taobao.org/mime/download/mime-2.4.6.tgz?cache=0&sync_timestamp=1590596706367&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmime%2Fdownload%2Fmime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
6383 integrity sha1-5bQHyQ20QvK+tbFiNz0Htpr/pNE= 6387 integrity sha1-5bQHyQ20QvK+tbFiNz0Htpr/pNE=
...@@ -6392,10 +6396,10 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: ...@@ -6392,10 +6396,10 @@ mimic-response@^1.0.0, mimic-response@^1.0.1:
6392 resolved "https://registry.npm.taobao.org/mimic-response/download/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" 6396 resolved "https://registry.npm.taobao.org/mimic-response/download/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
6393 integrity sha1-SSNTiHju9CBjy4o+OweYeBSHqxs= 6397 integrity sha1-SSNTiHju9CBjy4o+OweYeBSHqxs=
6394 6398
6395 -mini-css-extract-plugin@0.9.0: 6399 +mini-css-extract-plugin@0.10.0:
6396 - version "0.9.0" 6400 + version "0.10.0"
6397 - resolved "https://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.9.0.tgz?cache=0&sync_timestamp=1576856499989&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-0.9.0.tgz#47f2cf07aa165ab35733b1fc97d4c46c0564339e" 6401 + resolved "https://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.10.0.tgz?cache=0&sync_timestamp=1597072255332&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-0.10.0.tgz#a0e6bfcad22a9c73f6c882a3c7557a98e2d3d27d"
6398 - integrity sha1-R/LPB6oWWrNXM7H8l9TEbAVkM54= 6402 + integrity sha1-oOa/ytIqnHP2yIKjx1V6mOLT0n0=
6399 dependencies: 6403 dependencies:
6400 loader-utils "^1.1.0" 6404 loader-utils "^1.1.0"
6401 normalize-url "1.9.1" 6405 normalize-url "1.9.1"
...@@ -6523,7 +6527,7 @@ ms@2.1.1: ...@@ -6523,7 +6527,7 @@ ms@2.1.1:
6523 resolved "https://registry.npm.taobao.org/ms/download/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" 6527 resolved "https://registry.npm.taobao.org/ms/download/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
6524 integrity sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo= 6528 integrity sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo=
6525 6529
6526 -ms@2.1.2, ms@^2.1.1: 6530 +ms@^2.1.1:
6527 version "2.1.2" 6531 version "2.1.2"
6528 resolved "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" 6532 resolved "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
6529 integrity sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk= 6533 integrity sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=
...@@ -6602,6 +6606,11 @@ neo-async@^2.5.0, neo-async@^2.6.1: ...@@ -6602,6 +6606,11 @@ neo-async@^2.5.0, neo-async@^2.6.1:
6602 resolved "https://registry.npm.taobao.org/neo-async/download/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" 6606 resolved "https://registry.npm.taobao.org/neo-async/download/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
6603 integrity sha1-rCetpmFn+ohJpq3dg39rGJrSCBw= 6607 integrity sha1-rCetpmFn+ohJpq3dg39rGJrSCBw=
6604 6608
6609 +neo-async@^2.6.2:
6610 + version "2.6.2"
6611 + resolved "https://registry.npm.taobao.org/neo-async/download/neo-async-2.6.2.tgz?cache=0&sync_timestamp=1594317447342&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fneo-async%2Fdownload%2Fneo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
6612 + integrity sha1-tKr7k+OustgXTKU88WOrfXMIMF8=
6613 +
6605 nice-try@^1.0.4: 6614 nice-try@^1.0.4:
6606 version "1.0.5" 6615 version "1.0.5"
6607 resolved "https://registry.npm.taobao.org/nice-try/download/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" 6616 resolved "https://registry.npm.taobao.org/nice-try/download/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
...@@ -6656,10 +6665,10 @@ node-libs-browser@^2.2.1: ...@@ -6656,10 +6665,10 @@ node-libs-browser@^2.2.1:
6656 util "^0.11.0" 6665 util "^0.11.0"
6657 vm-browserify "^1.0.1" 6666 vm-browserify "^1.0.1"
6658 6667
6659 -node-loader@^1.0.0: 6668 +node-loader@^1.0.1:
6660 - version "1.0.0" 6669 + version "1.0.1"
6661 - resolved "https://registry.npm.taobao.org/node-loader/download/node-loader-1.0.0.tgz#efe5adbcc68d34b97af201106b94531095ee8ca8" 6670 + resolved "https://registry.npm.taobao.org/node-loader/download/node-loader-1.0.1.tgz#1bfd47245a83b6a20c1d8df7f28c9c83e999d1ac"
6662 - integrity sha1-7+WtvMaNNLl68gEQa5RTEJXujKg= 6671 + integrity sha1-G/1HJFqDtqIMHY338oycg+mZ0aw=
6663 dependencies: 6672 dependencies:
6664 loader-utils "^2.0.0" 6673 loader-utils "^2.0.0"
6665 schema-utils "^2.7.0" 6674 schema-utils "^2.7.0"
...@@ -7972,7 +7981,7 @@ safe-regex@^1.1.0: ...@@ -7972,7 +7981,7 @@ safe-regex@^1.1.0:
7972 dependencies: 7981 dependencies:
7973 ret "~0.1.10" 7982 ret "~0.1.10"
7974 7983
7975 -"safer-buffer@>= 2.1.2 < 3": 7984 +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
7976 version "2.1.2" 7985 version "2.1.2"
7977 resolved "https://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" 7986 resolved "https://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
7978 integrity sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo= 7987 integrity sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=
...@@ -7984,14 +7993,14 @@ sanitize-filename@^1.6.2, sanitize-filename@^1.6.3: ...@@ -7984,14 +7993,14 @@ sanitize-filename@^1.6.2, sanitize-filename@^1.6.3:
7984 dependencies: 7993 dependencies:
7985 truncate-utf8-bytes "^1.0.0" 7994 truncate-utf8-bytes "^1.0.0"
7986 7995
7987 -sass-loader@^9.0.2: 7996 +sass-loader@^9.0.3:
7988 - version "9.0.2" 7997 + version "9.0.3"
7989 - resolved "https://registry.npm.taobao.org/sass-loader/download/sass-loader-9.0.2.tgz#847c9b4c95328ddc8c7d35cf28c9d6e54e59a90b" 7998 + resolved "https://registry.npm.taobao.org/sass-loader/download/sass-loader-9.0.3.tgz?cache=0&sync_timestamp=1596633419455&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsass-loader%2Fdownload%2Fsass-loader-9.0.3.tgz#086adcf0bfdcc9d920413e2cdc3ba3321373d547"
7990 - integrity sha1-hHybTJUyjdyMfTXPKMnW5U5ZqQs= 7999 + integrity sha1-CGrc8L/cydkgQT4s3DujMhNz1Uc=
7991 dependencies: 8000 dependencies:
7992 - klona "^1.1.1" 8001 + klona "^1.1.2"
7993 loader-utils "^2.0.0" 8002 loader-utils "^2.0.0"
7994 - neo-async "^2.6.1" 8003 + neo-async "^2.6.2"
7995 schema-utils "^2.7.0" 8004 schema-utils "^2.7.0"
7996 semver "^7.3.2" 8005 semver "^7.3.2"
7997 8006
...@@ -8758,22 +8767,22 @@ terser-webpack-plugin@^1.4.3: ...@@ -8758,22 +8767,22 @@ terser-webpack-plugin@^1.4.3:
8758 webpack-sources "^1.4.0" 8767 webpack-sources "^1.4.0"
8759 worker-farm "^1.7.0" 8768 worker-farm "^1.7.0"
8760 8769
8761 -terser-webpack-plugin@^3.0.8: 8770 +terser-webpack-plugin@^4.1.0:
8762 - version "3.0.8" 8771 + version "4.1.0"
8763 - resolved "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-3.0.8.tgz#d1a53442a143e09e00c880e8d77c1e79cb05318b" 8772 + resolved "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-4.1.0.tgz?cache=0&sync_timestamp=1597067395827&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-4.1.0.tgz#6e9d6ae4e1a900d88ddce8da6a47507ea61f44bc"
8764 - integrity sha1-0aU0QqFD4J4AyIDo13weecsFMYs= 8773 + integrity sha1-bp1q5OGpANiN3OjaakdQfqYfRLw=
8765 dependencies: 8774 dependencies:
8766 cacache "^15.0.5" 8775 cacache "^15.0.5"
8767 find-cache-dir "^3.3.1" 8776 find-cache-dir "^3.3.1"
8768 - jest-worker "^26.1.0" 8777 + jest-worker "^26.3.0"
8769 p-limit "^3.0.2" 8778 p-limit "^3.0.2"
8770 schema-utils "^2.6.6" 8779 schema-utils "^2.6.6"
8771 serialize-javascript "^4.0.0" 8780 serialize-javascript "^4.0.0"
8772 source-map "^0.6.1" 8781 source-map "^0.6.1"
8773 - terser "^4.8.0" 8782 + terser "^5.0.0"
8774 webpack-sources "^1.4.3" 8783 webpack-sources "^1.4.3"
8775 8784
8776 -terser@^4.1.2, terser@^4.6.3, terser@^4.8.0: 8785 +terser@^4.1.2, terser@^4.6.3:
8777 version "4.8.0" 8786 version "4.8.0"
8778 resolved "https://registry.npm.taobao.org/terser/download/terser-4.8.0.tgz?cache=0&sync_timestamp=1593953638544&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser%2Fdownload%2Fterser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" 8787 resolved "https://registry.npm.taobao.org/terser/download/terser-4.8.0.tgz?cache=0&sync_timestamp=1593953638544&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser%2Fdownload%2Fterser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
8779 integrity sha1-YwVjQ9fHC7KfOvZlhlpG/gOg3xc= 8788 integrity sha1-YwVjQ9fHC7KfOvZlhlpG/gOg3xc=
...@@ -8782,6 +8791,15 @@ terser@^4.1.2, terser@^4.6.3, terser@^4.8.0: ...@@ -8782,6 +8791,15 @@ terser@^4.1.2, terser@^4.6.3, terser@^4.8.0:
8782 source-map "~0.6.1" 8791 source-map "~0.6.1"
8783 source-map-support "~0.5.12" 8792 source-map-support "~0.5.12"
8784 8793
8794 +terser@^5.0.0:
8795 + version "5.0.0"
8796 + resolved "https://registry.npm.taobao.org/terser/download/terser-5.0.0.tgz?cache=0&sync_timestamp=1596288805749&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser%2Fdownload%2Fterser-5.0.0.tgz#269640e4e92f15d628de1e5f01c4c61e1ba3d765"
8797 + integrity sha1-JpZA5OkvFdYo3h5fAcTGHhuj12U=
8798 + dependencies:
8799 + commander "^2.20.0"
8800 + source-map "~0.6.1"
8801 + source-map-support "~0.5.12"
8802 +
8785 text-table@^0.2.0: 8803 text-table@^0.2.0:
8786 version "0.2.0" 8804 version "0.2.0"
8787 resolved "https://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" 8805 resolved "https://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
...@@ -8919,6 +8937,17 @@ truncate-utf8-bytes@^1.0.0: ...@@ -8919,6 +8937,17 @@ truncate-utf8-bytes@^1.0.0:
8919 dependencies: 8937 dependencies:
8920 utf8-byte-length "^1.0.1" 8938 utf8-byte-length "^1.0.1"
8921 8939
8940 +ts-loader@^8.0.2:
8941 + version "8.0.2"
8942 + resolved "https://registry.npm.taobao.org/ts-loader/download/ts-loader-8.0.2.tgz?cache=0&sync_timestamp=1596283653966&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fts-loader%2Fdownload%2Fts-loader-8.0.2.tgz#ee73ca9350f745799396fff8578ba29b1e95616b"
8943 + integrity sha1-7nPKk1D3RXmTlv/4V4uimx6VYWs=
8944 + dependencies:
8945 + chalk "^2.3.0"
8946 + enhanced-resolve "^4.0.0"
8947 + loader-utils "^1.0.2"
8948 + micromatch "^4.0.0"
8949 + semver "^6.0.0"
8950 +
8922 tsconfig-paths@^3.9.0: 8951 tsconfig-paths@^3.9.0:
8923 version "3.9.0" 8952 version "3.9.0"
8924 resolved "https://registry.npm.taobao.org/tsconfig-paths/download/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" 8953 resolved "https://registry.npm.taobao.org/tsconfig-paths/download/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
...@@ -8986,6 +9015,11 @@ typedarray@^0.0.6: ...@@ -8986,6 +9015,11 @@ typedarray@^0.0.6:
8986 resolved "https://registry.npm.taobao.org/typedarray/download/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" 9015 resolved "https://registry.npm.taobao.org/typedarray/download/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
8987 integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= 9016 integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
8988 9017
9018 +typescript@^3.9.7:
9019 + version "3.9.7"
9020 + resolved "https://registry.npm.taobao.org/typescript/download/typescript-3.9.7.tgz?cache=0&sync_timestamp=1596955694353&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftypescript%2Fdownload%2Ftypescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
9021 + integrity sha1-mNYApevcOPQMsndSLxLcgA6eJfo=
9022 +
8989 uglify-js@2.6.x: 9023 uglify-js@2.6.x:
8990 version "2.6.4" 9024 version "2.6.4"
8991 resolved "https://registry.npm.taobao.org/uglify-js/download/uglify-js-2.6.4.tgz#65ea2fb3059c9394692f15fed87c2b36c16b9adf" 9025 resolved "https://registry.npm.taobao.org/uglify-js/download/uglify-js-2.6.4.tgz#65ea2fb3059c9394692f15fed87c2b36c16b9adf"
...@@ -9294,10 +9328,10 @@ vue-loader@^15.9.3: ...@@ -9294,10 +9328,10 @@ vue-loader@^15.9.3:
9294 vue-hot-reload-api "^2.3.0" 9328 vue-hot-reload-api "^2.3.0"
9295 vue-style-loader "^4.1.0" 9329 vue-style-loader "^4.1.0"
9296 9330
9297 -vue-router@^3.3.2: 9331 +vue-router@^3.4.3:
9298 - version "3.3.4" 9332 + version "3.4.3"
9299 - resolved "https://registry.npm.taobao.org/vue-router/download/vue-router-3.3.4.tgz#4e38abc34a11c41b6c3d8244449a2e363ba6250b" 9333 + resolved "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.3.tgz#fa93768616ee338aa174f160ac965167fa572ffa"
9300 - integrity sha1-Tjirw0oRxBtsPYJERJouNjumJQs= 9334 + integrity sha1-+pN2hhbuM4qhdPFgrJZRZ/pXL/o=
9301 9335
9302 vue-style-loader@^4.1.0, vue-style-loader@^4.1.2: 9336 vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
9303 version "4.1.2" 9337 version "4.1.2"
...@@ -9440,10 +9474,10 @@ webpack-log@^2.0.0: ...@@ -9440,10 +9474,10 @@ webpack-log@^2.0.0:
9440 ansi-colors "^3.0.0" 9474 ansi-colors "^3.0.0"
9441 uuid "^3.3.2" 9475 uuid "^3.3.2"
9442 9476
9443 -webpack-merge@^5.0.9: 9477 +webpack-merge@^5.1.1:
9444 - version "5.0.9" 9478 + version "5.1.1"
9445 - resolved "https://registry.npm.taobao.org/webpack-merge/download/webpack-merge-5.0.9.tgz#d5e0e0ae564ae704836d747893bdd2741544bf31" 9479 + resolved "https://registry.npm.taobao.org/webpack-merge/download/webpack-merge-5.1.1.tgz?cache=0&sync_timestamp=1596542065923&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-merge%2Fdownload%2Fwebpack-merge-5.1.1.tgz#c79f36b4ad39a597c3bb780f809b514d65d85d01"
9446 - integrity sha1-1eDgrlZK5wSDbXR4k73SdBVEvzE= 9480 + integrity sha1-x582tK05pZfDu3gPgJtRTWXYXQE=
9447 dependencies: 9481 dependencies:
9448 clone-deep "^4.0.1" 9482 clone-deep "^4.0.1"
9449 wildcard "^2.0.0" 9483 wildcard "^2.0.0"
......