Browse Source

Merge branch 'cleanup' of LInE/iVProg into master

GitAdmin 4 years ago
parent
commit
ebaab63c3d
3 changed files with 3302 additions and 3759 deletions
  1. 3294 3744
      package-lock.json
  2. 7 14
      package.json
  3. 1 1
      webpack.config.js

File diff suppressed because it is too large
+ 3294 - 3744
package-lock.json


+ 7 - 14
package.json

@@ -30,23 +30,17 @@
     "@babel/preset-env": "^7.6.2",
     "@typescript-eslint/eslint-plugin": "^2.3.2",
     "@typescript-eslint/parser": "^2.3.2",
-    "antlr4-webpack-loader": "^0.1.1",
+    "antlr4-webpack-loader": "*",
     "babel-loader": "^8.0.6",
-    "clean-webpack-plugin": "^2.0.2",
+    "clean-webpack-plugin": "3.x",
     "copy-webpack-plugin": "^5.1.1",
     "eslint": "^6.5.1",
-    "html-webpack-plugin": "^4.0.0-beta.8",
-    "jasmine-core": "^3.5.0",
-    "karma": "^4.3.0",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-jasmine": "^2.0.1",
-    "karma-mocha-reporter": "^2.2.5",
-    "karma-webpack": "^3.0.5",
-    "puppeteer-core": "^1.20.0",
+    "html-webpack-plugin": "^4.2",
+    "server": "^1.0.19",
     "ts-loader": "^5.4.5",
     "typescript": "^3.8.3",
-    "webpack": "^4.41.0",
-    "webpack-cli": "^3.3.9"
+    "webpack": "4.x",
+    "webpack-cli": "3.x"
   },
   "dependencies": {
     "antlr4": "^4.7.2",
@@ -54,7 +48,6 @@
     "csv-parser": "^2.3.1",
     "decimal.js": "^10.2.0",
     "line-i18n": "git+http://200.144.254.107/git/LInE/line-i18n.git",
-    "melanke-watchjs": "^1.5.0",
-    "server": "^1.0.19"
+    "melanke-watchjs": "^1.5.0"
   }
 }

+ 1 - 1
webpack.config.js

@@ -3,7 +3,7 @@ const HtmlWebpackPlugin = require("html-webpack-plugin");
 const UpdateVersionPlugin = require("./updateVersionPlugin");
 //const ChangeScriptSourcePlugin = require('./changeScriptSourcePlugin');
 const CopyPlugin = require("copy-webpack-plugin");
-const CleanWebpackPlugin = require("clean-webpack-plugin");
+const CleanWebpackPlugin = require("clean-webpack-plugin").CleanWebpackPlugin;
 
 module.exports = {
   entry: path.resolve(__dirname, "js/main.js"),