Skip to content

Commit

Permalink
upgrade yarn + node to 16 (#811)
Browse files Browse the repository at this point in the history
  • Loading branch information
silesky authored Mar 6, 2023
1 parent 36e93c7 commit 0c3a696
Show file tree
Hide file tree
Showing 13 changed files with 899 additions and 823 deletions.
4 changes: 2 additions & 2 deletions .buildkite/Dockerfile.agent
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM 528451384384.dkr.ecr.us-west-2.amazonaws.com/buildkite-agent-node14
FROM 528451384384.dkr.ecr.us-west-2.amazonaws.com/buildkite-agent-node16:node-16.16

# 2. Install WebKit dependencies
RUN apt-get update && apt-get install -y --no-install-recommends \
Expand Down Expand Up @@ -52,4 +52,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
RUN apt-get update && apt-get install -y --no-install-recommends \
xvfb

ENTRYPOINT []
ENTRYPOINT []
4 changes: 2 additions & 2 deletions .github/workflows/create-github-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
steps:
- name: Checkout Repo
uses: actions/checkout@v3
- name: Setup Node.js 12.x
- name: Setup Node.js 16.x
uses: actions/setup-node@v3
with:
node-version: 12.x
node-version: 16.x
cache: "yarn"
- name: Install Dependencies
run: HUSKY=0 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 yarn install --immutable
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/release-creator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,12 @@ jobs:
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
fetch-depth: 0

- name: Setup Node.js 12.x
- name: Setup Node.js 16.x
uses: actions/setup-node@v3
with:
node-version: 12.x
node-version: 16.x
cache: "yarn"

- name: Set yarn version
run: yarn set version self

- name: Install Dependencies
run: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 HUSKY=0 yarn install --immutable

Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.17
16.16
786 changes: 0 additions & 786 deletions .yarn/releases/yarn-3.2.1.cjs

This file was deleted.

873 changes: 873 additions & 0 deletions .yarn/releases/yarn-3.4.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ plugins:

preferInteractive: true

yarnPath: .yarn/releases/yarn-3.2.1.cjs
yarnPath: .yarn/releases/yarn-3.4.1.cjs
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"packages/*"
],
"engines": {
"node": "^14.15.0"
"node": "^16.16.0"
},
"scripts": {
"test": "jest",
Expand All @@ -31,7 +31,7 @@
"node+deps": "turbo run --filter=@segment/analytics-node",
"clean": "bash scripts/clean.sh"
},
"packageManager": "yarn@3.2.1",
"packageManager": "yarn@3.4.1",
"devDependencies": {
"@changesets/changelog-github": "^0.4.5",
"@changesets/cli": "^2.23.2",
Expand Down
1 change: 0 additions & 1 deletion packages/browser/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ help: ## Lists all available make tasks and some short documentation about them

# Installs npm dependencies
node_modules:
yarn set version self
yarn install --immutable
@touch $@

Expand Down
2 changes: 1 addition & 1 deletion packages/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"@types/js-cookie": "3.0.1",
"@types/jsdom": "^16.2.14",
"@types/mime": "^2.0.3",
"@types/node": "^12.12.14",
"@types/node": "^16",
"@types/serve-handler": "^6.1.0",
"@types/spark-md5": "^3.0.2",
"aws-sdk": "^2.814.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/node-integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@segment/analytics-node": "workspace:^",
"@types/analytics-node": "^3.1.9",
"@types/autocannon": "^7",
"@types/node": "^14",
"@types/node": "^16",
"analytics-node": "^6.2.0",
"autocannon": "^7.10.0",
"nock": "^13.2.9"
Expand Down
2 changes: 1 addition & 1 deletion packages/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"devDependencies": {
"@internal/config": "0.0.0",
"@types/node": "^14",
"@types/node": "^16",
"@types/uuid": "^9"
},
"packageManager": "[email protected]"
Expand Down
33 changes: 13 additions & 20 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,7 @@ __metadata:
"@segment/analytics-node": "workspace:^"
"@types/analytics-node": ^3.1.9
"@types/autocannon": ^7
"@types/node": ^14
"@types/node": ^16
analytics-node: ^6.2.0
autocannon: ^7.10.0
nock: ^13.2.9
Expand Down Expand Up @@ -1747,7 +1747,7 @@ __metadata:
"@types/js-cookie": 3.0.1
"@types/jsdom": ^16.2.14
"@types/mime": ^2.0.3
"@types/node": ^12.12.14
"@types/node": ^16
"@types/serve-handler": ^6.1.0
"@types/spark-md5": ^3.0.2
aws-sdk: ^2.814.0
Expand Down Expand Up @@ -1789,7 +1789,7 @@ __metadata:
dependencies:
"@internal/config": 0.0.0
"@segment/analytics-core": 1.2.2
"@types/node": ^14
"@types/node": ^16
"@types/uuid": ^9
buffer: ^6.0.3
node-fetch: ^2.6.7
Expand Down Expand Up @@ -3462,24 +3462,17 @@ __metadata:
languageName: node
linkType: hard

"@types/node@npm:^12.12.14":
version: 12.12.55
resolution: "@types/node@npm:12.12.55"
checksum: 7c4b8e9d9d1b94856f608531b7fbfad0b760e6a5d259e7406b02a62673fbcbd29a7363f165876c6b5206e214a2f45e86e6f70a7f988e4615cea2fc7c502d5976
languageName: node
linkType: hard

"@types/node@npm:^12.7.1":
version: 12.20.55
resolution: "@types/node@npm:12.20.55"
checksum: e4f86785f4092706e0d3b0edff8dca5a13b45627e4b36700acd8dfe6ad53db71928c8dee914d4276c7fd3b6ccd829aa919811c9eb708a2c8e4c6eb3701178c37
languageName: node
linkType: hard

"@types/node@npm:^14":
version: 14.18.33
resolution: "@types/node@npm:14.18.33"
checksum: 4e23f95186d8ae1d38c999bc6b46fe94e790da88744b0a3bfeedcbd0d9ffe2cb0ff39e85f43014f6739e5270292c1a1f6f97a1fc606fd573a0c17fda9a1d42de
"@types/node@npm:^16":
version: 16.18.14
resolution: "@types/node@npm:16.18.14"
checksum: 7865c1c3e7c7d2fef6103c6dfa181755dc48365024253d6acc460e884508b5937a222aa8bd04835988ff0bdc47867e2ada78859c0a7f9c65b44884316f3b469c
languageName: node
linkType: hard

Expand Down Expand Up @@ -7544,7 +7537,7 @@ __metadata:

"fsevents@patch:fsevents@^2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
version: 2.3.2
resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=18f3a7"
resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=df0bf1"
dependencies:
node-gyp: latest
conditions: os=darwin
Expand Down Expand Up @@ -11850,7 +11843,7 @@ __metadata:

"resolve@patch:resolve@^1.1.7#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.0#~builtin<compat/resolve>":
version: 1.22.0
resolution: "resolve@patch:resolve@npm%3A1.22.0#~builtin<compat/resolve>::version=1.22.0&hash=07638b"
resolution: "resolve@patch:resolve@npm%3A1.22.0#~builtin<compat/resolve>::version=1.22.0&hash=c3c19d"
dependencies:
is-core-module: ^2.8.1
path-parse: ^1.0.7
Expand All @@ -11863,7 +11856,7 @@ __metadata:

"resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.9.0#~builtin<compat/resolve>":
version: 1.20.0
resolution: "resolve@patch:resolve@npm%3A1.20.0#~builtin<compat/resolve>::version=1.20.0&hash=07638b"
resolution: "resolve@patch:resolve@npm%3A1.20.0#~builtin<compat/resolve>::version=1.20.0&hash=c3c19d"
dependencies:
is-core-module: ^2.2.0
path-parse: ^1.0.6
Expand All @@ -11873,7 +11866,7 @@ __metadata:

"resolve@patch:resolve@^2.0.0-next.3#~builtin<compat/resolve>":
version: 2.0.0-next.3
resolution: "resolve@patch:resolve@npm%3A2.0.0-next.3#~builtin<compat/resolve>::version=2.0.0-next.3&hash=07638b"
resolution: "resolve@patch:resolve@npm%3A2.0.0-next.3#~builtin<compat/resolve>::version=2.0.0-next.3&hash=c3c19d"
dependencies:
is-core-module: ^2.2.0
path-parse: ^1.0.6
Expand Down Expand Up @@ -13551,11 +13544,11 @@ __metadata:

"typescript@patch:typescript@^4.7.0#~builtin<compat/typescript>":
version: 4.9.5
resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin<compat/typescript>::version=4.9.5&hash=7ad353"
resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin<compat/typescript>::version=4.9.5&hash=23ec76"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 2eee5c37cad4390385db5db5a8e81470e42e8f1401b0358d7390095d6f681b410f2c4a0c496c6ff9ebd775423c7785cdace7bcdad76c7bee283df3d9718c0f20
checksum: ab417a2f398380c90a6cf5a5f74badd17866adf57f1165617d6a551f059c3ba0a3e4da0d147b3ac5681db9ac76a303c5876394b13b3de75fdd5b1eaa06181c9d
languageName: node
linkType: hard

Expand Down

0 comments on commit 0c3a696

Please sign in to comment.