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

Jump to bottom

fix(@aws-amplify/datastore): nextjs/swc broken build workaround #10765

Merged
merged 8 commits into from
Dec 13, 2022
Merged

fix(@aws-amplify/datastore): nextjs/swc broken build workaround #10765

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
78c8826
added nextjs integ tests; expecting failure in '-basic' (#10759)
svidgen Dec 9, 2022
8328a52
fixed nextjs circleci framework propr
svidgen Dec 9, 2022
6b98262
fixed sample names in ds nextjs tests
svidgen Dec 12, 2022
054fa60
fix SWC build issue, remove TS v of next/SWC test for later debug
svidgen Dec 12, 2022
0bb78c0
remove nextjs TS variant integ for real this time
svidgen Dec 12, 2022
d8463d4
switched integs back to main
svidgen Dec 12, 2022
04fd549
fully removed next13 TS app from config; renamed other next13 integs …
svidgen Dec 12, 2022
2e8ccee
Merge branch 'main' into ds-nextjs-workaround
svidgen Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
55 changes: 54 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,6 +1354,40 @@ jobs:
spec: nested-predicate
browser: << parameters.browser >>

integ_next_datastore_13_basic:
parameters:
browser:
type: string
executor: js-test-executor
<<: *test_env_vars
working_directory: ~/amplify-js-samples-staging/samples/next/datastore/next-13-basic
steps:
- prepare_test_env
- integ_test_js:
test_name: 'DataStore - Nextjs 13 build with SWC - basic JS app'
framework: next
category: datastore
sample_name: next-13-basic
spec: nextjs-13-basic
browser: << parameters.browser >>

integ_next_datastore_13_js:
parameters:
browser:
type: string
executor: js-test-executor
<<: *test_env_vars
working_directory: ~/amplify-js-samples-staging/samples/next/datastore/next-13-js
steps:
- prepare_test_env
- integ_test_js:
test_name: 'DataStore - Nextjs 13 build with SWC - JS app'
framework: next
category: datastore
sample_name: next-13-js
spec: nextjs-13
browser: << parameters.browser >>

deploy:
executor: macos-executor
working_directory: ~/amplify-js
Expand Down Expand Up @@ -1910,7 +1944,24 @@ workflows:
matrix:
parameters:
<<: *test_browsers

- integ_next_datastore_13_basic:
requires:
- integ_setup
- build
filters:
<<: *releasable_branches
matrix:
parameters:
<<: *test_browsers
- integ_next_datastore_13_js:
requires:
- integ_setup
- build
filters:
<<: *releasable_branches
matrix:
parameters:
<<: *test_browsers
- deploy:
filters:
<<: *releasable_branches
Expand Down Expand Up @@ -1970,6 +2021,8 @@ workflows:
- integ_react_api_reconnect
- integ_react_datastore_selective_sync
- integ_react_datastore_nested_predicate
- integ_next_datastore_13_basic
- integ_next_datastore_13_js
- post_release:
filters:
branches:
Expand Down
2 changes: 1 addition & 1 deletion packages/datastore/src/datastore/datastore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ const createModelClass = <T extends PersistentModel>(
throw new Error(msg);
}

let patches;
let patches: Patch[] = [];
const model = produce(
source,
draft => {
Expand Down