From 89d53d16d93d8824c0f186fdc68601d2e7b5f657 Mon Sep 17 00:00:00 2001 From: galenp Date: Wed, 18 Jul 2018 10:04:33 +0800 Subject: [PATCH 1/4] chore: add Rider/VSCode to .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 10edda1..5526f30 100644 --- a/.gitignore +++ b/.gitignore @@ -213,3 +213,5 @@ src/Web/*.awcache src/Web/node_modules src/Web/dist *.ncrunchsolution +.vscode +.idea From bd6ef34a9bd83c79861f9716cd2952cee6e971fc Mon Sep 17 00:00:00 2001 From: galenp Date: Wed, 18 Jul 2018 10:05:11 +0800 Subject: [PATCH 2/4] fix: add npm package to Dockerfile --- src/Web/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Web/Dockerfile b/src/Web/Dockerfile index 2013e90..f051d37 100644 --- a/src/Web/Dockerfile +++ b/src/Web/Dockerfile @@ -1,6 +1,6 @@ FROM alpine as build -RUN apk add --update --no-cache nodejs git +RUN apk add --update --no-cache nodejs git npm RUN npm i -g yarn webpack-cli webpack cross-env WORKDIR /src From 43ae2fff54c00aa86eaccdbebd463cbe464c3391 Mon Sep 17 00:00:00 2001 From: galenp Date: Wed, 18 Jul 2018 10:08:57 +0800 Subject: [PATCH 3/4] fix(web/tsconfig): babelOptions requires object --- src/Web/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Web/tsconfig.json b/src/Web/tsconfig.json index dcb33ab..ca8b464 100644 --- a/src/Web/tsconfig.json +++ b/src/Web/tsconfig.json @@ -43,7 +43,7 @@ [ "@babel/preset-env", { - "targets": "last 2 versions, ie 11", + "targets": {"browsers": "last 2 versions, ie 11"}, "modules": false } ] From fe52d94c365901d5a22114d2e0c7ee99766d7b76 Mon Sep 17 00:00:00 2001 From: galenp Date: Wed, 18 Jul 2018 10:10:10 +0800 Subject: [PATCH 4/4] fix(web): exclude node_modules for source-maps. Build errors without this restriction --- src/Web/webpack.config.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Web/webpack.config.js b/src/Web/webpack.config.js index 00258bb..48eb74d 100644 --- a/src/Web/webpack.config.js +++ b/src/Web/webpack.config.js @@ -87,7 +87,11 @@ module.exports = ({ { enforce: "pre", test: /\.js$/, - use: "source-map-loader" + use: "source-map-loader", + "exclude": [ + // instead of /\/node_modules\// + path.join(process.cwd(), 'node_modules') + ] }, { test: /\.tsx?$/,