Skip to content

Commit 0c06464

Browse files
a-tarasyuka-tarasyuk
committed
2 parents a46df50 + d763804 commit 0c06464

File tree

256 files changed

+5320
-2429
lines changed

Some content is hidden

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

256 files changed

+5320
-2429
lines changed

‎.github/workflows/ci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,6 @@ jobs:
3535
npm install
3636
npm update
3737
npm test
38+
- name: Validate the browser can import TypeScript
39+
run: gulp test-browser-integration
40+

‎.github/workflows/new-release-branch.yaml

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: New Release Branch
2+
3+
on:
4+
repository_dispatch:
5+
types: new-release-branch
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- name: Use node version 12.x
13+
uses: actions/setup-node@v1
14+
with:
15+
node-version: 12.x
16+
- uses: actions/checkout@v2
17+
with:
18+
fetch-depth: 5
19+
- run: |
20+
git checkout -b ${{ github.event.client_payload.branch_name }}
21+
sed -i -e 's/"version": ".*"/"version": "${{ github.event.client_payload.package_version }}"/g' package.json
22+
sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' src/compiler/corePublic.ts
23+
sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' tests/baselines/reference/api/typescript.d.ts
24+
sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' tests/baselines/reference/api/tsserverlibrary.d.ts
25+
sed -i -e 's/const version = `${versionMajorMinor}.0-.*`/const version = `${versionMajorMinor}.0-${{ github.event.client_payload.core_tag || 'dev' }}`/g' src/compiler/corePublic.ts
26+
npm install
27+
gulp LKG
28+
npm test
29+
git diff
30+
git add package.json
31+
git add src/compiler/corePublic.ts
32+
git add tests/baselines/reference/api/typescript.d.ts
33+
git add tests/baselines/reference/api/tsserverlibrary.d.ts
34+
git add ./lib
35+
git config user.email "[email protected]"
36+
git config user.name "TypeScript Bot"
37+
git commit -m 'Bump version to ${{ github.event.client_payload.package_version }} and LKG'
38+
git push --set-upstream origin ${{ github.event.client_payload.branch_name }}

‎Gulpfile.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ const generateCodeCoverage = () => exec("istanbul", ["cover", "node_modules/moch
430430
task("generate-code-coverage", series(preBuild, buildTests, generateCodeCoverage));
431431
task("generate-code-coverage").description = "Generates code coverage data via istanbul";
432432

433-
const preTest = parallel(buildTests, buildServices, buildLssl);
433+
const preTest = parallel(buildTsc, buildTests, buildServices, buildLssl);
434434
preTest.displayName = "preTest";
435435

436436
const postTest = (done) => cmdLineOptions.lint ? lint(done) : done();
@@ -456,7 +456,7 @@ task("runtests").flags = {
456456
" --shardId": "1-based ID of this shard (default: 1)",
457457
};
458458

459-
const runTestsParallel = () => runConsoleTests("built/local/run.js", "min", /*runInParallel*/ true, /*watchMode*/ false);
459+
const runTestsParallel = () => runConsoleTests("built/local/run.js", "min", /*runInParallel*/ cmdLineOptions.workers > 1, /*watchMode*/ false);
460460
task("runtests-parallel", series(preBuild, preTest, runTestsParallel, postTest));
461461
task("runtests-parallel").description = "Runs all the tests in parallel using the built run.js file.";
462462
task("runtests-parallel").flags = {
@@ -472,6 +472,11 @@ task("runtests-parallel").flags = {
472472
" --shardId": "1-based ID of this shard (default: 1)",
473473
};
474474

475+
476+
task("test-browser-integration", () => exec(process.execPath, ["scripts/browserIntegrationTest.js"]));
477+
task("test-browser-integration").description = "Runs scripts/browserIntegrationTest.ts which tests that typescript.js loads in a browser";
478+
479+
475480
task("diff", () => exec(getDiffTool(), [refBaseline, localBaseline], { ignoreExitCode: true, waitForExit: false }));
476481
task("diff").description = "Diffs the compiler baselines using the diff tool specified by the 'DIFF' environment variable";
477482

‎package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "typescript",
33
"author": "Microsoft Corp.",
44
"homepage": "https://www.typescriptlang.org/",
5-
"version": "3.8.0",
5+
"version": "3.9.0",
66
"license": "Apache-2.0",
77
"description": "TypeScript is a language for application scale JavaScript development",
88
"keywords": [
@@ -96,6 +96,7 @@
9696
"through2": "latest",
9797
"travis-fold": "latest",
9898
"typescript": "next",
99+
"playwright": "latest",
99100
"vinyl": "latest",
100101
"vinyl-sourcemaps-apply": "latest",
101102
"xml2js": "^0.4.19"

‎scripts/browserIntegrationTest.js

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
const playwright = require("playwright");
2+
const chalk = require("chalk");
3+
const { join } = require("path");
4+
const { readFileSync } = require("fs");
5+
6+
// Turning this on will leave the Chromium browser open, giving you the
7+
// chance to open up the web inspector.
8+
const debugging = false;
9+
10+
(async () => {
11+
for (const browserType of ["chromium", "firefox", "webkit"]) {
12+
const browser = await playwright[browserType].launch({ headless: !debugging });
13+
const context = await browser.newContext();
14+
const page = await context.newPage();
15+
16+
const errorCaught = err => {
17+
console.error(chalk.red("There was an error running built/typescript.js in " + browserType));
18+
console.log(err.toString());
19+
process.exitCode = 1;
20+
};
21+
22+
page.on("error", errorCaught);
23+
page.on("pageerror", errorCaught);
24+
page.on("console", log => console[log._type](log._text));
25+
26+
await page.setContent(`
27+
<html>
28+
<script>${readFileSync(join("built", "local", "typescript.js"), "utf8")}</script>
29+
</html>
30+
`);
31+
32+
if (!debugging) {
33+
await browser.close();
34+
}
35+
else {
36+
console.log("Not closing the browser, you'll need to exit the process in your terminal manually");
37+
}
38+
}
39+
})();

‎scripts/open-user-pr.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function padNum(num: number) {
1212
const userName = process.env.GH_USERNAME;
1313
const reviewers = process.env.REQUESTING_USER ? [process.env.REQUESTING_USER] : ["weswigham", "sandersn", "RyanCavanaugh"];
1414
const now = new Date();
15-
const branchName = `user-update-${process.env.TARGET_FORK}-${now.getFullYear()}${padNum(now.getMonth())}${padNum(now.getDay())}${process.env.TARGET_BRANCH ? "-" + process.env.TARGET_BRANCH : ""}`;
15+
const branchName = `user-update-${process.env.TARGET_FORK}-${now.getFullYear()}${padNum(now.getMonth() + 1)}${padNum(now.getDate())}${process.env.TARGET_BRANCH ? "-" + process.env.TARGET_BRANCH : ""}`;
1616
const remoteUrl = `https://${process.argv[2]}@github.com/${userName}/TypeScript.git`;
1717
runSequence([
1818
["git", ["checkout", "."]], // reset any changes

0 commit comments

Comments
 (0)