Update deps
This commit is contained in:
parent
6167cc7c4b
commit
82e9c257ce
7
.babelrc
7
.babelrc
|
@ -1,9 +1,12 @@
|
||||||
{
|
{
|
||||||
"presets": [
|
"presets": [
|
||||||
["env", {
|
[
|
||||||
|
"@babel/env",
|
||||||
|
{
|
||||||
"targets": {
|
"targets": {
|
||||||
"node": "6.7.0"
|
"node": "6.7.0"
|
||||||
}
|
}
|
||||||
}]
|
}
|
||||||
|
]
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,34 +1,38 @@
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const webpack = require('webpack');
|
const webpack = require('webpack');
|
||||||
|
const VueLoaderPlugin = require('vue-loader/lib/plugin');
|
||||||
|
|
||||||
const jsLoader = {
|
const jsLoader = {
|
||||||
test: /\.(js|jsx)$/,
|
test: /\.(js|jsx)$/,
|
||||||
exclude: /node_modules/,
|
exclude: /node_modules/,
|
||||||
loader: 'babel-loader',
|
use: {
|
||||||
query: {
|
loader: 'babel-loader',
|
||||||
presets: ['react']
|
options: {
|
||||||
|
presets: ['@babel/env', '@babel/react']
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const vueLoader = {
|
const vueLoader = {
|
||||||
test: /\.(vue)$/,
|
test: /\.(vue)$/,
|
||||||
loader: 'vue-loader'
|
use: 'vue-loader'
|
||||||
};
|
};
|
||||||
|
|
||||||
const scssLoader = {
|
const scssLoader = {
|
||||||
test: /\.scss$/,
|
test: /\.scss$/,
|
||||||
exclude: /node_modules/,
|
exclude: /node_modules/,
|
||||||
loader: ['css-loader', 'sass-loader']
|
use: ['css-loader', 'sass-loader']
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
entry: './src/index.js',
|
entry: './src/index.js',
|
||||||
|
mode: 'development',
|
||||||
output: {
|
output: {
|
||||||
path: path.resolve(__dirname, 'dist'),
|
path: path.resolve(__dirname, 'dist'),
|
||||||
filename: 'betterdiscord.client.js'
|
filename: 'betterdiscord.client.js'
|
||||||
},
|
},
|
||||||
module: {
|
module: {
|
||||||
loaders: [jsLoader, vueLoader, scssLoader]
|
rules: [jsLoader, vueLoader, scssLoader]
|
||||||
},
|
},
|
||||||
externals: {
|
externals: {
|
||||||
electron: 'require("electron")',
|
electron: 'require("electron")',
|
||||||
|
@ -63,6 +67,6 @@ module.exports = {
|
||||||
},
|
},
|
||||||
plugins: [
|
plugins: [
|
||||||
new webpack.NamedModulesPlugin(),
|
new webpack.NamedModulesPlugin(),
|
||||||
new webpack.EvalSourceMapDevToolPlugin()
|
new VueLoaderPlugin()
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,25 +1,28 @@
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const webpack = require('webpack');
|
const webpack = require('webpack');
|
||||||
const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
|
const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
|
||||||
|
const VueLoaderPlugin = require('vue-loader/lib/plugin')
|
||||||
|
|
||||||
const jsLoader = {
|
const jsLoader = {
|
||||||
test: /\.(js|jsx)$/,
|
test: /\.(js|jsx)$/,
|
||||||
exclude: /node_modules/,
|
exclude: /node_modules/,
|
||||||
loader: 'babel-loader',
|
use: {
|
||||||
query: {
|
loader: 'babel-loader',
|
||||||
presets: ['react']
|
options: {
|
||||||
|
presets: ['@babel/env', '@babel/react']
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const vueLoader = {
|
const vueLoader = {
|
||||||
test: /\.(vue)$/,
|
test: /\.(vue)$/,
|
||||||
loader: 'vue-loader'
|
use: 'vue-loader'
|
||||||
};
|
};
|
||||||
|
|
||||||
const scssLoader = {
|
const scssLoader = {
|
||||||
test: /\.scss$/,
|
test: /\.scss$/,
|
||||||
exclude: /node_modules/,
|
exclude: /node_modules/,
|
||||||
loader: ['css-loader', 'sass-loader']
|
use: ['css-loader', 'sass-loader']
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
|
@ -29,7 +32,7 @@ module.exports = {
|
||||||
filename: 'betterdiscord.client-release.js'
|
filename: 'betterdiscord.client-release.js'
|
||||||
},
|
},
|
||||||
module: {
|
module: {
|
||||||
loaders: [jsLoader, vueLoader, scssLoader]
|
rules: [jsLoader, vueLoader, scssLoader]
|
||||||
},
|
},
|
||||||
externals: {
|
externals: {
|
||||||
electron: 'require("electron")',
|
electron: 'require("electron")',
|
||||||
|
@ -66,6 +69,7 @@ module.exports = {
|
||||||
new webpack.DefinePlugin({
|
new webpack.DefinePlugin({
|
||||||
PRODUCTION: JSON.stringify(true)
|
PRODUCTION: JSON.stringify(true)
|
||||||
}),
|
}),
|
||||||
new UglifyJsPlugin()
|
new UglifyJsPlugin(),
|
||||||
|
new VueLoaderPlugin()
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
{
|
||||||
|
"presets": [
|
||||||
|
[
|
||||||
|
"@babel/env",
|
||||||
|
{
|
||||||
|
"targets": {
|
||||||
|
"node": "6.7.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
]
|
||||||
|
}
|
|
@ -1,25 +1,26 @@
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const webpack = require('webpack');
|
const VueLoaderPlugin = require('vue-loader/lib/plugin');
|
||||||
|
|
||||||
const vueLoader = {
|
const vueLoader = {
|
||||||
test: /\.(vue)$/,
|
test: /\.(vue)$/,
|
||||||
exclude: /node_modules/,
|
exclude: /node_modules/,
|
||||||
loader: 'vue-loader'
|
use: 'vue-loader'
|
||||||
};
|
};
|
||||||
|
|
||||||
const scssLoader = {
|
const scssLoader = {
|
||||||
test: /\.(css|scss)$/,
|
test: /\.(css|scss)$/,
|
||||||
loader: ['css-loader', 'sass-loader']
|
use: ['css-loader', 'sass-loader']
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
entry: './src/index.js',
|
entry: './src/index.js',
|
||||||
|
mode: 'development',
|
||||||
output: {
|
output: {
|
||||||
path: path.resolve(__dirname, 'dist'),
|
path: path.resolve(__dirname, 'dist'),
|
||||||
filename: 'csseditor.js'
|
filename: 'csseditor.js'
|
||||||
},
|
},
|
||||||
module: {
|
module: {
|
||||||
loaders: [vueLoader, scssLoader]
|
rules: [vueLoader, scssLoader]
|
||||||
},
|
},
|
||||||
externals: {
|
externals: {
|
||||||
electron: 'window.require("electron")',
|
electron: 'window.require("electron")',
|
||||||
|
@ -35,5 +36,8 @@ module.exports = {
|
||||||
path.resolve('..', 'node_modules'),
|
path.resolve('..', 'node_modules'),
|
||||||
path.resolve('..', 'common', 'modules')
|
path.resolve('..', 'common', 'modules')
|
||||||
]
|
]
|
||||||
}
|
},
|
||||||
|
plugins: [
|
||||||
|
new VueLoaderPlugin()
|
||||||
|
]
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,16 +1,17 @@
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const webpack = require('webpack');
|
const webpack = require('webpack');
|
||||||
const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
|
const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
|
||||||
|
const VueLoaderPlugin = require('vue-loader/lib/plugin');
|
||||||
|
|
||||||
const vueLoader = {
|
const vueLoader = {
|
||||||
test: /\.(vue)$/,
|
test: /\.(vue)$/,
|
||||||
exclude: /node_modules/,
|
exclude: /node_modules/,
|
||||||
loader: 'vue-loader'
|
use: 'vue-loader'
|
||||||
};
|
};
|
||||||
|
|
||||||
const scssLoader = {
|
const scssLoader = {
|
||||||
test: /\.(css|scss)$/,
|
test: /\.(css|scss)$/,
|
||||||
loader: ['css-loader', 'sass-loader']
|
use: ['css-loader', 'sass-loader']
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
|
@ -20,7 +21,7 @@ module.exports = {
|
||||||
filename: 'csseditor-release.js'
|
filename: 'csseditor-release.js'
|
||||||
},
|
},
|
||||||
module: {
|
module: {
|
||||||
loaders: [vueLoader, scssLoader]
|
rules: [vueLoader, scssLoader]
|
||||||
},
|
},
|
||||||
externals: {
|
externals: {
|
||||||
electron: 'window.require("electron")',
|
electron: 'window.require("electron")',
|
||||||
|
@ -41,6 +42,7 @@ module.exports = {
|
||||||
new webpack.DefinePlugin({
|
new webpack.DefinePlugin({
|
||||||
PRODUCTION: JSON.stringify(true)
|
PRODUCTION: JSON.stringify(true)
|
||||||
}),
|
}),
|
||||||
new UglifyJsPlugin()
|
new UglifyJsPlugin(),
|
||||||
|
new VueLoaderPlugin()
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,25 +1,26 @@
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const webpack = require('webpack');
|
const VueLoaderPlugin = require('vue-loader/lib/plugin');
|
||||||
|
|
||||||
const vueLoader = {
|
const vueLoader = {
|
||||||
test: /\.(vue)$/,
|
test: /\.(vue)$/,
|
||||||
exclude: /node_modules/,
|
exclude: /node_modules/,
|
||||||
loader: 'vue-loader'
|
use: 'vue-loader'
|
||||||
};
|
};
|
||||||
|
|
||||||
const scssLoader = {
|
const scssLoader = {
|
||||||
test: /\.(css|scss)$/,
|
test: /\.(css|scss)$/,
|
||||||
loader: ['css-loader', 'sass-loader']
|
use: ['css-loader', 'sass-loader']
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
entry: './src/index.js',
|
entry: './src/index.js',
|
||||||
|
mode: 'development',
|
||||||
output: {
|
output: {
|
||||||
path: path.resolve(__dirname, 'dist'),
|
path: path.resolve(__dirname, 'dist'),
|
||||||
filename: 'editor.js'
|
filename: 'editor.js'
|
||||||
},
|
},
|
||||||
module: {
|
module: {
|
||||||
loaders: [vueLoader, scssLoader]
|
rules: [vueLoader, scssLoader]
|
||||||
},
|
},
|
||||||
externals: {
|
externals: {
|
||||||
electron: 'window.require("electron")',
|
electron: 'window.require("electron")',
|
||||||
|
@ -35,5 +36,8 @@ module.exports = {
|
||||||
path.resolve('..', 'node_modules'),
|
path.resolve('..', 'node_modules'),
|
||||||
path.resolve('..', 'common', 'modules')
|
path.resolve('..', 'common', 'modules')
|
||||||
]
|
]
|
||||||
}
|
},
|
||||||
|
plugins: [
|
||||||
|
new VueLoaderPlugin()
|
||||||
|
]
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const webpack = require('webpack');
|
const webpack = require('webpack');
|
||||||
const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
|
const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
|
||||||
|
const VueLoaderPlugin = require('vue-loader/lib/plugin');
|
||||||
|
|
||||||
const vueLoader = {
|
const vueLoader = {
|
||||||
test: /\.(vue)$/,
|
test: /\.(vue)$/,
|
||||||
|
@ -38,6 +39,7 @@ module.exports = {
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
plugins: [
|
plugins: [
|
||||||
new UglifyJsPlugin()
|
new UglifyJsPlugin(),
|
||||||
|
new VueLoaderPlugin()
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,17 +1,18 @@
|
||||||
const
|
const
|
||||||
path = require('path'),
|
path = require('path'),
|
||||||
webpack = require('webpack'),
|
webpack = require('webpack'),
|
||||||
HtmlWebpackPlugin = require('html-webpack-plugin');
|
HtmlWebpackPlugin = require('html-webpack-plugin'),
|
||||||
|
VueLoaderPlugin = require('vue-loader/lib/plugin');
|
||||||
|
|
||||||
const vueLoader = {
|
const vueLoader = {
|
||||||
test: /\.(vue)$/,
|
test: /\.(vue)$/,
|
||||||
exclude: /node_modules/,
|
exclude: /node_modules/,
|
||||||
loader: 'vue-loader'
|
use: 'vue-loader'
|
||||||
};
|
};
|
||||||
|
|
||||||
const scssLoader = {
|
const scssLoader = {
|
||||||
test: /\.(css|scss)$/,
|
test: /\.(css|scss)$/,
|
||||||
loader: ['css-loader', 'sass-loader']
|
use: ['css-loader', 'sass-loader']
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
|
@ -21,7 +22,7 @@ module.exports = {
|
||||||
filename: 'installer.js'
|
filename: 'installer.js'
|
||||||
},
|
},
|
||||||
module: {
|
module: {
|
||||||
loaders: [vueLoader, scssLoader]
|
rules: [vueLoader, scssLoader]
|
||||||
},
|
},
|
||||||
resolve: {
|
resolve: {
|
||||||
alias: {
|
alias: {
|
||||||
|
@ -31,6 +32,7 @@ module.exports = {
|
||||||
plugins: [
|
plugins: [
|
||||||
new HtmlWebpackPlugin({
|
new HtmlWebpackPlugin({
|
||||||
template: './src/index.html'
|
template: './src/index.html'
|
||||||
})
|
}),
|
||||||
|
new VueLoaderPlugin()
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
63
package.json
63
package.json
|
@ -16,62 +16,63 @@
|
||||||
},
|
},
|
||||||
"private": false,
|
"private": false,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"asar": "^0.14.6",
|
"asar": "^1.0.0",
|
||||||
|
"chokidar": "^2.1.2",
|
||||||
"csp-parse": "github:macropodhq/csp-parse",
|
"csp-parse": "github:macropodhq/csp-parse",
|
||||||
"deepmerge": "^2.2.1",
|
"deepmerge": "^3.2.0",
|
||||||
"fs-extra": "^7.0.0",
|
"fs-extra": "^7.0.1",
|
||||||
"keytar": "^4.3.0",
|
"keytar": "^4.4.1",
|
||||||
"nedb": "^1.8.0",
|
"nedb": "^1.8.0",
|
||||||
"node-sass": "^4.10.0",
|
"node-sass": "^4.11.0",
|
||||||
"original-fs": "^1.0.0",
|
"original-fs": "^1.0.0"
|
||||||
"chokidar": "^2.1.2"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@babel/core": "^7.3.4",
|
||||||
|
"@babel/preset-env": "^7.3.4",
|
||||||
|
"@babel/preset-react": "^7.0.0",
|
||||||
|
"@babel/register": "^7.0.0",
|
||||||
"aes256": "^1.0.4",
|
"aes256": "^1.0.4",
|
||||||
"archiver": "^3.0.0",
|
"archiver": "^3.0.0",
|
||||||
"babel-core": "^6.26.3",
|
"babel-loader": "^8.0.5",
|
||||||
"babel-loader": "^7.1.5",
|
"bdedit": "github:JsSucks/bdedit",
|
||||||
"babel-preset-env": "^1.7.0",
|
|
||||||
"babel-preset-es2015": "^6.24.1",
|
|
||||||
"babel-preset-react": "^6.24.1",
|
|
||||||
"combokeys": "^3.0.0",
|
"combokeys": "^3.0.0",
|
||||||
"css-loader": "^0.28.11",
|
"css-loader": "^2.1.0",
|
||||||
"del": "^3.0.0",
|
"del": "^3.0.0",
|
||||||
"electron": "4.0.0-beta.7",
|
"electron": "4.0.6",
|
||||||
"electron-rebuild": "^1.8.2",
|
"electron-rebuild": "^1.8.4",
|
||||||
"eslint": "^4.19.1",
|
"eslint": "^5.15.0",
|
||||||
"eslint-plugin-vue": "^4.7.1",
|
"eslint-plugin-vue": "^5.2.2",
|
||||||
"file-type": "^7.7.1",
|
"file-type": "^10.8.0",
|
||||||
"filewatcher": "^3.0.1",
|
"filewatcher": "^3.0.1",
|
||||||
"gulp": "^4.0.0",
|
"gulp": "^4.0.0",
|
||||||
"gulp-babel": "^7.0.0",
|
"gulp-babel": "^8.0.0",
|
||||||
"gulp-copy": "^1.1.0",
|
"gulp-copy": "^4.0.1",
|
||||||
"gulp-file": "^0.4.0",
|
"gulp-file": "^0.4.0",
|
||||||
"gulp-inject-string": "^1.1.1",
|
"gulp-inject-string": "^1.1.2",
|
||||||
"gulp-json-editor": "^2.4.2",
|
"gulp-json-editor": "^2.5.1",
|
||||||
"gulp-npm-copy-deps": "^1.0.2",
|
"gulp-npm-copy-deps": "^1.0.2",
|
||||||
"gulp-rename": "^1.4.0",
|
"gulp-rename": "^1.4.0",
|
||||||
"gulp-watch": "^5.0.1",
|
"gulp-watch": "^5.0.1",
|
||||||
"hash-files": "^1.1.1",
|
"hash-files": "^1.1.1",
|
||||||
"html-webpack-plugin": "^3.2.0",
|
"html-webpack-plugin": "^3.2.0",
|
||||||
"jquery": "^3.2.1",
|
"jquery": "^3.3.1",
|
||||||
"lodash": "^4.17.11",
|
"lodash": "^4.17.11",
|
||||||
"mkdirp": "^0.5.1",
|
"mkdirp": "^0.5.1",
|
||||||
"node-gyp": "^3.7.0",
|
"node-gyp": "^3.8.0",
|
||||||
"pump": "^3.0.0",
|
"pump": "^3.0.0",
|
||||||
"request-promise-native": "^1.0.5",
|
"request-promise-native": "1.0.5",
|
||||||
"sass-lint": "^1.12.1",
|
"sass-lint": "^1.12.1",
|
||||||
"sass-loader": "^6.0.7",
|
"sass-loader": "^7.1.0",
|
||||||
"uglifyjs-webpack-plugin": "^1.2.7",
|
"uglifyjs-webpack-plugin": "^2.1.2",
|
||||||
"v-tooltip": "^2.0.0-rc.33",
|
"v-tooltip": "^2.0.0-rc.33",
|
||||||
"vue": "^2.6.8",
|
"vue": "^2.6.8",
|
||||||
"vue-color": "^2.7.0",
|
"vue-color": "^2.7.0",
|
||||||
"vue-context-menu": "^2.0.6",
|
"vue-context-menu": "^2.0.6",
|
||||||
"vue-loader": "^13.7.2",
|
"vue-loader": "^15.7.0",
|
||||||
"vue-material-design-icons": "^1.6.0",
|
"vue-material-design-icons": "^3.0.0",
|
||||||
"vue-template-compiler": "^2.6.8",
|
"vue-template-compiler": "^2.6.8",
|
||||||
"webpack": "^3.12.0",
|
"webpack": "^4.29.6",
|
||||||
"bdedit": "github:JsSucks/bdedit"
|
"webpack-cli": "^3.2.3"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"install": "node scripts/install.js",
|
"install": "node scripts/install.js",
|
||||||
|
|
Loading…
Reference in New Issue