Fix prod builder

package.json

@@ -13,8 +13,8 @@
     "sw-generate": "workbox generateSW workbox-config.js",
     "sw-uglify": "uglifyjs build/sw.js -o build/sw.min.js",
     "sw": "npm run sw-generate && npm run sw-uglify",
-    "ts": "tsc --rootDir src/ts --outDir src/scripts --pretty",
+    "ts": "tsc",
-    "ts-tools": "tsc --rootDir src/ts --outDir src/scripts --pretty -p tsconfig.tools.json",
+    "ts-tools": "tsc -p tsconfig.tools.json",
     "ts-watch": "npm run ts -- --watch",
     "ts-cov": "npm run ts -- --target es5",
     "ts-cov-watch": "npm run ts -- --target es5 --watch",

src/ts/components/services/rollbarErrorHandler.ts

@@ -42,12 +42,11 @@ export function rollbarFactory() {
 }
 
 @Injectable()
-export class RollbarErrorHandler extends ErrorHandler {
+export class RollbarErrorHandler implements ErrorHandler {
-	constructor(private injector: Injector) {
+	private errorHandler = new ErrorHandler();
-		super();
+	constructor(private injector: Injector) {}
-	}
 	handleError(error: any) {
-		super.handleError(error);
+		this.errorHandler.handleError(error);
 
 		if (!DEVELOPMENT && rollbarConfig.accessToken) {
 			const rollbar = this.injector.get(RollbarService);

tsconfig-aot-admin.json

@@ -0,0 +1,20 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"target": "es5",
+		"module": "es2015",
+		"baseUrl": ".",
+		"preserveConstEnums": false,
+    	"paths": {
+			"lodash": ["src/ts/lodash.ts"]
+    	}
+	},
+	"files": [
+		"src/ts/bootstrap-admin.ts"
+	],
+	"angularCompilerOptions": {
+		"genDir": "src/ts",
+		"skipMetadataEmit": true,
+		"preserveWhitespaces": true
+	}
+}

tsconfig-aot-tools.json

@@ -0,0 +1,20 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"target": "es5",
+		"module": "es2015",
+		"baseUrl": ".",
+		"preserveConstEnums": false,
+    	"paths": {
+			"lodash": ["src/ts/lodash.ts"]
+    	}
+	},
+	"files": [
+		"src/ts/bootstrap-tools.ts"
+	],
+	"angularCompilerOptions": {
+		"genDir": "src/ts",
+		"skipMetadataEmit": true,
+		"preserveWhitespaces": true
+	}
+}

tsconfig-aot.json

@@ -9,15 +9,8 @@
 			"lodash": ["src/ts/lodash.ts"]
     	}
 	},
-	"exclude": [
+	"files": [
-		"build",
+		"src/ts/bootstrap.ts"
-		"tools",
-		"src/scripts",
-		"src/ts/server",
-		"src/ts/tests",
-		"src/ts/tools",
-		"src/ts/experiments",
-		"node_modules"
 	],
 	"angularCompilerOptions": {
 		"genDir": "src/ts",

tsconfig.json

@@ -1,10 +1,13 @@
 {
 	"compilerOptions": {
-		"target": "es2017",
+		"target": "ES2020",
 		"lib": [
 			"dom",
-			"es6"
+			"ES2020"
 		],
+		"rootDir": "src/ts",
+        "outDir": "src/scripts",
+		"pretty": true,
 		"module": "commonjs",
 		"moduleResolution": "node",
 		"importHelpers": true,
@@ -18,8 +21,8 @@
 		"strict": true,
 		"strictFunctionTypes": true,
 		"sourceMap": true,
-		"skipLibCheck": true,
+		"preserveConstEnums": true,
-		"preserveConstEnums": true
+    	"skipLibCheck": true
 	},
 	"exclude": [
 		"build",

webpack.prod.js

@@ -62,7 +62,7 @@ module.exports = (args = {}) =>
 			},
 			output: Object.assign({}, common.output, {
 				filename: '[name]-[chunkhash:10].js',
-				path: path.resolve(__dirname, 'dist', 'browser' , outDir, 'scripts'),
+				path: path.resolve(__dirname, 'build', outDir, 'scripts'),
 			}),
 			devtool: script === 'bootstrap' ? 'source-map' : false,
 			module: {