Merge branch 'upstream/main' into escape-sequence

Author: graphemecluster

.gitattributes

@@ -1,2 +1,3 @@
 *.js linguist-language=TypeScript
+**/*.json linguist-language=jsonc
 * -text

.github/workflows/ci.yml

@@ -16,11 +16,11 @@ jobs:
 
     strategy:
       matrix:
-        # Test the latest version of Node.js plus the last two LTS versions.
         node-version:
-          - "*"
-          - lts/*
-          - lts/-1
+          - "19"
+          - "18"
+          - "16"
+          - "14"
         bundle:
           - "true"
         include:

Herebyfile.mjs

@@ -6,6 +6,7 @@ import { task } from "hereby";
 import _glob from "glob";
 import util from "util";
 import chalk from "chalk";
+import fsExtra from "fs-extra";
 import { Debouncer, Deferred, exec, getDiffTool, getDirSize, memoize, needsUpdate, readJson } from "./scripts/build/utils.mjs";
 import { localBaseline, localRwcBaseline, refBaseline, refRwcBaseline, runConsoleTests } from "./scripts/build/tests.mjs";
 import { buildProject, cleanProject, watchProject } from "./scripts/build/projects.mjs";
@@ -162,7 +163,7 @@ async function runDtsBundler(entrypoint, output) {
  * @typedef BundlerTaskOptions
  * @property {boolean} [exportIsTsObject]
  * @property {boolean} [treeShaking]
- * @property {esbuild.WatchMode} [watchMode]
+ * @property {() => void} [onWatchRebuild]
  */
 function createBundler(entrypoint, outfile, taskOptions = {}) {
     const getOptions = memoize(async () => {
@@ -219,7 +220,30 @@ function createBundler(entrypoint, outfile, taskOptions = {}) {
 
     return {
         build: async () => esbuild.build(await getOptions()),
-        watch: async () => esbuild.build({ ...await getOptions(), watch: taskOptions.watchMode ?? true, logLevel: "info" }),
+        watch: async () => {
+            /** @type {esbuild.BuildOptions} */
+            const options = { ...await getOptions(), logLevel: "info" };
+            if (taskOptions.onWatchRebuild) {
+                const onRebuild = taskOptions.onWatchRebuild;
+                options.plugins = (options.plugins?.slice(0) ?? []).concat([{
+                    name: "watch",
+                    setup: (build) => {
+                        let firstBuild = true;
+                        build.onEnd(() => {
+                            if (firstBuild) {
+                                firstBuild = false;
+                            }
+                            else {
+                                onRebuild();
+                            }
+                        });
+                    }
+                }]);
+            }
+
+            const ctx = await esbuild.context(options);
+            ctx.watch();
+        },
     };
 }
 
@@ -425,10 +449,8 @@ const { main: tests, watch: watchTests } = entrypointBuildTask({
     bundlerOptions: {
         // Ensure we never drop any dead code, which might be helpful while debugging.
         treeShaking: false,
-        watchMode: {
-            onRebuild() {
-                watchTestsEmitter.emit("rebuild");
-            }
+        onWatchRebuild() {
+            watchTestsEmitter.emit("rebuild");
         }
     },
 });
@@ -818,13 +840,6 @@ export const lkg = task({
     dependencies: [produceLKG],
 });
 
-export const generateSpec = task({
-    name: "generate-spec",
-    description: "Generates a Markdown version of the Language Specification",
-    hiddenFromTaskList: true,
-    run: () => exec("cscript", ["//nologo", "scripts/word2md.mjs", path.resolve("doc/TypeScript Language Specification - ARCHIVED.docx"), path.resolve("doc/spec-ARCHIVED.md")]),
-});
-
 export const cleanBuilt = task({
     name: "clean-built",
     hiddenFromTaskList: true,
@@ -861,3 +876,14 @@ export const help = task({
     hiddenFromTaskList: true,
     run: () => exec("hereby", ["--tasks"], { hidePrompt: true }),
 });
+
+export const bumpLkgToNightly = task({
+    name: "bump-lkg-to-nightly",
+    description: "Bumps typescript in package.json to the latest nightly and copies it to LKG.",
+    run: async () => {
+        await exec("npm", ["install", "--save-dev", "--save-exact", "typescript@next"]);
+        await fs.promises.rm("lib", { recursive: true, force: true });
+        await fsExtra.copy("node_modules/typescript/lib", "lib");
+        await fs.promises.writeFile("lib/.gitattributes", "* text eol=lf");
+    }
+});

README.md

@@ -33,8 +33,6 @@ There are many ways to [contribute](https://github.com/microsoft/TypeScript/blob
 * Help each other in the [TypeScript Community Discord](https://discord.gg/typescript).
 * Join the [#typescript](https://twitter.com/search?q=%23TypeScript) discussion on Twitter.
 * [Contribute bug fixes](https://github.com/microsoft/TypeScript/blob/main/CONTRIBUTING.md).
-* Read the archived language specification ([docx](https://github.com/microsoft/TypeScript/blob/main/doc/TypeScript%20Language%20Specification%20-%20ARCHIVED.docx?raw=true),
- [pdf](https://github.com/microsoft/TypeScript/blob/main/doc/TypeScript%20Language%20Specification%20-%20ARCHIVED.pdf?raw=true), [md](https://github.com/microsoft/TypeScript/blob/main/doc/spec-ARCHIVED.md)).
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see
 the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com)