!1380 开发:yarn

.gitignore

@@ -61,7 +61,16 @@ typings/
 #custom
 /dist*
 /package-lock.json
+.yarn
 yarn.lock
 
 #导出的WebCADApi
 api
+
+#yarnv2
+.yarn/*
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+.pnp.*

.yarnrc.yml

@@ -0,0 +1 @@
+yarnPath: ".yarn/releases/yarn-berry.cjs"

config/web-cad-view.config.ts

@@ -1,7 +1,6 @@
 var path = require('path');
 var HtmlWebPackPlugin = require("html-webpack-plugin");
 var AddAssetHtmlPlugin = require("add-asset-html-webpack-plugin");
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
 const webpack = require('webpack');
 module.exports = {
     entry: "./src/webview.ts",

package.json

@@ -25,8 +25,8 @@
     "devDependencies": {
         "@rollup/plugin-typescript": "^6.0.0",
         "@types/html-webpack-plugin": "^3.2.3",
-        "@types/jest": "^26.0.18",
+        "@types/jest": "^26.0.19",
-        "@types/node": "^14.14.11",
+        "@types/node": "^14.14.17",
         "@types/pako": "^1.0.1",
         "@types/react": "^16.9.49",
         "@types/react-color": "^3.0.4",
@@ -45,9 +45,8 @@
         "clean-terminal-webpack-plugin": "^3.0.0",
         "clean-webpack-plugin": "^3.0.0",
         "css-loader": "^5.0.1",
-        "extract-text-webpack-plugin": "^3.0.2",
         "file-loader": "^6.1.0",
-        "fork-ts-checker-webpack-plugin": "^6.0.5",
+        "fork-ts-checker-webpack-plugin": "^6.0.8",
         "git-revision-webpack-plugin": "^3.0.6",
         "gitlog": "^4.0.0",
         "html-loader": "^1.3.0",
@@ -56,7 +55,6 @@
         "jest-snapshot": "^26.4.2",
         "less": "^3.12.2",
         "less-loader": "^7.1.0",
-        "mobx-react-devtools": "^6.1.1",
         "react-hot-loader": "^4.12.21",
         "request": "^2.88.2",
         "request-promise-native": "^1.0.9",
@@ -73,11 +71,11 @@
         "terser-webpack-plugin": "^4.1.0",
         "ts-declaration-webpack-plugin": "^1.2.3",
         "ts-jest": "^26.3.0",
-        "ts-loader": "^8.0.11",
+        "ts-loader": "^8.0.13",
         "ts-node": "^9.1.1",
         "tsconfig-paths": "^3.9.0",
         "tslib": "^2.0.1",
-        "typescript": "^4.0.3",
+        "typescript": "^4.1.3",
         "url-loader": "^4.1.0",
         "wallaby-webpack": "^3.9.15",
         "webpack": "^4.44.2",
@@ -85,7 +83,7 @@
         "webpack-dev-server": "^3.11.0",
         "webpack-merge": "^5.4.1",
         "webpackbar": "^4.0.0",
-        "worker-loader": "^3.0.6"
+        "worker-loader": "^3.0.7"
     },
     "dependencies": {
         "@blueprintjs/core": "^3.31.0",
@@ -100,11 +98,11 @@
         "monotone-convex-hull-2d": "^1.0.1",
         "p-queue": "^6.6.1",
         "pako": "^1.0.11",
-        "react": "^17.0.1",
+        "react": "^16.14.0",
         "react-color": "^2.18.1",
-        "react-dom": "^17.0.1",
+        "react-dom": "^16.14.0",
         "react-rnd": "^10.2.2",
-        "react-virtualized-auto-sizer": "^1.0.2",
+        "react-virtualized-auto-sizer": "^1.0.3",
         "react-window": "^1.8.5",
         "stats.js": "^0.17.0",
         "three": "^0.122.0",