build: add tsconfig-build.json

alan-agius4 · filipesilva · commit 8ea82e593cdc · 2021-07-30T12:43:18.000+01:00
This TypeScript configuration file is used to build the monorepo. This will only include actual sourcefiles ie. non test files.
diff --git a/packages/angular_devkit/build_angular/src/test-utils.ts b/packages/angular_devkit/build_angular/src/test-utils.ts
diff --git a/scripts/build.ts b/scripts/build.ts
@@ -173,7 +173,7 @@ function _exec(command: string, args: string[], opts: { cwd?: string }, logger:
 
 function _build(logger: logging.Logger) {
   logger.info('Building...');
-  _exec('node', [require.resolve('typescript/bin/tsc'), '-p', 'tsconfig.json'], {}, logger);
+  _exec('node', [require.resolve('typescript/bin/tsc'), '-p', 'tsconfig-build.json'], {}, logger);
 }
 
 export default async function (
@@ -214,70 +214,74 @@ export default async function (
     resourceLogger.info(packageName);
     const pkg = packages[packageName];
     const pkgJson = pkg.packageJson;
-    const files = glob.sync(path.join(pkg.root, '**/*'), { dot: true, nodir: true });
+    const files = glob.sync('**/*', {
+      cwd: pkg.root,
+      dot: true,
+      nodir: true,
+      ignore: ['test/**/*', '**/tests/*', 'src/testing/*'],
+    });
     const subSubLogger = resourceLogger.createChild(packageName);
     subSubLogger.info(`${files.length} files total...`);
-    const resources = files
-      .map((fileName) => path.relative(pkg.root, fileName))
-      .filter((fileName) => {
-        if (/(?:^|[\/\\])node_modules[\/\\]/.test(fileName)) {
-          return false;
-        }
+    const resources = files.filter((fileName) => {
+      if (/(?:^|[\/\\])node_modules[\/\\]/.test(fileName)) {
+        return false;
+      }
 
-        // Schematics template files.
-        if (
-          pkgJson['schematics'] &&
-          (fileName.match(/(\/|\\)files(\/|\\)/) || fileName.match(/(\/|\\)\w+-files(\/|\\)/))
-        ) {
-          return true;
-        }
+      // Schematics template files.
+      if (
+        pkgJson['schematics'] &&
+        (fileName.match(/(\/|\\)files(\/|\\)/) || fileName.match(/(\/|\\)\w+-files(\/|\\)/))
+      ) {
+        return true;
+      }
 
-        if (fileName.endsWith('package.json')) {
-          return true;
-        }
+      // Skip test files
+      if (fileName.endsWith('_spec.ts')) {
+        return false;
+      }
 
-        // Ignore in package test files.
-        if (fileName.startsWith('test/') || fileName.startsWith('test\\')) {
-          return false;
-        }
-        if (pkg.name === '@angular-devkit/core' && fileName.startsWith('src/workspace/json/test')) {
-          return false;
-        }
+      if (fileName.endsWith('package.json')) {
+        return true;
+      }
 
-        // This schema is built and copied later on as schema.json.
-        if (pkg.name === '@angular/cli' && fileName.endsWith('workspace-schema.json')) {
-          return false;
-        }
+      if (pkg.name === '@angular-devkit/core' && fileName.startsWith('src/workspace/json/test')) {
+        return false;
+      }
 
-        // Remove Bazel files from NPM.
-        if (fileName === 'BUILD' || fileName === 'BUILD.bazel') {
-          return false;
-        }
+      // This schema is built and copied later on as schema.json.
+      if (pkg.name === '@angular/cli' && fileName.endsWith('workspace-schema.json')) {
+        return false;
+      }
 
-        // Skip sources.
-        if (fileName.endsWith('.ts') && !fileName.endsWith('.d.ts')) {
-          // Verify that it was actually built.
-          if (!fs.existsSync(path.join(pkg.dist, fileName).replace(/ts$/, 'js'))) {
-            subSubLogger.error(`\nSource found but compiled file not found: "${fileName}".`);
-            process.exit(2);
-          }
+      // Remove Bazel files from NPM.
+      if (fileName === 'BUILD' || fileName === 'BUILD.bazel') {
+        return false;
+      }
 
-          // Skip all sources.
-          return false;
+      // Skip sources.
+      if (fileName.endsWith('.ts') && !fileName.endsWith('.d.ts')) {
+        // Verify that it was actually built.
+        if (!fs.existsSync(path.join(pkg.dist, fileName).replace(/ts$/, 'js'))) {
+          subSubLogger.error(`\nSource found but compiled file not found: "${fileName}".`);
+          process.exit(2);
         }
 
-        // Skip tsconfig only.
-        if (fileName.endsWith('tsconfig.json')) {
-          return false;
-        }
+        // Skip all sources.
+        return false;
+      }
 
-        // Skip files from gitignore.
-        if (_gitIgnoreMatch(fileName)) {
-          return false;
-        }
+      // Skip tsconfig only.
+      if (fileName.endsWith('tsconfig.json')) {
+        return false;
+      }
 
-        return true;
-      });
+      // Skip files from gitignore.
+      if (_gitIgnoreMatch(fileName)) {
+        return false;
+      }
+
+      return true;
+    });
 
     subSubLogger.info(`${resources.length} resources...`);
     resources.forEach((fileName) => {
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
@@ -2,6 +2,7 @@
 
 load("@npm//@bazel/typescript:index.bzl", _ts_library = "ts_library")
 
+_DEFAULT_TSCONFIG = "//:tsconfig-build.json"
 _DEFAULT_TSCONFIG_TEST = "//:tsconfig-test.json"
 
 def ts_library(
@@ -17,8 +18,11 @@ def ts_library(
         # Match the types[] in //packages:tsconfig-test.json
         deps.append("@npm//@types/jasmine")
         deps.append("@npm//@types/node")
-    if not tsconfig and testonly:
-        tsconfig = _DEFAULT_TSCONFIG_TEST
+    if not tsconfig:
+        if testonly:
+            tsconfig = _DEFAULT_TSCONFIG_TEST
+        else:
+            tsconfig = _DEFAULT_TSCONFIG
 
     if not devmode_module:
         devmode_module = "commonjs"
diff --git a/tsconfig-build.json b/tsconfig-build.json
@@ -0,0 +1,25 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "types": ["node"]
+  },
+  "exclude": [
+    "packages/angular_devkit/build_angular/src/bazel-babel.d.ts",
+    "bazel-out/**/*",
+    "dist/**/*",
+    "dist-schema/**",
+    "goldens/**/*",
+    "**/node_modules/**/*",
+    "**/third_party/**/*",
+    "packages/angular_devkit/schematics_cli/blank/*-files/**/*",
+    "packages/angular_devkit/schematics_cli/schematic/files/**/*",
+    "packages/angular_devkit/build_angular/src/*/tests/**/*",
+    "packages/angular_devkit/build_angular/src/testing/**/*",
+    "packages/angular_devkit/*/test/**/*",
+    "packages/schematics/*/*/*files/**/*",
+    "tests/**/*",
+    "tools/**/*",
+    ".ng-dev/**/*",
+    "**/*_spec.ts"
+  ]
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -18,7 +18,7 @@
     "baseUrl": "",
     "rootDirs": [".", "./dist-schema/", "./bazel-bin/"],
     "typeRoots": ["./node_modules/@types"],
-    "types": ["node"],
+    "types": ["node", "jasmine"],
     "paths": {
       "@angular-devkit/core": ["./packages/angular_devkit/core/src/index"],
       "@angular-devkit/core/node": ["./packages/angular_devkit/core/node/index"],
@@ -63,7 +63,6 @@
     "packages/schematics/*/*/*files/**/*",
     "tests/**/*",
     "tools/**/*",
-    "integration/**/*",
     ".ng-dev/**/*"
   ]
 }
