Merge pull request #296 from KaiVolland/browser-build

Updates ts-loader and fixes browserbuild
geostyler · Apr 1, 2021 · 37fe4f1 · 37fe4f1
2 parents e6dfaec + 20f79c7
commit 37fe4f1
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 15 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -6,4 +6,4 @@ dist
 coverage
 
 .eslintrc.js
-jest.config.js
+*.config.js
diff --git a/browser-build.config.js b/browser-build.config.js
@@ -23,11 +23,17 @@ module.exports = {
       // All files with a '.ts'
       {
         test: /\.ts$/,
-        include: __dirname + '/src',
+        include: [
+          __dirname + '/src',
+          __dirname + '/node_modules/geostyler-style'
+        ],
         use: [
           {
             loader: require.resolve('ts-loader'),
-          },
+            options: {
+              allowTsInNodeModules: true
+            }
+          }
         ],
       }
     ]

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -62,7 +62,7 @@
     "eslint": "^7.6.0",
     "jest": "^26.3.0",
     "np": "^6.4.0",
-    "ts-loader": "^7.0.5",
+    "ts-loader": "^8.1.0",
     "typescript": "^3.9.7",
     "webpack": "^4.44.1",
     "webpack-cli": "^3.3.12"

diff --git a/tsconfig.json b/tsconfig.json
@@ -9,7 +9,7 @@
     "lib": ["es6", "dom"],
     "sourceMap": true,
     "moduleResolution": "node",
-    "rootDir": "src",
+    "rootDir": ".",
     "forceConsistentCasingInFileNames": true,
     "noImplicitReturns": true,
     "noImplicitThis": true,