From 220b20476ff9e45420ae01a7800e46cfaa49a18e Mon Sep 17 00:00:00 2001 From: schmelczerandras Date: Thu, 8 Oct 2020 10:27:07 +0200 Subject: [PATCH] WIP ts --- .devcontainer/devcontainer.json | 2 +- backend/package.json | 2 +- backend/tsconfig.json | 8 ++++---- frontend/package.json | 2 +- frontend/tsconfig.json | 5 +++-- package.json | 2 +- shared/package.json | 2 +- shared/tsconfig.json | 6 +++--- shared/webpack.config.js | 8 +------- tsconfig.json | 7 +++---- 10 files changed, 19 insertions(+), 25 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 44e6c5d..27b8503 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -48,5 +48,5 @@ "source=decla-red-shared-node_modules-static,target=/workspace/shared/node_modules,type=volume" ], "forwardPorts": [3000, 8080], - "postCreateCommand": "chown node:node ./**/node_modules && sudo npm install && npm run initialize && npm run build" + "postCreateCommand": "chown node:node ./**/node_modules && npm install && npm run initialize && npm run build" } diff --git a/backend/package.json b/backend/package.json index dc4016b..43627a7 100644 --- a/backend/package.json +++ b/backend/package.json @@ -27,7 +27,7 @@ "raw-loader": "^4.0.1", "resolve-url-loader": "^3.1.1", "terser-webpack-plugin": "^2.3.5", - "typescript": "^3.9.7", + "typescript": "^4.0.3", "webpack": "^4.43.0", "webpack-cli": "^3.3.11", "webpack-dev-server": "^3.10.3" diff --git a/backend/tsconfig.json b/backend/tsconfig.json index 9b6f578..9a32d54 100644 --- a/backend/tsconfig.json +++ b/backend/tsconfig.json @@ -1,16 +1,16 @@ { "compilerOptions": { - "outDir": "lib", + "outDir": "dist", "sourceMap": true, + "target": "es5", "declaration": true, "declarationMap": true, - "target": "es2015", "esModuleInterop": true, "strict": true, "experimentalDecorators": true, "downlevelIteration": true, - "moduleResolution": "Node", - "module": "es6", + "moduleResolution": "node", + "module": "commonjs", "composite": true, "lib": ["dom", "es2017"] } diff --git a/frontend/package.json b/frontend/package.json index 4dfb715..4e10c8b 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -32,7 +32,7 @@ "sass-loader": "^9.0.2", "svg-url-loader": "^6.0.0", "terser-webpack-plugin": "^4.2.2", - "typescript": "^3.9.7", + "typescript": "^4.0.3", "webpack": "^4.43.0", "webpack-bundle-analyzer": "^3.9.0", "webpack-cli": "^3.3.11", diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index fa9d96f..a5d70a5 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -1,14 +1,15 @@ { "compilerOptions": { + "outDir": "dist", + "target": "es5", "sourceMap": true, "declaration": true, "declarationMap": true, - "target": "es6", "esModuleInterop": true, "strict": true, "experimentalDecorators": true, "downlevelIteration": true, - "moduleResolution": "Node", + "moduleResolution": "node", "module": "es6", "composite": true, "lib": ["dom", "es2017"] diff --git a/package.json b/package.json index d5544fe..d90168f 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "prettier": "^2.0.5", "sdf-2d": "^0.4.0", "socket.io-client": "^2.3.1", - "typescript": "^3.9.7", + "typescript": "^4.0.3", "uuid": "^8.2.0" } } diff --git a/shared/package.json b/shared/package.json index 547b1ff..e1c9aa2 100644 --- a/shared/package.json +++ b/shared/package.json @@ -17,7 +17,7 @@ "clean-webpack-plugin": "^3.0.0", "terser-webpack-plugin": "^2.3.8", "ts-loader": "^8.0.3", - "typescript": "^3.9.7", + "typescript": "^4.0.3", "webpack": "^4.43.0", "webpack-cli": "^3.3.11" } diff --git a/shared/tsconfig.json b/shared/tsconfig.json index 9b6f578..aa8b6c4 100644 --- a/shared/tsconfig.json +++ b/shared/tsconfig.json @@ -1,16 +1,16 @@ { "compilerOptions": { + "target": "es5", "outDir": "lib", "sourceMap": true, "declaration": true, "declarationMap": true, - "target": "es2015", "esModuleInterop": true, "strict": true, "experimentalDecorators": true, "downlevelIteration": true, - "moduleResolution": "Node", - "module": "es6", + "moduleResolution": "node", + "module": "commonjs", "composite": true, "lib": ["dom", "es2017"] } diff --git a/shared/webpack.config.js b/shared/webpack.config.js index 4101d1a..2eebc06 100644 --- a/shared/webpack.config.js +++ b/shared/webpack.config.js @@ -1,5 +1,4 @@ const path = require('path'); -const { CleanWebpackPlugin } = require('clean-webpack-plugin'); const PATHS = { entryPoint: path.resolve(__dirname, 'src/main.ts'), @@ -28,12 +27,7 @@ module.exports = (env, argv) => ({ optimization: { minimize: false, }, - plugins: [ - new CleanWebpackPlugin({ - protectWebpackAssets: false, - cleanAfterEveryBuildPatterns: [], - }), - ], + plugins: [], module: { rules: [ { diff --git a/tsconfig.json b/tsconfig.json index 0a9eb5b..f85c232 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -9,10 +9,9 @@ "strict": true, "experimentalDecorators": true, "downlevelIteration": true, - "moduleResolution": "Node", - "module": "es6", + "moduleResolution": "node", + "module": "commonjs", "composite": true, "lib": ["dom", "es2017"] - }, - "include": ["**/src/**/*", "package.json"] + } }