Skip to content

Commit 16b6d35

Browse files
committed
Merge remote-tracking branch 'origin/main' into infer-intersected-mapped-types
2 parents ef2fba1 + 4ba756f commit 16b6d35

File tree

439 files changed

+253449
-176956
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

439 files changed

+253449
-176956
lines changed

Herebyfile.mjs

+12-7
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { task } from "hereby";
66
import _glob from "glob";
77
import util from "util";
88
import chalk from "chalk";
9+
import fsExtra from "fs-extra";
910
import { Debouncer, Deferred, exec, getDiffTool, getDirSize, memoize, needsUpdate, readJson } from "./scripts/build/utils.mjs";
1011
import { localBaseline, localRwcBaseline, refBaseline, refRwcBaseline, runConsoleTests } from "./scripts/build/tests.mjs";
1112
import { buildProject, cleanProject, watchProject } from "./scripts/build/projects.mjs";
@@ -818,13 +819,6 @@ export const lkg = task({
818819
dependencies: [produceLKG],
819820
});
820821

821-
export const generateSpec = task({
822-
name: "generate-spec",
823-
description: "Generates a Markdown version of the Language Specification",
824-
hiddenFromTaskList: true,
825-
run: () => exec("cscript", ["//nologo", "scripts/word2md.mjs", path.resolve("doc/TypeScript Language Specification - ARCHIVED.docx"), path.resolve("doc/spec-ARCHIVED.md")]),
826-
});
827-
828822
export const cleanBuilt = task({
829823
name: "clean-built",
830824
hiddenFromTaskList: true,
@@ -861,3 +855,14 @@ export const help = task({
861855
hiddenFromTaskList: true,
862856
run: () => exec("hereby", ["--tasks"], { hidePrompt: true }),
863857
});
858+
859+
export const bumpLkgToNightly = task({
860+
name: "bump-lkg-to-nightly",
861+
description: "Bumps typescript in package.json to the latest nightly and copies it to LKG.",
862+
run: async () => {
863+
await exec("npm", ["install", "--save-dev", "--save-exact", "typescript@next"]);
864+
await fs.promises.rm("lib", { recursive: true, force: true });
865+
await fsExtra.copy("node_modules/typescript/lib", "lib");
866+
await fs.promises.writeFile("lib/.gitattributes", "* text eol=lf");
867+
}
868+
});

README.md

-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ There are many ways to [contribute](https://github.com/microsoft/TypeScript/blob
3333
* Help each other in the [TypeScript Community Discord](https://discord.gg/typescript).
3434
* Join the [#typescript](https://twitter.com/search?q=%23TypeScript) discussion on Twitter.
3535
* [Contribute bug fixes](https://github.com/microsoft/TypeScript/blob/main/CONTRIBUTING.md).
36-
* Read the archived language specification ([docx](https://github.com/microsoft/TypeScript/blob/main/doc/TypeScript%20Language%20Specification%20-%20ARCHIVED.docx?raw=true),
37-
[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)).
3836

3937
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see
4038
the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected])

doc/README.md

-9
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

doc/handbook/README.md

-5
This file was deleted.

doc/images/image1.png

-11.4 KB
Binary file not shown.

doc/images/image2.png

-10 KB
Binary file not shown.

doc/images/image3.png

-5.86 KB
Binary file not shown.

doc/images/image4.png

-15.7 KB
Binary file not shown.

doc/logo.svg

-10
This file was deleted.

0 commit comments

Comments
 (0)