FIX: merge issue

This commit is contained in:
Tony Air 2020-09-02 05:55:50 +07:00
parent 3149a9a512
commit b60b42d4e2
5 changed files with 21 additions and 21 deletions

4
dist/css/app.css vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
dist/js/app.js vendored

File diff suppressed because one or more lines are too long

2
dist/js/app.js.map vendored

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{
"name": "@a2nt/ss-bootstrap-ui-webpack-boilerplate",
"version": "2.4.5",
"version": "2.4.6",
"author": "Tony Air <tony@twma.pro>",
"license": "MIT",
"description": "This UI Kit allows you to build Bootstrap 4 webapp with some extra UI features. It's easy to extend and easy to convert HTML templates to CMS templates.",
@ -33,7 +33,7 @@
"ie>=11"
],
"dependencies": {
"@a2nt/meta-lightbox": "^2.2.1",
"@a2nt/meta-lightbox": "^2.2.7",
"bootbox": "^4.4.0",
"bootstrap": "^4.5.2",
"bootstrap-confirmation2": "^4.1.0",
@ -43,31 +43,31 @@
"bootstrap-timepicker": "^0.5.2",
"font-awesome": "^4.7.0",
"hammerjs": "^2.0.8",
"inputmask": "^5.0.3",
"inputmask": "^5.0.5",
"jquery": "^3.5.1",
"jquery-hammerjs": "^2.0.0",
"jquery-hoverintent": "*",
"jquery-zoom": "^1.7.21",
"jquery.appear": "^1.0.1",
"mapbox-gl": "^1.11.1",
"mapbox-gl": "^1.12.0",
"material-design-color": "^2.3.2",
"popper.js": "*",
"select2": "^4.0.13",
"smooth-scroll": "^14.2.1",
"sticky-sidebar": "^3.3.1",
"yarn": "^1.22.4"
"yarn": "^1.22.5"
},
"devDependencies": {
"@a2nt/image-sprite-webpack-plugin": "^0.2.5",
"@babel/core": "^7.10.5",
"@babel/plugin-proposal-object-rest-spread": "^7.10.4",
"@babel/core": "^7.11.5",
"@babel/plugin-proposal-object-rest-spread": "^7.11.0",
"@babel/plugin-transform-react-jsx": "^7.10.4",
"@babel/preset-env": "^7.10.4",
"@babel/preset-env": "^7.11.5",
"@google/markerclusterer": "^1.0.3",
"animate.css": "^3.7.2",
"ansi-html": "^0.0.7",
"ansi-regex": "^5.0.0",
"autoprefixer": "^9.8.5",
"autoprefixer": "^9.8.6",
"babel-eslint": "^8.2.6",
"babel-loader": "^8.1.0",
"copy-webpack-plugin": "^4.6.0",
@ -77,24 +77,24 @@
"eslint": "^4.19.1",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jquery": "^1.5.1",
"eslint-plugin-react": "^7.20.5",
"eslint-plugin-react": "^7.20.6",
"exports-loader": "^0.7.0",
"favicons-webpack-plugin": "0.0.9",
"file-loader": "^5.1.0",
"font-awesome": "^4.7.0",
"hard-source-webpack-plugin": "^0.13.1",
"html-entities": "^1.3.1",
"html-loader": "^1.1.0",
"html-webpack-plugin": "^4.3.0",
"html-loader": "^1.3.0",
"html-webpack-plugin": "^4.4.1",
"imagemin-gifsicle": "^7.0.0",
"imagemin-jpegtran": "^6.0.0",
"imagemin-optipng": "^7.1.0",
"imagemin-svgo": "^7.1.0",
"imagemin-webpack": "^5.1.1",
"loglevel": "^1.6.8",
"loglevel": "^1.7.0",
"mini-css-extract-plugin": "^0.9.0",
"node-sass": "^4.14.1",
"optimize-css-assets-webpack-plugin": "^5.0.3",
"optimize-css-assets-webpack-plugin": "^5.0.4",
"postcss-loader": "^3.0.0",
"react-hot-loader": "^4.12.21",
"resolve-url-loader": "^3.1.1",
@ -104,11 +104,11 @@
"sass-lint-fix": "^1.12.1",
"sass-loader": "^8.0.2",
"script-ext-html-webpack-plugin": "^2.1.4",
"sockjs-client": "^1.4.0",
"sockjs-client": "^1.5.0",
"strip-ansi": "^6.0.0",
"style-loader": "^0.19.1",
"svg-url-loader": "^2.3.3",
"terser-webpack-plugin": "^2.3.7",
"terser-webpack-plugin": "^2.3.8",
"url-loader": "^0.6.2",
"webpack": "^4.44.1",
"webpack-cli": "^3.3.12",