Skip to content
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

support jest 26 cjs loading of packages #286

Merged
merged 7 commits into from
Sep 25, 2023
Merged

support jest 26 cjs loading of packages #286

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bbb228c
support jest cjs loading of packages
edwardfoyle Sep 23, 2023
62c5783
add changeset
edwardfoyle Sep 23, 2023
1e9cf71
fix linting
edwardfoyle Sep 23, 2023
37d5e51
fix linting
edwardfoyle Sep 23, 2023
49b6d81
update package lock
edwardfoyle Sep 25, 2023
442d1d1
Merge remote-tracking branch 'origin/main' into cjs-loading
edwardfoyle Sep 25, 2023
ba74158
Merge remote-tracking branch 'origin/main' into cjs-loading
edwardfoyle Sep 25, 2023
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
6 changes: 6 additions & 0 deletions .changeset/chilly-tables-pump.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@aws-amplify/backend-output-schemas': patch
'@aws-amplify/backend-output-storage': patch
---

Add "main" field to package.json to support CJS loaders
16 changes: 11 additions & 5 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/backend-auth/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"update:api": "api-extractor run --local"
},
"dependencies": {
"@aws-amplify/backend-output-storage": "0.1.0",
"@aws-amplify/auth-construct-alpha": "^0.2.0-alpha.5"
},
"devDependencies": {
Expand Down
1 change: 1 addition & 0 deletions packages/backend-auth/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"extends": "../../tsconfig.base.json",
"compilerOptions": { "rootDir": "src", "outDir": "lib" },
"references": [
{ "path": "../backend-output-storage" },
{ "path": "../auth-construct" },
{ "path": "../backend" },
{ "path": "../plugin-types" }
Expand Down
1 change: 1 addition & 0 deletions packages/backend-function/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"update:api": "api-extractor run --local"
},
"dependencies": {
"@aws-amplify/backend-output-storage": "0.1.0",
"@aws-amplify/function-construct-alpha": "^0.1.1-alpha.1",
"execa": "^7.1.1"
},
Expand Down
1 change: 1 addition & 0 deletions packages/backend-function/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"extends": "../../tsconfig.base.json",
"compilerOptions": { "rootDir": "src", "outDir": "lib" },
"references": [
{ "path": "../backend-output-storage" },
{ "path": "../function-construct" },
{ "path": "../backend" },
{ "path": "../plugin-types" }
Expand Down
1 change: 1 addition & 0 deletions packages/backend-graphql/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"constructs": "^10.0.0"
},
"dependencies": {
"@aws-amplify/backend-output-storage": "0.1.0",
"@aws-amplify/backend-output-schemas": "^0.2.0-alpha.2",
"@aws-amplify/graphql-construct-alpha": "^0.6.2"
}
Expand Down
1 change: 1 addition & 0 deletions packages/backend-graphql/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"extends": "../../tsconfig.base.json",
"compilerOptions": { "rootDir": "src", "outDir": "lib" },
"references": [
{ "path": "../backend-output-storage" },
{ "path": "../backend-output-schemas" },
{ "path": "../backend" },
{ "path": "../plugin-types" }
Expand Down
1 change: 1 addition & 0 deletions packages/backend-output-schemas/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"require": "./lib/storage/index.js"
}
},
"main": "lib/index.js",
"types": "lib/index.d.ts",
"scripts": {
"update:api": "api-extractor run --local"
Expand Down
4 changes: 4 additions & 0 deletions packages/backend-output-storage/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@
"require": "./lib/index.js"
}
},
"main": "lib/index.js",
"types": "lib/index.d.ts",
"scripts": {
"update:api": "api-extractor run --local"
},
"dependencies": {
"@aws-amplify/backend-output-schemas": "^0.2.0-alpha.2"
},
"peerDependencies": {
"aws-cdk-lib": "^2.80.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/backend-output-storage/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": { "rootDir": "src", "outDir": "lib" },
"references": []
"references": [{ "path": "../backend-output-schemas" }]
}
1 change: 1 addition & 0 deletions packages/deployed-backend-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"update:api": "api-extractor run --local"
},
"dependencies": {
"@aws-amplify/backend-output-schemas": "^0.2.0-alpha.2",
"@aws-sdk/client-amplify": "^3.414.0",
"@aws-sdk/client-cloudformation": "^3.414.0",
"@aws-sdk/types": "^3.413.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/deployed-backend-client/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": { "rootDir": "src", "outDir": "lib" },
"references": []
"references": [{ "path": "../backend-output-schemas" }]
}