fix file path issues

steveblue · Apr 5, 2019 · 06d71d9 · 06d71d9
1 parent 07b8fbc
commit 06d71d9
Show file tree

Hide file tree

Showing 14 changed files with 491 additions and 7,004 deletions.
diff --git a/angular.json b/angular.json
@@ -14,14 +14,14 @@
           "builder": "./build_tools/dist:closure",
           "options": {
             "closureConfig": "closure.conf",
-            "tsConfig": "src/tsconfig.app.json"
+            "tsConfig": "tsconfig.app.json"
           }
         },
         "rollup": {
           "builder": "./build_tools/dist:rollup",
           "options": {
             "rollupConfig": "rollup.config.js",
-            "tsConfig": "src/tsconfig.app.json"
+            "tsConfig": "tsconfig.app.json"
           }
         },
         "build": {
@@ -31,7 +31,7 @@
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "tsconfig.app.json",
             "assets": [
               "src/favicon.ico",
               "src/assets"
@@ -90,7 +90,7 @@
           "options": {
             "main": "src/test.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
+            "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "src/karma.conf.js",
             "styles": [
               "src/styles.css"
@@ -106,8 +106,8 @@
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
+              "tsconfig.app.json",
+              "tsconfig.spec.json"
             ],
             "exclude": [
               "**/node_modules/**"

diff --git a/build_tools/src/util.ts b/build_tools/src/util.ts
@@ -23,8 +23,8 @@ export function handleEnvironment(
 
     // TODO: handle different environments
     return of(exec('cp '+
-                normalize('out-tsc/app/src/environments/environment.prod.js') + ' ' +
-                normalize('out-tsc/app/src/environments/environment.js')
+                normalize('out-tsc/src/environments/environment.prod.js') + ' ' +
+                normalize('out-tsc/src/environments/environment.js')
              ));
 }
 
@@ -58,7 +58,7 @@ export function compileMain(
     return new Observable((observer) => {
 
         const inFile = normalize(context.workspaceRoot+'/src/main.ts');
-        const outFile = normalize('out-tsc/app/src/main.js');
+        const outFile = normalize('out-tsc/src/main.js');
         const tsConfig = JSON.parse(readFileSync(join(context.workspaceRoot, options.tsConfig), 'utf8'));
 
         readFile(inFile, 'utf8', (err, contents) => {

diff --git a/closure.conf b/closure.conf
@@ -53,4 +53,4 @@
 --package_json_entry_names jsnext:main,es2015
 --process_common_js_modules
 
---entry_point=./out-tsc/app/src/main.js
+--entry_point=./out-tsc/src/main.js