Merge branch 'main' into fewer-files

Author: jakebailey

.eslintrc.json

@@ -25,6 +25,12 @@
         "/coverage/**"
     ],
     "rules": {
+        "sort-imports": ["error", {
+            "ignoreCase": true,
+            "ignoreDeclarationSort": true,
+            "allowSeparatedGroups": true
+        }],
+
         "@typescript-eslint/adjacent-overload-signatures": "error",
         "@typescript-eslint/array-type": "error",
         "@typescript-eslint/no-array-constructor": "error",

.github/workflows/ci.yml

@@ -109,10 +109,14 @@ jobs:
         npm init --yes
         npm install $PACKAGE tslib
 
+        echo "Testing tsc..."
         npx tsc --version
+
+        echo "Testing tsserver..."
         echo '{"seq": 1, "command": "status"}' | npx tsserver
 
-        cat > smoke.js << EOF
+        cat > smoke.js << 'EOF'
+        console.log(`Testing ${process.argv[2]}...`);
         const { __importDefault, __importStar } = require("tslib");
         const ts = require(process.argv[2]);
 
@@ -132,16 +136,16 @@ jobs:
             success = !!fn();
           }
           catch {}
-          if (success !== shouldSucceed) {
-            if (success) {
-              console.error(`${fn.toString()} unexpectedly succeeded.`);
-            }
-            else {
-              console.error(`${fn.toString()} did not succeed.`);
-            }
+          const status = success ? "succeeded" : "failed";
+          if (success === shouldSucceed) {
+            console.log(`${fn.toString()} ${status} as expected.`);
+          }
+          else {
+            console.log(`${fn.toString()} unexpectedly ${status}.`);
             process.exitCode = 1;
           }
         }
+        console.log("ok");
         EOF
 
         node ./smoke.js typescript

.vscode/tasks.json

@@ -14,7 +14,7 @@
             // https://github.com/microsoft/vscode/issues/93001
             "label": "gulp: tests",
             "type": "npm",
-            "script": "build:tests",
+            "script": "build:tests -- --no-typecheck",
             "group": "build",
             "hide": true,
             "problemMatcher": [
@@ -44,7 +44,7 @@
         {
             "label": "npm: build:tests",
             "type": "npm",
-            "script": "build:tests",
+            "script": "build:tests -- --no-typecheck",
             "group": "build",
             "problemMatcher": [
                 "$tsc"

Herebyfile.mjs

@@ -6,9 +6,9 @@ import { task } from "hereby";
 import _glob from "glob";
 import util from "util";
 import chalk from "chalk";
-import { exec, readJson, getDiffTool, getDirSize, memoize, needsUpdate, Debouncer, Deferred } from "./scripts/build/utils.mjs";
-import { runConsoleTests, refBaseline, localBaseline, refRwcBaseline, localRwcBaseline, cleanTestDirs } from "./scripts/build/tests.mjs";
-import { buildProject as realBuildProject, cleanProject, watchProject } from "./scripts/build/projects.mjs";
+import { Debouncer, Deferred, exec, getDiffTool, getDirSize, memoize, needsUpdate, readJson } from "./scripts/build/utils.mjs";
+import { cleanTestDirs, localBaseline, localRwcBaseline, refBaseline, refRwcBaseline, runConsoleTests } from "./scripts/build/tests.mjs";
+import { cleanProject, buildProject as realBuildProject, watchProject } from "./scripts/build/projects.mjs";
 import { localizationDirectories } from "./scripts/build/localization.mjs";
 import cmdLineOptions from "./scripts/build/options.mjs";
 import esbuild from "esbuild";
@@ -328,10 +328,21 @@ function entrypointBuildTask(options) {
         },
     });
 
+    const mainDeps = options.mainDeps?.slice(0) ?? [];
+    if (cmdLineOptions.bundle) {
+        mainDeps.push(bundle);
+        if (cmdLineOptions.typecheck) {
+            mainDeps.push(build);
+        }
+    }
+    else {
+        mainDeps.push(build, shim);
+    }
+
     const main = task({
         name: options.name,
         description: options.description,
-        dependencies: (options.mainDeps ?? []).concat(cmdLineOptions.bundle ? [bundle] : [build, shim]),
+        dependencies: mainDeps,
     });
 
     const watch = task({
@@ -358,7 +369,7 @@ function entrypointBuildTask(options) {
 }
 
 
-const { main: tsc, build: buildTsc, watch: watchTsc } = entrypointBuildTask({
+const { main: tsc, watch: watchTsc } = entrypointBuildTask({
     name: "tsc",
     description: "Builds the command-line compiler",
     buildDeps: [generateDiagnostics],
@@ -396,7 +407,7 @@ export const dtsServices = task({
 });
 
 
-const { main: tsserver, build: buildTsserver, watch: watchTsserver } = entrypointBuildTask({
+const { main: tsserver, watch: watchTsserver } = entrypointBuildTask({
     name: "tsserver",
     description: "Builds the language server",
     buildDeps: [generateDiagnostics],
@@ -405,24 +416,14 @@ const { main: tsserver, build: buildTsserver, watch: watchTsserver } = entrypoin
     builtEntrypoint: "./built/local/tsserver/server.js",
     output: "./built/local/tsserver.js",
     mainDeps: [generateLibs],
-    // Even though this seems like an exectuable, so could be the default CJS,
-    // this is used in the browser too. Do the same thing that we do for our
-    // libraries and generate an IIFE with name `ts`, as to not pollute the global
-    // scope.
-    bundlerOptions: { exportIsTsObject: true },
 });
 export { tsserver, watchTsserver };
 
 
-const buildMin = task({
-    name: "build-min",
-    dependencies: [buildTsc, buildTsserver],
-});
-
 export const min = task({
     name: "min",
     description: "Builds only tsc and tsserver",
-    dependencies: [tsc, tsserver].concat(cmdLineOptions.typecheck ? [buildMin] : []),
+    dependencies: [tsc, tsserver],
 });
 
 export const watchMin = task({
@@ -591,15 +592,10 @@ export const watchOtherOutputs = task({
     dependencies: [watchCancellationToken, watchTypingsInstaller, watchWatchGuard, generateTypesMap, copyBuiltLocalDiagnosticMessages],
 });
 
-const buildLocal = task({
-    name: "build-local",
-    dependencies: [buildTsc, buildTsserver, buildServices, buildLssl]
-});
-
 export const local = task({
     name: "local",
     description: "Builds the full compiler and services",
-    dependencies: [localize, tsc, tsserver, services, lssl, otherOutputs, dts].concat(cmdLineOptions.typecheck ? [buildLocal] : []),
+    dependencies: [localize, tsc, tsserver, services, lssl, otherOutputs, dts],
 });
 export default local;
 
@@ -610,7 +606,7 @@ export const watchLocal = task({
     dependencies: [localize, watchTsc, watchTsserver, watchServices, watchLssl, watchOtherOutputs, dts, watchSrc],
 });
 
-const runtestsDeps = [tests, generateLibs].concat(cmdLineOptions.typecheck ? [dts, buildSrc] : []);
+const runtestsDeps = [tests, generateLibs].concat(cmdLineOptions.typecheck ? [dts] : []);
 
 export const runTests = task({
     name: "runtests",
@@ -804,7 +800,7 @@ function baselineAcceptTask(localBaseline, refBaseline) {
         }
         const toDelete = await glob(`${localBaseline}/**/*.delete`, { nodir: true });
         for (const p of toDelete) {
-            const out = localPathToRefPath(p);
+            const out = localPathToRefPath(p).replace(/\.delete$/, "");
             await fs.promises.rm(out);
         }
     };