upgrade deps

This commit is contained in:
Pig Fang 2019-02-19 11:55:54 +08:00
parent aa46c08c00
commit 709ecf6f9b
5 changed files with 1546 additions and 1445 deletions

View File

@ -18,70 +18,69 @@
"release": "yarn build && node scripts/release.js"
},
"dependencies": {
"@babel/runtime": "^7.0.0",
"@fortawesome/fontawesome-free": "^5.3.1",
"@babel/runtime": "^7.3.1",
"@fortawesome/fontawesome-free": "^5.7.2",
"admin-lte": "^2.4.2",
"bootstrap": "^3.3.7",
"chart.js": "^2.7.2",
"chart.js": "^2.7.3",
"icheck": "^1.0.2",
"jquery": "^3.3.1",
"skinview3d": "^1.1.0",
"sweetalert2": "^7.28.1",
"sweetalert2": "^8.2.0",
"toastr": "^2.1.4",
"vue": "^2.5.17",
"vue-good-table": "^2.15.3",
"vue-upload-component": "^2.8.13",
"vuejs-paginate": "^2.0.1"
"vue": "^2.6.6",
"vue-good-table": "^2.16.0",
"vue-upload-component": "^2.8.19",
"vuejs-paginate": "^2.1.0"
},
"devDependencies": {
"@babel/core": "^7.1.0",
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/plugin-transform-runtime": "^7.1.0",
"@babel/preset-env": "^7.1.0",
"@babel/core": "^7.3.3",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-transform-runtime": "^7.2.0",
"@babel/preset-env": "^7.3.1",
"@types/archiver": "^2.1.2",
"@types/execa": "^0.9.0",
"@types/jest": "^23.3.2",
"@types/jest": "^24.0.6",
"@types/jquery": "^3.3.9",
"@types/listr": "^0.13.0",
"@vue/test-utils": "^1.0.0-beta.25",
"archiver": "^3.0.0",
"autoprefixer": "^9.1.5",
"autoprefixer": "^9.4.7",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "^9.0.0",
"babel-jest": "^23.6.0",
"babel-loader": "^8.0.4",
"babel-plugin-dynamic-import-node": "^2.1.0",
"cache-loader": "^1.2.2",
"babel-eslint": "^10.0.1",
"babel-jest": "^24.1.0",
"babel-loader": "^8.0.5",
"babel-plugin-dynamic-import-node": "^2.2.0",
"cache-loader": "^2.0.1",
"codecov": "^3.1.0",
"copy-webpack-plugin": "^4.5.2",
"css-loader": "^1.0.0",
"cssnano": "^4.1.0",
"copy-webpack-plugin": "^4.6.0",
"css-loader": "^2.1.0",
"cssnano": "^4.1.10",
"csso-loader": "^0.3.1",
"eslint": "^5.6.0",
"eslint": "^5.14.0",
"eslint-formatter-beauty": "^3.0.0",
"eslint-plugin-vue": "^5.0.0-beta.3",
"execa": "^1.0.0",
"file-loader": "^2.0.0",
"jest": "^23.6.0",
"jest-extended": "^0.10.0",
"file-loader": "^3.0.1",
"jest": "^24.1.0",
"jest-extended": "^0.11.1",
"jest-junit": "^6.3.0",
"json-loader": "^0.5.7",
"listr": "^0.14.2",
"mini-css-extract-plugin": "^0.4.3",
"mini-css-extract-plugin": "^0.5.0",
"postcss-loader": "^3.0.0",
"rimraf": "^2.6.2",
"style-loader": "^0.23.0",
"rimraf": "^2.6.3",
"style-loader": "^0.23.1",
"stylus": "^0.54.5",
"stylus-loader": "^3.0.2",
"terser-webpack-plugin": "^1.1.0",
"url-loader": "^1.1.1",
"vue-jest": "^2.6.0",
"vue-loader": "^15.4.2",
"vue-template-compiler": "^2.5.17",
"webpack": "^4.19.1",
"webpack-bundle-analyzer": "^3.0.2",
"url-loader": "^1.1.2",
"vue-jest": "^3.0.3",
"vue-loader": "^15.6.2",
"vue-template-compiler": "^2.6.6",
"webpack": "^4.29.4",
"webpack-bundle-analyzer": "^3.0.4",
"webpack-serve": "^2.0.2",
"webpackbar": "^2.6.3",
"webpackbar": "^3.1.5",
"yaml-loader": "^0.5.0"
},
"jest": {
@ -102,7 +101,9 @@
"\\.css$": "<rootDir>/resources/assets/tests/__mocks__/style.js",
"\\.(png|jpg)$": "<rootDir>/resources/assets/tests/__mocks__/file.js"
},
"setupTestFrameworkScriptFile": "<rootDir>/resources/assets/tests/setup.js",
"setupFilesAfterEnv": [
"<rootDir>/resources/assets/tests/setup.js"
],
"coveragePathIgnorePatterns": [
"/node_modules/",
"<rootDir>/resources/assets/tests/setup",

View File

@ -1,5 +1,5 @@
import $ from 'jquery';
import sweetalert2 from 'sweetalert2';
import Swal from 'sweetalert2';
import toastr from 'toastr';
import { trans } from './i18n';
@ -68,11 +68,18 @@ export function showModal(msg, title = 'Message', type = 'default', options = {}
}).modal(options);
}
export const swal = sweetalert2.mixin({
const swalInstance = Swal.mixin({
confirmButtonText: trans('general.confirm'),
cancelButtonText: trans('general.cancel')
});
/**
* @param {import('sweetalert2').SweetAlertOptions} options
*/
export function swal(options) {
return swalInstance.fire(options);
}
window.toastr = toastr;
window.swal = swal;
blessing.notify = { showMsg, showModal };

View File

@ -1,4 +1,4 @@
// eslint-disable-next-line no-undef
__webpack_public_path__ = process.env.NODE_ENV === 'development'
? 'http://127.0.0.1:8080/'
? 'http://127.0.0.1:8080/public/'
: blessing.base_url + '/app/';

View File

@ -1,7 +1,6 @@
const VueLoaderPlugin = require('vue-loader/lib/plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const TerserPlugin = require('terser-webpack-plugin');
const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
const WebpackBar = require('webpackbar');
@ -127,27 +126,6 @@ const config = {
analyzerMode: devMode ? 'server' : 'static'
}),
],
optimization: {
minimizer: [
new TerserPlugin({
parallel: true,
cache: true,
sourceMap: false,
extractComments: {
filename: 'LICENSES'
},
terserOptions: {
output: {
comments: /^\**!|@preserve|@license|@cc_on/
}
},
exclude: [
/sweetalert2$/,
/node_modules.*jquery$/
]
})
]
},
resolve: {
extensions: ['.js', '.vue', '.json'],
alias: {

2879
yarn.lock

File diff suppressed because it is too large Load Diff