Skip to content

[WIP5]chore(deps): enable yarn berry 3 with pnpm #3544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

[WIP5]chore(deps): enable yarn berry 3 with pnpm #3544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2537ced
chore(deps): enable yarn 3 with pnpm
AllanZhengYP Apr 14, 2022
aec5eb0
chore(karma-credential-loader): make sts client peer dependency to ma…
AllanZhengYP Apr 14, 2022
e8447e3
chore(types): add tslib dep and clean tsconfig libs
AllanZhengYP Apr 10, 2022
6524ee9
chore(deps): resolve conflicting types by add @types/node explicitly
AllanZhengYP Apr 14, 2022
3975924
chore(karma-credential-provider): resolve missing type of client-sts
AllanZhengYP Apr 14, 2022
7914e46
chore(middleware-signing): export inferred types
AllanZhengYP Apr 15, 2022
38552ae
chore: remove workspace @types/fs-extra dependency to prevent type co…
AllanZhengYP Apr 15, 2022
db372f7
chore(tsconfig): consolidate packages tsconfig lib
AllanZhengYP Apr 11, 2022
936dfd9
chore(lib): workaround ts-jest using older @types/node causing Readab…
AllanZhengYP Apr 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,14 @@ codegen/*/.classpath
codegen/*/.settings/
codegen/*/bin

benchmark/size/raw
benchmark/size/raw

# yarn without zero installs
# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
785 changes: 785 additions & 0 deletions .yarn/releases/yarn-3.2.0.cjs
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion .yarnrc
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
nodeLinker: pnpm

nmSelfReferences: true

packageExtensions:
aws-crt@*:
dependencies:
"@types/node": "*"

yarnPath: .yarn/releases/yarn-3.2.0.cjs
7 changes: 6 additions & 1 deletion lib/lib-storage/src/Upload.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { Readable } from "stream";

const sendMock = jest.fn().mockImplementation((x) => x);
const createMultipartMock = jest.fn().mockResolvedValue({
UploadId: "mockuploadId",
Expand Down Expand Up @@ -37,7 +39,6 @@ jest.mock("@aws-sdk/client-s3", () => ({
}));

import { S3 } from "@aws-sdk/client-s3";
import { Readable } from "stream";

import { Progress, Upload } from "./index";

Expand Down Expand Up @@ -155,6 +156,7 @@ describe(Upload.name, () => {
});

it("should upload using PUT when parts are smaller than one part stream", async () => {
// @ts-ignore
const streamBody = Readable.from(
(function* () {
yield params.Body;
Expand Down Expand Up @@ -253,6 +255,7 @@ describe(Upload.name, () => {
const largeBuffer = Buffer.from("#".repeat(DEFAULT_PART_SIZE + 10));
const firstBuffer = largeBuffer.subarray(0, DEFAULT_PART_SIZE);
const secondBuffer = largeBuffer.subarray(DEFAULT_PART_SIZE);
// @ts-ignore
const streamBody = Readable.from(
(function* () {
yield largeBuffer;
Expand Down Expand Up @@ -461,6 +464,7 @@ describe(Upload.name, () => {
it("should provide progress updates multi-part stream", async () => {
const partSize = 1024 * 1024 * 5;
const largeBuffer = Buffer.from("#".repeat(partSize + 10));
// @ts-ignore
const streamBody = Readable.from(
(function* () {
yield largeBuffer;
Expand Down Expand Up @@ -518,6 +522,7 @@ describe(Upload.name, () => {
});

it("should provide progress updates empty stream", async () => {
// @ts-ignore
const stream = Readable.from((function* () {})());
const actionParams = { ...params, Body: stream };
const upload = new Upload({
Expand Down
1 change: 1 addition & 0 deletions lib/lib-storage/src/chunks/getDataReadable.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ describe(chunkFromReadable.name, () => {
streamYieldCount: number,
partsize: number
): Promise<DataPart[]> => {
// @ts-ignore
const stream = Readable.from(getUnknownEnding(streamYieldSize, streamYieldCount));
const chunks: DataPart[] = [];
const chunker = chunkFromReadable<Readable>(stream, partsize, getDataReadable);
Expand Down
22 changes: 6 additions & 16 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
"@mixer/parallel-prettier": "^2.0.1",
"@tsconfig/recommended": "1.0.1",
"@types/chai-as-promised": "^7.1.2",
"@types/fs-extra": "^8.0.1",
"@types/jest": "27.4.0",
"@typescript-eslint/eslint-plugin": "5.15.0",
"@typescript-eslint/parser": "5.15.0",
Expand Down Expand Up @@ -114,21 +113,12 @@
"webpack-cli": "^3.3.12",
"yarn": "1.22.10"
},
"workspaces": {
"packages": [
"clients/*",
"lib/*",
"packages/*",
"private/*"
],
"nohoist": [
"**/karma*",
"**/karma*/**",
"**/@types/mocha*",
"**/@types/mocha*/**",
"**/@aws-sdk/client-sso/**"
]
},
"workspaces": [
"clients/*",
"lib/*",
"packages/*",
"private/*"
],
"husky": {
"hooks": {
"pre-commit": "lint-staged",
Expand Down
2 changes: 1 addition & 1 deletion packages/abort-controller/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es5", "es2015.collection"],

"outDir": "dist-es",
"rootDir": "src",
"stripInternal": true
Expand Down
2 changes: 1 addition & 1 deletion packages/body-checksum-browser/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["dom", "es5", "es2015.promise", "es2015.collection", "es2015.iterable", "es2015.symbol.wellknown"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
1 change: 1 addition & 0 deletions packages/body-checksum-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"@aws-crypto/sha256-js": "2.0.0",
"@aws-sdk/util-utf8-node": "*",
"@tsconfig/recommended": "1.0.1",
"@types/node": "^12.0.0",
"concurrently": "7.0.0",
"downlevel-dts": "0.7.0",
"rimraf": "3.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/body-checksum-node/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es5", "es2015.promise", "es2015.collection", "es2015.iterable", "es2015.symbol.wellknown"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/chunked-blob-reader-native/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["dom", "es5", "es2015.promise", "es2015.collection", "es2015.iterable", "es2015.symbol.wellknown"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/chunked-blob-reader/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["dom", "es5", "es2015.promise", "es2015.collection", "es2015.iterable", "es2015.symbol.wellknown"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
1 change: 1 addition & 0 deletions packages/config-resolver/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"devDependencies": {
"@aws-sdk/node-config-provider": "*",
"@tsconfig/recommended": "1.0.1",
"@types/node": "^12.0.0",
"concurrently": "7.0.0",
"downlevel-dts": "0.7.0",
"rimraf": "3.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/config-resolver/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es5", "es2015.promise", "es2015.collection", "es2015.iterable", "es2015.symbol.wellknown"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/core-packages-documentation-generator/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"compilerOptions": {
"baseUrl": ".",
"experimentalDecorators": true,
"lib": ["es2015"],

"outDir": "dist-es",
"pretty": true,
"rootDir": "src",
Expand Down
2 changes: 1 addition & 1 deletion packages/credential-provider-cognito-identity/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["dom", "es5", "es2015.promise", "es2015.collection", "es2015.iterable", "es2015.symbol.wellknown"],

"noUnusedLocals": true,
"outDir": "dist-es",
"rootDir": "src"
Expand Down
2 changes: 1 addition & 1 deletion packages/credential-provider-env/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es5", "es2015.promise", "es2015.collection"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/credential-provider-imds/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es5", "es2015.promise", "es2015.collection"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/credential-provider-ini/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es5", "es2015.promise", "es2015.collection"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/credential-provider-process/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es5", "es2015.promise", "es2015.collection"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/credential-provider-sso/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es5", "es2015.promise", "es2015.collection"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/credential-provider-web-identity/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es5", "es2015.promise", "es2015.collection"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/credential-providers/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es5", "es2015.promise", "es2015.collection"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/endpoint-cache/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es5", "es2015.promise", "es2015.iterable"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/eventstream-handler-node/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es2018.asynciterable"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/eventstream-marshaller/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es5", "es2015.promise", "es2015.collection", "es2015.iterable", "es2015.symbol.wellknown"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/eventstream-serde-browser/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es2018.asynciterable", "DOM"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/eventstream-serde-config-resolver/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es2018.asynciterable"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/eventstream-serde-node/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es2018.asynciterable"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/eventstream-serde-universal/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es2018.asynciterable"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/fetch-http-handler/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["dom", "es5", "es2015.promise", "es2015.iterable"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/hash-blob-browser/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["dom", "es5", "es2015.promise", "es2015.collection", "es2015.iterable", "es2015.symbol.wellknown"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/invalid-dependency/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es5", "es2015.promise", "es2015.collection", "es2015.iterable", "es2015.symbol.wellknown"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/is-array-buffer/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es5", "es2015.collection"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/karma-credential-loader/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@aws-sdk/client-sts": "file:../../clients/client-sts",
"@aws-sdk/client-sts": "*",
"@aws-sdk/credential-provider-node": "*",
"tslib": "^2.3.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/karma-credential-loader/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es2015"],

"outDir": "dist-es",
"rootDir": "src",
"strict": false
Expand Down
2 changes: 1 addition & 1 deletion packages/md5-js/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["es5", "es2015.promise", "es2015.collection", "es2015.iterable", "es2015.symbol.wellknown"],

"outDir": "dist-es",
"rootDir": "src"
},
Expand Down
Loading