Skip to content

Commit a8abadb

Browse files
committed
Merge branch 'master' into see-tag
2 parents bcef14f + e46ce36 commit a8abadb

File tree

574 files changed

+29496
-3965
lines changed

Some content is hidden

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

574 files changed

+29496
-3965
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
node-version: [10.x, 12.x, 13.x]
19+
node-version: [10.x, 12.x, 14.x]
2020

2121
steps:
2222
- uses: actions/checkout@v2
@@ -30,8 +30,7 @@ jobs:
3030
run: |
3131
npm uninstall typescript --no-save
3232
npm uninstall tslint --no-save
33-
- run: npm install
34-
- run: npm update
33+
- run: npm ci
3534

3635
# Re: https://github.com/actions/setup-node/pull/125
3736
- name: Register Problem Matcher for TSC
@@ -45,4 +44,4 @@ jobs:
4544

4645
- name: Validate the browser can import TypeScript
4746
run: gulp test-browser-integration
48-
47+

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' tests/baselines/reference/api/typescript.d.ts
2424
sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' tests/baselines/reference/api/tsserverlibrary.d.ts
2525
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
26+
npm ci
2727
gulp LKG
2828
npm test
2929
git diff
@@ -32,7 +32,7 @@ jobs:
3232
git add tests/baselines/reference/api/typescript.d.ts
3333
git add tests/baselines/reference/api/tsserverlibrary.d.ts
3434
git add ./lib
35-
git config user.email "ts_bot@rcavanaugh.com"
35+
git config user.email "typescriptbot@microsoft.com"
3636
git config user.name "TypeScript Bot"
3737
git commit -m 'Bump version to ${{ github.event.client_payload.package_version }} and LKG'
3838
git push --set-upstream origin ${{ github.event.client_payload.branch_name }}

.github/workflows/release-branch-artifact.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ jobs:
2121
npm uninstall tslint --no-save
2222
- name: npm install and test
2323
run: |
24-
npm install
25-
npm update
24+
npm ci
2625
npm test
2726
env:
2827
CI: true
@@ -41,4 +40,3 @@ jobs:
4140
with:
4241
name: tgz
4342
path: typescript.tgz
44-

.github/workflows/set-version.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' tests/baselines/reference/api/typescript.d.ts
3030
sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' tests/baselines/reference/api/tsserverlibrary.d.ts
3131
sed -i -e 's/const version = .*;/const version = "${{ github.event.client_payload.package_version }}" as string;/g' src/compiler/corePublic.ts
32-
npm install
32+
npm ci
3333
gulp LKG
3434
npm test
3535
git diff
@@ -38,7 +38,7 @@ jobs:
3838
git add tests/baselines/reference/api/typescript.d.ts
3939
git add tests/baselines/reference/api/tsserverlibrary.d.ts
4040
git add ./lib
41-
git config user.email "ts_bot@rcavanaugh.com"
41+
git config user.email "typescriptbot@microsoft.com"
4242
git config user.name "TypeScript Bot"
4343
git commit -m 'Bump version to ${{ github.event.client_payload.package_version }} and LKG'
4444
git push

.github/workflows/sync-branch.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ name: Sync branch with master
33
on:
44
repository_dispatch:
55
types: sync-branch
6+
workflow_dispatch:
7+
inputs:
8+
branch_name:
9+
description: 'Target Branch Name'
10+
required: true
611

712
jobs:
813
build:
@@ -15,15 +20,15 @@ jobs:
1520
node-version: 12.x
1621
- uses: actions/checkout@v2
1722
with:
18-
ref: ${{ github.event.client_payload.branch_name }}
23+
ref: ${{ github.event.inputs.branch_name || github.event.client_payload.branch_name }}
1924
# This does a test post-merge and only pushes the result if the test succeeds
2025
# required client_payload members:
2126
# branch_name - the target branch
2227
- run: |
23-
git config user.email "ts_bot@rcavanaugh.com"
28+
git config user.email "typescriptbot@microsoft.com"
2429
git config user.name "TypeScript Bot"
2530
git fetch origin master
26-
git merge master --no-ff
27-
npm install
31+
git merge origin/master --no-ff
32+
npm ci
2833
npm test
2934
git push

.github/workflows/update-lkg.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Update LKG
2+
3+
on:
4+
workflow_dispatch: {}
5+
6+
jobs:
7+
build:
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- uses: actions/checkout@v2
12+
- name: Use node version 12
13+
uses: actions/setup-node@v1
14+
with:
15+
node-version: 12
16+
registry-url: https://registry.npmjs.org/
17+
18+
- name: Configure Git and Update LKG
19+
run: |
20+
git config user.email "[email protected]"
21+
git config user.name "TypeScript Bot"
22+
npm ci
23+
gulp LKG
24+
npm test
25+
git diff
26+
git add ./lib
27+
git commit -m "Update LKG"
28+
git push
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Update package-lock.json
2+
3+
on:
4+
schedule:
5+
# This is probably 6am UTC, which is 10pm PST or 11pm PDT
6+
# Alternatively, 6am local is also fine
7+
- cron: '0 6 * * *'
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v2
15+
- uses: actions/setup-node@v1
16+
with:
17+
node-version: 12
18+
registry-url: https://registry.npmjs.org/
19+
20+
- name: Configure git and update package-lock.json
21+
run: |
22+
git config user.email "[email protected]"
23+
git config user.name "TypeScript Bot"
24+
npm install --package-lock-only
25+
git add -f package-lock.json
26+
git commit -m "Update package-lock.json"
27+
git push

.npmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ language: node_js
22

33
node_js:
44
- 'node'
5+
- '12'
56
- '10'
6-
- '8'
77

88
env:
99
- workerCount=3 timeout=600000
@@ -18,7 +18,7 @@ branches:
1818

1919
install:
2020
- npm uninstall typescript --no-save
21-
- npm install
21+
- npm ci
2222

2323
cache:
2424
directories:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
FROM node:current
33
COPY . /typescript
44
WORKDIR /typescript
5-
RUN npm install
5+
RUN npm ci
66
RUN npm i -g gulp-cli
77
RUN gulp configure-insiders && gulp LKG && gulp clean && npm pack .

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Install [Gulp](https://gulpjs.com/) tools and dev dependencies:
6767

6868
```bash
6969
npm install -g gulp
70-
npm install
70+
npm ci
7171
```
7272

7373
Use one of the following to build and test:

doc/spec.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ namespace X { // Namespace named X
903903
}
904904
```
905905

906-
A name that denotes a value has an associated type (section [3](#3)) and can be referenced in expressions (section [4.3](#4.3)). A name that denotes a type can be used by itself in a type reference or on the right hand side of a dot in a type reference ([3.8.2](#3.8.2)). A name that denotes a namespace can be used one the left hand side of a dot in a type reference.
906+
A name that denotes a value has an associated type (section [3](#3)) and can be referenced in expressions (section [4.3](#4.3)). A name that denotes a type can be used by itself in a type reference or on the right hand side of a dot in a type reference ([3.8.2](#3.8.2)). A name that denotes a namespace can be used on the left hand side of a dot in a type reference.
907907

908908
When a name with multiple meanings is referenced, the context in which the reference occurs determines the meaning. For example:
909909

0 commit comments

Comments
 (0)