fix(promiselike): Revert typeRoots tsconfig change, move types to src…

…/types and add KLUDGE to expose them in the @spinnaker/core bundle
spinnaker · Oct 28, 2020 · a929d3f · a929d3f
1 parent 2c0d0f6
commit a929d3f
Show file tree

Hide file tree

Showing 21 changed files with 42 additions and 15 deletions.
diff --git a/app/scripts/app.ts b/app/scripts/app.ts
@@ -1,3 +1,4 @@
+///<reference path="./modules/core/src/types/index.d.ts" />
 import 'jquery'; // ensures jQuery is loaded before Angular so Angular does not use jqlite
 import { module } from 'angular';
 import './strictDi';

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

diff --git a/app/scripts/modules/appengine/tsconfig.json b/app/scripts/modules/appengine/tsconfig.json
@@ -6,7 +6,7 @@
     "declarationDir": "lib",
     "outDir": "lib",
     "rootDir": "./src",
-    "typeRoots": ["../../../../node_modules/@types", "../../../types"],
+    "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["../../core/lib"],
       "core/*": ["../../core/lib/*"],

diff --git a/app/scripts/modules/azure/tsconfig.json b/app/scripts/modules/azure/tsconfig.json
@@ -6,7 +6,7 @@
     "declarationDir": "lib",
     "outDir": "lib",
     "rootDir": "./src",
-    "typeRoots": ["../../../../node_modules/@types", "../../../types"],
+    "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["../../core/lib"],
       "core/*": ["../../core/lib/*"]

diff --git a/app/scripts/modules/cloudfoundry/tsconfig.json b/app/scripts/modules/cloudfoundry/tsconfig.json
@@ -6,7 +6,7 @@
     "declarationDir": "lib",
     "outDir": "lib",
     "rootDir": "./src",
-    "typeRoots": ["../../../../node_modules/@types", "../../../types"],
+    "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["../../core/lib"],
       "core/*": ["../../core/lib/*"],

diff --git a/app/scripts/modules/core/src/index.ts b/app/scripts/modules/core/src/index.ts
@@ -1,3 +1,5 @@
+/// <reference path="./types/index.d.ts" />
+
 import './utils/failedToInstantiateModule';
 
 export * from './account';

diff --git a/app/types/spinnaker/index.d.ts → ...scripts/modules/core/src/types/index.d.ts b/app/types/spinnaker/index.d.ts → ...scripts/modules/core/src/types/index.d.ts
diff --git a/app/types/spinnaker/promise.d.ts → ...ripts/modules/core/src/types/promise.d.ts b/app/types/spinnaker/promise.d.ts → ...ripts/modules/core/src/types/promise.d.ts
diff --git a/app/types/spinnaker/svg.d.ts → app/scripts/modules/core/src/types/svg.d.ts b/app/types/spinnaker/svg.d.ts → app/scripts/modules/core/src/types/svg.d.ts
diff --git a/app/scripts/modules/core/tsconfig.json b/app/scripts/modules/core/tsconfig.json
@@ -6,7 +6,7 @@
     "declarationDir": "lib",
     "outDir": "lib",
     "rootDir": "./src",
-    "typeRoots": ["../../../../node_modules/@types", "../../../types"],
+    "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["."],
       "core/*": ["*"],

diff --git a/app/scripts/modules/core/webpack.config.js b/app/scripts/modules/core/webpack.config.js
@@ -1,17 +1,38 @@
 'use strict';
 
 const path = require('path');
+const fs = require('fs');
+const corePath = __dirname;
 const basePath = path.join(__dirname, '..', '..', '..', '..');
 const NODE_MODULE_PATH = path.join(basePath, 'node_modules');
 const nodeExternals = require('webpack-node-externals');
 const TerserPlugin = require('terser-webpack-plugin');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
 const exclusionPattern = /(node_modules|\.\.\/deck)/;
 const WEBPACK_THREADS = Math.max(require('physical-cpu-count') - 1, 1);
 
 const WATCH = process.env.WATCH === 'true';
 const WEBPACK_MODE = WATCH ? 'development' : 'production';
 const IS_PRODUCTION = WEBPACK_MODE === 'production';
 
+// In index.ts, the triple slash reference to global namespace types get re-written to match the 'core' alias
+// This kludge re-re-writes them back to a relative path
+// Likely related to https://github.com/microsoft/TypeScript/issues/36763
+class KLUDGE_FixTypesReferencePlugin {
+  apply(compiler) {
+    compiler.hooks.afterEmit.tap('KLUDGE_FixTypesReferencePlugin', (file, rest) => {
+      // eslint-disable-next-line no-console
+      console.log('Fixing up core/index.d.ts...');
+      const dts = path.join(corePath, 'lib', 'index.d.ts');
+      const fixedup = fs
+        .readFileSync(dts)
+        .toString()
+        .replace(/types="core\/types"/, 'types="./types"');
+      fs.writeFileSync(dts, fixedup);
+    });
+  }
+}
+
 module.exports = {
   context: basePath,
   mode: WEBPACK_MODE,
@@ -118,5 +139,9 @@ module.exports = {
       },
     ],
   },
+  plugins: [
+    new CopyWebpackPlugin([{ from: `${corePath}/src/types`, to: `types` }]),
+    new KLUDGE_FixTypesReferencePlugin(),
+  ],
   externals: ['root/version.json', nodeExternals({ modulesDir: '../../../../node_modules' })],
 };
diff --git a/app/scripts/modules/docker/tsconfig.json b/app/scripts/modules/docker/tsconfig.json
@@ -6,7 +6,7 @@
     "declarationDir": "lib",
     "outDir": "lib",
     "rootDir": "./src",
-    "typeRoots": ["../../../../node_modules/@types", "../../../types"],
+    "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["../../core/lib"],
       "core/*": ["core/src/*"]

diff --git a/app/scripts/modules/ecs/tsconfig.json b/app/scripts/modules/ecs/tsconfig.json
@@ -6,7 +6,7 @@
     "declarationDir": "lib",
     "outDir": "lib",
     "rootDir": "./src",
-    "typeRoots": ["../../../../node_modules/@types", "../../../types"],
+    "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["../../core/lib"],
       "core/*": ["../../core/lib/*"],

diff --git a/app/scripts/modules/google/tsconfig.json b/app/scripts/modules/google/tsconfig.json
@@ -6,7 +6,7 @@
     "declarationDir": "lib",
     "outDir": "lib",
     "rootDir": "./src",
-    "typeRoots": ["../../../../node_modules/@types", "../../../types"],
+    "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["../../core/lib"],
       "core/*": ["../../core/lib/*"],

diff --git a/app/scripts/modules/huaweicloud/tsconfig.json b/app/scripts/modules/huaweicloud/tsconfig.json
@@ -6,7 +6,7 @@
     "declarationDir": "lib",
     "outDir": "lib",
     "rootDir": "./src",
-    "typeRoots": ["../../../../node_modules/@types", "../../../types"],
+    "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["../../core/lib"],
       "core/*": ["../../core/lib/*"]

diff --git a/app/scripts/modules/kubernetes/tsconfig.json b/app/scripts/modules/kubernetes/tsconfig.json
@@ -6,7 +6,7 @@
     "declarationDir": "lib",
     "outDir": "lib",
     "rootDir": "./src",
-    "typeRoots": ["../../../../node_modules/@types", "../../../types"],
+    "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["../../core/lib"],
       "core/*": ["../../core/lib/*"],

diff --git a/app/scripts/modules/oracle/tsconfig.json b/app/scripts/modules/oracle/tsconfig.json
@@ -6,7 +6,7 @@
     "declarationDir": "lib",
     "outDir": "lib",
     "rootDir": "./src",
-    "typeRoots": ["../../../../node_modules/@types", "../../../types"],
+    "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["../../core/lib"],
       "core/*": ["../../core/lib/*"],

diff --git a/app/scripts/modules/tencentcloud/tsconfig.json b/app/scripts/modules/tencentcloud/tsconfig.json
@@ -6,7 +6,7 @@
     "declarationDir": "lib",
     "outDir": "lib",
     "rootDir": "./src",
-    "typeRoots": ["../../../../node_modules/@types", "../../../types"],
+    "typeRoots": ["../../../../node_modules/@types"],
     "paths": {
       "@spinnaker/core": ["../../core/lib"],
       "core/*": ["../../core/lib/*"],

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

diff --git a/app/types/README.md b/app/types/README.md
diff --git a/tsconfig.json b/tsconfig.json
@@ -60,7 +60,7 @@
     "sourceMap": true,
     "strictNullChecks": false, // should really get to a place where we can turn this on
     "target": "es6",
-    "typeRoots": ["node_modules/@types", "app/types"]
+    "typeRoots": ["node_modules/@types"]
   },
   "exclude": ["build", "node", "node_modules", "transpiled"],
   "include": ["test/helpers/custom-matchers.d.ts", "app/scripts/modules/**/*.ts", "app/scripts/modules/**/*.tsx"]