Skip to content

Commit 4eb9fb4

Browse files
authored
Merge pull request #40146 from amcasey/PackageLock
Adopt package-lock.json
2 parents f9e360d + c12bc7b commit 4eb9fb4

12 files changed

+8824
-17
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run: |
3131
npm uninstall typescript --no-save
3232
npm uninstall tslint --no-save
33-
- run: npm install
33+
- run: npm ci
3434
- run: npm update
3535

3636
# Re: https://github.com/actions/setup-node/pull/125
@@ -45,4 +45,4 @@ jobs:
4545

4646
- name: Validate the browser can import TypeScript
4747
run: gulp test-browser-integration
48-
48+

.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
# required client_payload members:
2626
# branch_name - the target branch
2727
- run: |
28-
git config user.email "ts_bot@rcavanaugh.com"
28+
git config user.email "typescriptbot@microsoft.com"
2929
git config user.name "TypeScript Bot"
3030
git fetch origin master
3131
git merge origin/master --no-ff
32-
npm install
32+
npm ci
3333
npm test
3434
git push

.github/workflows/update-lkg.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717

1818
- name: Configure Git and Update LKG
1919
run: |
20-
git config user.email "ts_bot@rcavanaugh.com"
20+
git config user.email "typescriptbot@microsoft.com"
2121
git config user.name "TypeScript Bot"
22-
npm install
22+
npm ci
2323
gulp LKG
2424
npm test
2525
git diff
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 "typescriptbot@microsoft.com"
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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:

0 commit comments

Comments
 (0)