Skip to content

Commit 66ee8f3

Browse files
authored
chore: yarn berry (#6652)
* chore: yarn berry * chore: corepack enable * chore: benchmark script * chore: fix verdaccio on node18+
1 parent 4817524 commit 66ee8f3

File tree

16 files changed

+44624
-14888
lines changed

16 files changed

+44624
-14888
lines changed

.github/workflows/pre-commit-hooks.yml

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v4
14+
- name: Enable Corepack
15+
run: corepack enable
1416

1517
- name: set up Node.js
1618
uses: actions/setup-node@v3

.gitignore

+8
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@ jspm_packages
1717
.node_repl_history
1818
*.tgz
1919
.yarn-integrity
20+
.yarn/*
21+
**/.yarn/*
22+
!.yarn/cache
23+
!.yarn/patches
24+
!.yarn/plugins
25+
!.yarn/releases
26+
!.yarn/sdks
27+
!.yarn/versions
2028
.DS_Store
2129
.vscode/launch.json
2230

.yarnrc.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nodeLinker: node-modules

package.json

+4-9
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"test:integration:legacy:since:release": "yarn test:e2e:legacy:since:release",
4545
"test:protocols": "yarn build:protocols && lerna run test --scope '@aws-sdk/aws-protocoltests-*'",
4646
"test:server-protocols": "yarn build:server-protocols && lerna run test --scope '@aws-sdk/*-server'",
47-
"test:size": "cd scripts/benchmark-size/runner && yarn && ts-node ./cli.ts",
47+
"test:size": "cd scripts/benchmark-size/runner && yarn && npx tsx ./cli.ts",
4848
"test:unit": "make test-unit",
4949
"test:versions": "jest --config tests/versions/jest.config.js tests/versions/index.spec.ts",
5050
"update:versions:default": "node --es-module-specifier-resolution=node ./scripts/update-versions/default.mjs",
@@ -102,16 +102,15 @@
102102
"rimraf": "3.0.2",
103103
"ts-jest": "29.1.1",
104104
"ts-loader": "9.4.2",
105-
"ts-node": "10.9.1",
105+
"tsx": "4.19.2",
106106
"turbo": "2.1.2",
107107
"typescript": "~4.9.5",
108108
"verdaccio": "5.25.0",
109109
"vite": "4.5.5",
110110
"vitest": "0.34.6",
111111
"webpack": "5.76.0",
112112
"webpack-cli": "4.10.0",
113-
"yargs": "17.5.1",
114-
"yarn": "1.22.13"
113+
"yargs": "17.5.1"
115114
},
116115
"overrides": {
117116
"vite": "4.5.5"
@@ -125,10 +124,6 @@
125124
"lib/*",
126125
"packages/*",
127126
"private/*"
128-
],
129-
"nohoist": [
130-
"**/@aws-sdk/client-sso/**",
131-
"**/@babel/**"
132127
]
133128
},
134129
"husky": {
@@ -144,5 +139,5 @@
144139
],
145140
"**/*.{ts,js,md,json}": "prettier --write"
146141
},
147-
"packageManager": "yarn@1.22.22"
142+
"packageManager": "yarn@4.5.1"
148143
}

packages/credential-provider-web-identity/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"test:watch": "vitest watch"
1717
},
1818
"browser": {
19-
"./dist-es/fromTokenFile": false,
20-
"./dist-cjs/fromTokenFile": false
19+
"./dist-cjs/fromTokenFile": false,
20+
"./dist-es/fromTokenFile": false
2121
},
2222
"react-native": {
2323
"./dist-es/fromTokenFile": false,

packages/util-dns/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
"directory": "packages/util-dns"
5959
},
6060
"browser": {
61-
"./dist-es/index": "./dist-es/index.browser",
6261
"./dist-es/HostResolver": "./dist-es/HostResolver.browser",
63-
"./dist-es/NodeDnsLookupHostResolver": false
62+
"./dist-es/NodeDnsLookupHostResolver": false,
63+
"./dist-es/index": "./dist-es/index.browser"
6464
},
6565
"react-native": {
6666
"./dist-es/index": "./dist-es/index.browser",

scripts/benchmark-size/runner/local-registry.ts

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export const localPublishChangedPackages = async (): Promise<string> => {
1717
console.info(`the package versions will be the actual version up with a patch version and preid "ci".`);
1818
await exec("yarn", ["local-publish"], {
1919
cwd: PROJECT_ROOT,
20+
stdio: "inherit",
2021
});
2122
console.info(`published ${readdirSync(join(PROJECT_ROOT, "verdaccio", "storage", "@aws-sdk")).length} packages`);
2223
return join(PROJECT_ROOT, "verdaccio", "config.yaml");
+1-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
{
22
"compilerOptions": {
3-
"module": "ESNext", // to run ts-node with ESM dependencies
3+
"module": "ESNext",
44
"target": "ESNext",
55
"moduleResolution": "node",
66
"allowSyntheticDefaultImports": true
7-
},
8-
"ts-node": {
9-
// Tell ts-node CLI to install the --loader automatically, explained below
10-
"esm": true
117
}
128
}

scripts/benchmark-size/runner/utils.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ export const sleep = (ms: number) =>
1313

1414
export const validateRuntime = async () => {
1515
try {
16-
await exec("yarn", ["--version"]);
16+
await exec("npx", ["--version"]);
1717
} catch (e) {
18-
console.error("yarn is not available, please install yarn globally");
18+
console.error("npx is not available, please install npx globally");
1919
throw e;
2020
}
2121
try {
22-
await exec("yarn", ["--silent", "lerna", "--version"], {
22+
await exec("npx", ["lerna", "--version"], {
2323
cwd: PROJECT_ROOT,
2424
});
2525
} catch (e) {

scripts/benchmark-size/runner/workspace.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export const loadWorkspacePackages = async (options?: {
4444
}
4545
}
4646

47-
const { stdout } = await exec("yarn", ["--silent", "lerna", ...args], {
47+
const { stdout } = await exec("npx", ["lerna", ...args], {
4848
cwd: PROJECT_ROOT,
4949
encoding: "utf8",
5050
});

0 commit comments

Comments
 (0)