Get codebase building pre bundling

This isn't totally complete, but enough to get everything building and tests running manually. The next commit will make the build work fully.
jakebailey · Oct 28, 2022 · fa26911 · fa26911
1 parent 3ef80ba
commit fa26911
Show file tree

Hide file tree

Showing 71 changed files with 613 additions and 1,201 deletions.
diff --git a/Gulpfile.mjs b/Gulpfile.mjs
@@ -21,6 +21,8 @@ const { src, dest, task, parallel, series, watch } = gulp;
 const copyright = "CopyrightNotice.txt";
 const cleanTasks = [];
 
+const testRunner = "./built/local/testRunner/runner.js";
+
 const buildScripts = () => buildProject("scripts");
 task("scripts", buildScripts);
 task("scripts").description = "Builds files in the 'scripts' folder.";
@@ -91,6 +93,14 @@ const localize = async () => {
     }
 };
 
+const preSrc = parallel(generateLibs, series(buildScripts, generateDiagnostics, localize));
+const buildSrc = () => buildProject("src");
+
+task("build-src", series(preSrc, buildSrc));
+
+const cleanSrc = () => cleanProject("src");
+task("clean-src", cleanSrc);
+
 const buildDebugTools = () => buildProject("src/debug");
 const cleanDebugTools = () => cleanProject("src/debug");
 cleanTasks.push(cleanDebugTools);
@@ -405,8 +415,8 @@ task("watch-local").flags = {
 const preTest = parallel(buildTsc, buildTests, buildServices, buildLssl);
 preTest.displayName = "preTest";
 
-const runTests = () => runConsoleTests("built/local/run.js", "mocha-fivemat-progress-reporter", /*runInParallel*/ false, /*watchMode*/ false);
-task("runtests", series(preBuild, preTest, runTests));
+const runTests = () => runConsoleTests(testRunner, "mocha-fivemat-progress-reporter", /*runInParallel*/ false, /*watchMode*/ false);
+task("runtests", series(/*preBuild, preTest,*/ task("build-src"), runTests)); // TODO(jakebailey): fix this for modules
 task("runtests").description = "Runs the tests using the built run.js file.";
 task("runtests").flags = {
     "-t --tests=<regex>": "Pattern for tests to run.",
@@ -424,8 +434,8 @@ task("runtests").flags = {
     "   --shardId": "1-based ID of this shard (default: 1)",
 };
 
-const runTestsParallel = () => runConsoleTests("built/local/run.js", "min", /*runInParallel*/ cmdLineOptions.workers > 1, /*watchMode*/ false);
-task("runtests-parallel", series(preBuild, preTest, runTestsParallel));
+const runTestsParallel = () => runConsoleTests(testRunner, "min", /*runInParallel*/ cmdLineOptions.workers > 1, /*watchMode*/ false);
+task("runtests-parallel", series(/*preBuild, preTest,*/ task("build-src"), runTestsParallel)); // TODO(jakebailey): fix this for modules
 task("runtests-parallel").description = "Runs all the tests in parallel using the built run.js file.";
 task("runtests-parallel").flags = {
     "   --light": "Run tests in light mode (fewer verifications, but tests run faster).",
@@ -550,10 +560,10 @@ task("publish-nightly").description = "Runs `npm publish --tag next` to create a
 // write some kind of trigger file that indicates build completion that we could listen for instead.
 const watchRuntests = () => watch(["built/local/*.js", "tests/cases/**/*.ts", "tests/cases/**/tsconfig.json"], { delay: 5000 }, async () => {
     if (cmdLineOptions.tests || cmdLineOptions.failed) {
-        await runConsoleTests("built/local/run.js", "mocha-fivemat-progress-reporter", /*runInParallel*/ false, /*watchMode*/ true);
+        await runConsoleTests(testRunner, "mocha-fivemat-progress-reporter", /*runInParallel*/ false, /*watchMode*/ true);
     }
     else {
-        await runConsoleTests("built/local/run.js", "min", /*runInParallel*/ true, /*watchMode*/ true);
+        await runConsoleTests(testRunner, "min", /*runInParallel*/ true, /*watchMode*/ true);
     }
 });
 task("watch", series(preBuild, preTest, parallel(watchLib, watchDiagnostics, watchServices, watchLssl, watchTests, watchRuntests)));

diff --git a/src/cancellationToken/cancellationToken.ts b/src/cancellationToken/cancellationToken.ts
@@ -1,5 +1,3 @@
-/// <reference types="node"/>
-
 import * as fs from "fs";
 
 interface ServerCancellationToken {

diff --git a/src/cancellationToken/tsconfig.json b/src/cancellationToken/tsconfig.json
@@ -1,13 +1,7 @@
 {
-    "extends": "../tsconfig-noncomposite-base",
+    "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local/",
-        "rootDir": ".",
-        "composite": false,
-        "declaration": false,
-        "declarationMap": false,
-        "removeComments": true,
-        "incremental": false,
+        "outDir": "../../built/local/cancellationToken",
         "module": "commonjs",
         "types": [
             "node"
@@ -16,7 +10,5 @@
             "es6"
         ]
     },
-    "files": [
-        "cancellationToken.ts"
-    ]
+    "include": ["**/*"]
 }
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -1521,7 +1521,14 @@ export let sys: System = (() => {
                 }
             },
             getExecutingFilePath() {
-                return __filename;
+                // This function previously returned a path like `built/local/tsc.js`.
+                // Now, with a module output, this file is now `built/local/compiler/sys.js`.
+                // We want to return a file that looks like the old one, so that callers
+                // can locate other assets like the lib.d.ts files.
+                //
+                // TODO(jakebailey): replace this function with one that returns the path
+                // to the lib folder (or package path)?.
+                return _path.join(_path.dirname(__dirname), "fake.js");
             },
             getCurrentDirectory,
             getDirectories,

diff --git a/src/compiler/tsconfig.json b/src/compiler/tsconfig.json
@@ -1,88 +1,12 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local",
+        "outDir": "../../built/local/compiler",
         "types": ["node"]
     },
 
     "references": [
     ],
 
-    "files": [
-        "corePublic.ts",
-        "core.ts",
-        "debug.ts",
-        "semver.ts",
-        "performanceCore.ts",
-        "performance.ts",
-        "perfLogger.ts",
-        "tracing.ts",
-
-        "types.ts",
-        "sys.ts",
-        "path.ts",
-        "diagnosticInformationMap.generated.ts",
-        "scanner.ts",
-        "utilitiesPublic.ts",
-        "utilities.ts",
-        "factory/baseNodeFactory.ts",
-        "factory/parenthesizerRules.ts",
-        "factory/nodeConverters.ts",
-        "factory/nodeFactory.ts",
-        "factory/emitNode.ts",
-        "factory/emitHelpers.ts",
-        "factory/nodeTests.ts",
-        "factory/utilities.ts",
-        "factory/utilitiesPublic.ts",
-        "parser.ts",
-        "commandLineParser.ts",
-        "moduleNameResolver.ts",
-
-        "binder.ts",
-        "symbolWalker.ts",
-        "checker.ts",
-        "visitorPublic.ts",
-        "sourcemap.ts",
-        "transformers/utilities.ts",
-        "transformers/destructuring.ts",
-        "transformers/taggedTemplate.ts",
-        "transformers/ts.ts",
-        "transformers/classFields.ts",
-        "transformers/typeSerializer.ts",
-        "transformers/legacyDecorators.ts",
-        "transformers/es2017.ts",
-        "transformers/es2018.ts",
-        "transformers/es2019.ts",
-        "transformers/es2020.ts",
-        "transformers/es2021.ts",
-        "transformers/esnext.ts",
-        "transformers/jsx.ts",
-        "transformers/es2016.ts",
-        "transformers/es2015.ts",
-        "transformers/es5.ts",
-        "transformers/generators.ts",
-        "transformers/module/module.ts",
-        "transformers/module/system.ts",
-        "transformers/module/esnextAnd2015.ts",
-        "transformers/module/node.ts",
-        "transformers/declarations/diagnostics.ts",
-        "transformers/declarations.ts",
-        "transformer.ts",
-        "emitter.ts",
-        "watchUtilities.ts",
-        "program.ts",
-        "builderStatePublic.ts",
-        "builderState.ts",
-        "builder.ts",
-        "builderPublic.ts",
-        "resolutionCache.ts",
-        "moduleSpecifiers.ts",
-        "watch.ts",
-        "watchPublic.ts",
-        "tsbuild.ts",
-        "tsbuildPublic.ts",
-        "_namespaces/ts.ts",
-        "_namespaces/ts.moduleSpecifiers.ts",
-        "_namespaces/ts.performance.ts"
-    ]
+    "include": ["**/*"]
 }
diff --git a/src/compiler/tsconfig.release.json b/src/compiler/tsconfig.release.json
diff --git a/src/debug/tsconfig.json b/src/debug/tsconfig.json
@@ -1,14 +1,9 @@
 {
-    "extends": "../tsconfig-library-base",
+    "extends": "../tsconfig-base",
     "compilerOptions": {
         "target": "es2019",
         "lib": ["es2019"],
-        "outDir": "../../built/local",
-        "declaration": false,
-        "sourceMap": true
+        "outDir": "../../built/local/debug"
     },
-    "files": [
-        "dbg.ts",
-        "_namespaces/Debug.ts"
-    ]
+    "include": ["**/*"]
 }
diff --git a/src/deprecatedCompat/tsconfig.json b/src/deprecatedCompat/tsconfig.json
@@ -1,22 +1,10 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local",
-        "experimentalDecorators": true
+        "outDir": "../../built/local/deprecatedCompat"
     },
     "references": [
         { "path": "../compiler" }
     ],
-    "files": [
-        "deprecations.ts",
-        "4.0/nodeFactoryTopLevelExports.ts",
-        "4.0/renamedNodeTests.ts",
-        "4.0/renamedMapInterfaces.ts",
-        "4.2/renamedNodeTests.ts",
-        "4.2/abstractConstructorTypes.ts",
-        "4.6/importTypeAssertions.ts",
-        "4.7/typeParameterModifiers.ts",
-        "4.8/mergeDecoratorsAndModifiers.ts",
-        "_namespaces/ts.ts"
-    ]
-}
+    "include": ["**/*"]
+}
diff --git a/src/dynamicImportCompat/tsconfig.json b/src/dynamicImportCompat/tsconfig.json
@@ -1,14 +1,11 @@
 {
-    "extends": "../tsconfig-library-base",
+    "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local",
+        "outDir": "../../built/local/dynamicImportCompat",
         "rootDir": ".",
         "target": "esnext",
         "module": "esnext",
-        "lib": ["esnext"],
-        "declaration": false,
-        "sourceMap": true,
-        "tsBuildInfoFile": "../../built/local/dynamicImportCompat.tsbuildinfo"
+        "lib": ["esnext"]
     },
     "files": [
         "dynamicImportCompat.ts",

diff --git a/src/executeCommandLine/tsconfig.json b/src/executeCommandLine/tsconfig.json
@@ -1,15 +1,12 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local"
+        "outDir": "../../built/local/executeCommandLine"
     },
 
     "references": [
         { "path": "../compiler" }
     ],
 
-    "files": [
-        "executeCommandLine.ts",
-        "_namespaces/ts.ts"
-    ]
+    "include": ["**/*"]
 }
diff --git a/src/executeCommandLine/tsconfig.release.json b/src/executeCommandLine/tsconfig.release.json
diff --git a/src/harness/tsconfig.json b/src/harness/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local",
+        "outDir": "../../built/local/harness",
         "types": [
             "node", "mocha", "chai"
         ],
@@ -19,43 +19,5 @@
         { "path": "../deprecatedCompat" },
     ],
 
-    "files": [
-        "collectionsImpl.ts",
-        "util.ts",
-        "documentsUtil.ts",
-        "vpathUtil.ts",
-        "vfsUtil.ts",
-        "compilerImpl.ts",
-        "evaluatorImpl.ts",
-        "fakesHosts.ts",
-        "client.ts",
-        "findUpDir.ts",
-
-        "runnerbase.ts",
-        "sourceMapRecorder.ts",
-        "harnessGlobals.ts",
-        "harnessUtils.ts",
-        "harnessIO.ts",
-        "harnessLanguageService.ts",
-        "virtualFileSystemWithWatch.ts",
-        "fourslashImpl.ts",
-        "fourslashInterfaceImpl.ts",
-        "typeWriter.ts",
-        "_namespaces/ts.server.ts",
-        "_namespaces/ts.ts",
-        "_namespaces/collections.ts",
-        "_namespaces/compiler.ts",
-        "_namespaces/documents.ts",
-        "_namespaces/evaluator.ts",
-        "_namespaces/fakes.ts",
-        "_namespaces/Utils.ts",
-        "_namespaces/FourSlash.ts",
-        "_namespaces/FourSlashInterface.ts",
-        "_namespaces/Harness.ts",
-        "_namespaces/Harness.LanguageService.ts",
-        "_namespaces/Harness.SourceMapRecorder.ts",
-        "_namespaces/vfs.ts",
-        "_namespaces/ts.TestFSWithWatch.ts",
-        "_namespaces/vpath.ts"
-    ]
+    "include": ["**/*"]
 }
diff --git a/src/jsTyping/tsconfig.json b/src/jsTyping/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local",
+        "outDir": "../../built/local/jsTyping",
         "types": [
             "node"
         ],
@@ -13,12 +13,5 @@
     "references": [
         { "path": "../compiler" }
     ],
-    "files": [
-        "shared.ts",
-        "types.ts",
-        "jsTyping.ts",
-        "_namespaces/ts.JsTyping.ts",
-        "_namespaces/ts.ts",
-        "_namespaces/ts.server.ts"
-    ]
+    "include": ["**/*"]
 }
diff --git a/src/loggedIO/tsconfig.json b/src/loggedIO/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local",
+        "outDir": "../../built/local/loggedIO",
         "types": [
         ],
         "lib": [
@@ -18,11 +18,5 @@
         { "path": "../harness" },
     ],
 
-    "files": [
-        "loggedIO.ts",
-        "_namespaces/Playback.ts",
-        "_namespaces/ts.server.ts",
-        "_namespaces/ts.ts",
-        "_namespaces/Harness.ts"
-    ]
+    "include": ["**/*"]
 }