chore(*): Add core alias to module tsconfigs

christopherthielen · Dec 6, 2018 · 6b8188b · 6b8188b
1 parent 29ec0b0
commit 6b8188b
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 76 deletions.
diff --git a/app/scripts/modules/amazon/tsconfig.json b/app/scripts/modules/amazon/tsconfig.json
@@ -9,10 +9,7 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "jsx": "react",
-    "lib": [
-      "es2016",
-      "dom"
-    ],
+    "lib": ["es2016", "dom"],
     "moduleResolution": "node",
     "module": "commonjs",
     "noEmitHelpers": false,
@@ -30,21 +27,14 @@
     "inlineSources": true,
     "strictNullChecks": false, // should really get to a place where we can turn this on
     "target": "es6",
-    "typeRoots": [
-      "../../../../node_modules/@types"
-    ],
+    "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["../../core/lib"],
+      "core/*": ["../../core/lib/*"],
       "amazon/*": ["*"],
       "amazon": ["."]
     }
   },
-  "include": [
-    "src/**/*.ts",
-    "src/**/*.tsx"
-  ],
-  "exclude": [
-    "./lib",
-    "**/*.spec.*"
-  ]
+  "include": ["src/**/*.ts", "src/**/*.tsx"],
+  "exclude": ["./lib", "**/*.spec.*"]
 }
diff --git a/app/scripts/modules/appengine/tsconfig.json b/app/scripts/modules/appengine/tsconfig.json
@@ -9,10 +9,7 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "jsx": "react",
-    "lib": [
-      "es2016",
-      "dom"
-    ],
+    "lib": ["es2016", "dom"],
     "moduleResolution": "node",
     "module": "commonjs",
     "noEmitHelpers": false,
@@ -30,21 +27,14 @@
     "inlineSources": true,
     "strictNullChecks": false, // should really get to a place where we can turn this on
     "target": "es6",
-    "typeRoots": [
-      "../../../../node_modules/@types"
-    ],
+    "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["../../core/lib"],
+      "core/*": ["../../core/lib/*"],
       "appengine/*": ["*"],
       "appengine": ["."]
     }
   },
-  "include": [
-    "src/**/*.ts",
-    "src/**/*.tsx"
-  ],
-  "exclude": [
-    "./lib",
-    "**/*.spec.*"
-  ]
+  "include": ["src/**/*.ts", "src/**/*.tsx"],
+  "exclude": ["./lib", "**/*.spec.*"]
 }
diff --git a/app/scripts/modules/cloudfoundry/tsconfig.json b/app/scripts/modules/cloudfoundry/tsconfig.json
@@ -30,6 +30,7 @@
     "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["../../core/lib"],
+      "core/*": ["../../core/lib/*"],
       "cloudfoundry/*": ["*"],
       "cloudfoundry": ["."]
     }

diff --git a/app/scripts/modules/docker/tsconfig.json b/app/scripts/modules/docker/tsconfig.json
@@ -9,10 +9,7 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "jsx": "react",
-    "lib": [
-      "es2016",
-      "dom"
-    ],
+    "lib": ["es2016", "dom"],
     "moduleResolution": "node",
     "module": "commonjs",
     "noEmitHelpers": false,
@@ -30,18 +27,12 @@
     "inlineSources": true,
     "strictNullChecks": false, // should really get to a place where we can turn this on
     "target": "es6",
-    "typeRoots": [
-      "../../../../node_modules/@types"
-    ],
+    "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
-      "@spinnaker/core": ["../../core/lib"]
+      "@spinnaker/core": ["../../core/lib"],
+      "core/*": ["core/src/*"]
     }
   },
-  "files": [
-    "src/index.ts"
-  ],
-  "exclude": [
-    "./lib",
-    "**/*.spec.*"
-  ]
+  "files": ["src/index.ts"],
+  "exclude": ["./lib", "**/*.spec.*"]
 }
diff --git a/app/scripts/modules/ecs/tsconfig.json b/app/scripts/modules/ecs/tsconfig.json
@@ -30,6 +30,7 @@
     "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["../../core/lib"],
+      "core/*": ["../../core/lib/*"],
       "@spinnaker/amazon": ["../../amazon/lib"],
       "ecs/*": ["*"],
       "ecs": ["."]

diff --git a/app/scripts/modules/google/tsconfig.json b/app/scripts/modules/google/tsconfig.json
@@ -9,10 +9,7 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "jsx": "react",
-    "lib": [
-      "es2016",
-      "dom"
-    ],
+    "lib": ["es2016", "dom"],
     "moduleResolution": "node",
     "module": "commonjs",
     "noEmitHelpers": false,
@@ -30,21 +27,14 @@
     "inlineSources": true,
     "strictNullChecks": false,
     "target": "es6",
-    "typeRoots": [
-      "../../../../node_modules/@types"
-    ],
+    "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["../../core/lib"],
+      "core/*": ["../../core/lib/*"],
       "google/*": ["*"],
       "google": ["."]
     }
   },
-  "include": [
-    "src/**/*.ts",
-    "src/**/*.tsx"
-  ],
-  "exclude": [
-    "./lib",
-    "**/*.spec.*"
-  ]
+  "include": ["src/**/*.ts", "src/**/*.tsx"],
+  "exclude": ["./lib", "**/*.spec.*"]
 }
diff --git a/app/scripts/modules/kubernetes/tsconfig.json b/app/scripts/modules/kubernetes/tsconfig.json
@@ -30,6 +30,7 @@
     "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["../../core/lib"],
+      "core/*": ["../../core/lib/*"],
       "kubernetes/*": ["*"],
       "kubernetes": ["."]
     }

diff --git a/app/scripts/modules/openstack/tsconfig.json b/app/scripts/modules/openstack/tsconfig.json
@@ -9,10 +9,7 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "jsx": "react",
-    "lib": [
-      "es2016",
-      "dom"
-    ],
+    "lib": ["es2016", "dom"],
     "moduleResolution": "node",
     "module": "commonjs",
     "noEmitHelpers": false,
@@ -30,19 +27,12 @@
     "inlineSources": true,
     "strictNullChecks": false, // should really get to a place where we can turn this on
     "target": "es6",
-    "typeRoots": [
-      "../../../../node_modules/@types"
-    ],
+    "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
-      "@spinnaker/core": ["../../core/lib"]
+      "@spinnaker/core": ["../../core/lib"],
+      "core/*": ["core/src/*"]
     }
   },
-  "include": [
-    "src/**/*.ts",
-    "src/**/*.tsx"
-  ],
-  "exclude": [
-    "./lib",
-    "**/*.spec.*"
-  ]
+  "include": ["src/**/*.ts", "src/**/*.tsx"],
+  "exclude": ["./lib", "**/*.spec.*"]
 }
diff --git a/app/scripts/modules/oracle/tsconfig.json b/app/scripts/modules/oracle/tsconfig.json
@@ -30,6 +30,7 @@
     "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["../../core/lib"],
+      "core/*": ["../../core/lib/*"],
       "oracle/*": ["*"],
       "oracle": ["."]
     }

diff --git a/app/scripts/modules/titus/tsconfig.json b/app/scripts/modules/titus/tsconfig.json
@@ -30,6 +30,7 @@
     "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["../../core/lib"],
+      "core/*": ["../../core/lib/*"],
       "@spinnaker/docker": ["../../docker/lib"],
       "@spinnaker/amazon": ["../../amazon/lib"],
       "titus/*": ["*"],