Merge pull request #9 from framefactory/master

Fix in production build script
Smithsonian · Feb 11, 2020 · dec4258 · dec4258
2 parents 33e5a20 + e41e63d
commit dec4258
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 95 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -68,7 +68,6 @@
         "@types/chai": "^4.2.7",
         "@types/mocha": "^5.2.7",
         "@types/node": "^12.12.17",
-        "awesome-typescript-loader": "^5.2.1",
         "chai": "^4.2.0",
         "concurrently": "^5.0.1",
         "css-loader": "^3.3.2",
@@ -85,6 +84,7 @@
         "sass-loader": "^8.0.0",
         "source-map-loader": "^0.2.4",
         "terser-webpack-plugin": "^2.3.0",
+        "ts-loader": "^6.2.1",
         "typedoc": "^0.15.5",
         "typescript": "^3.7.3",
         "typescript-json-schema": "^0.41.0",

diff --git a/source/client/components/CVAnalytics.ts b/source/client/components/CVAnalytics.ts
@@ -38,7 +38,7 @@ export default class CVAnalytics extends Component
     sendProperty(property: string, value?: any)
     {
         // track custom event
-        if (ENV_PRODUCTION && ga) {
+        if (typeof ga === "function" && ENV_PRODUCTION) {
             const text = value !== undefined ? value.toString() : undefined;
             ga("send", "event", this._title, property, text);
         }

diff --git a/source/client/webpack.config.js b/source/client/webpack.config.js
@@ -200,7 +200,8 @@ function createAppConfig(app, isDevMode, isOffline)
                 {
                     // Typescript/JSX files
                     test: /\.tsx?$/,
-                    loader: "awesome-typescript-loader"
+                    use: "ts-loader",
+		    exclude: /node_modules/,
                 },
                 {
                     // Enforce source maps for all javascript files