From f871d7105cd3796be9f272940a61c91057480d1c Mon Sep 17 00:00:00 2001 From: David McAfee Date: Mon, 4 Mar 2024 20:21:46 -0800 Subject: [PATCH 1/9] fix(data): update datastore-storage-adapter subpaths --- .../aws-amplify/datastore-storage-adapter/package.json | 8 ++++++++ packages/aws-amplify/package.json | 6 ++++++ 2 files changed, 14 insertions(+) create mode 100644 packages/aws-amplify/datastore-storage-adapter/package.json diff --git a/packages/aws-amplify/datastore-storage-adapter/package.json b/packages/aws-amplify/datastore-storage-adapter/package.json new file mode 100644 index 00000000000..e39a97d270d --- /dev/null +++ b/packages/aws-amplify/datastore-storage-adapter/package.json @@ -0,0 +1,8 @@ +{ + "name": "aws-amplify/datastore-storage-adapter", + "main": "../dist/cjs/datastore-storage-adapter/index.js", + "react-native": "../src/datastore-storage-adapter/index.ts", + "browser": "../dist/esm/datastore-storage-adapter/index.mjs", + "module": "../dist/esm/datastore-storage-adapter/index.mjs", + "typings": "../dist/esm/datastore-storage-adapter/index.d.ts" +} diff --git a/packages/aws-amplify/package.json b/packages/aws-amplify/package.json index ef74d972717..161640ec78d 100644 --- a/packages/aws-amplify/package.json +++ b/packages/aws-amplify/package.json @@ -53,6 +53,12 @@ "require": "./dist/cjs/datastore/index.js", "react-native": "./src/datastore/index.ts" }, + "./datastore-storage-adapter": { + "types": "./dist/esm/datastore-storage-adapter/index.d.ts", + "import": "./dist/esm/datastore-storage-adapter/index.mjs", + "require": "./dist/cjs/datastore-storage-adapter/index.js", + "react-native": "./src/datastore-storage-adapter/index.ts" + }, "./auth/cognito": { "types": "./dist/esm/auth/cognito/index.d.ts", "import": "./dist/esm/auth/cognito/index.mjs", From 389cb1daa37993adb7611f79845187e3d04f68be Mon Sep 17 00:00:00 2001 From: David McAfee Date: Mon, 4 Mar 2024 20:26:20 -0800 Subject: [PATCH 2/9] run against E2E tests --- .github/workflows/push-preid-release.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/push-preid-release.yml b/.github/workflows/push-preid-release.yml index 9837290ed14..c6868cae262 100644 --- a/.github/workflows/push-preid-release.yml +++ b/.github/workflows/push-preid-release.yml @@ -9,7 +9,7 @@ on: push: branches: # Change this to your branch name where "example-preid" corresponds to the preid you want your changes released on - - feat/example-preid-branch/main + - ds-storage-adapter-subpath jobs: e2e: @@ -25,14 +25,13 @@ jobs: run: echo "preid=$(echo $BRANCH | tr -cd '[:alnum:]_\-/.' | cut -d \/ -f 2)" >> $GITHUB_OUTPUT outputs: preid: ${{ steps.output_preid.outputs.preid }} - - preid-release: - needs: - - e2e - - parse-preid - secrets: inherit - uses: ./.github/workflows/callable-npm-publish-preid.yml - # The preid should be detected from the branch name recommending feat/{PREID}/whatever as branch naming pattern - # if your branch doesn't follow this pattern, you can override it here for your branch. - with: - preid: ${{ needs.parse-preid.outputs.preid }} +# preid-release: +# needs: +# - e2e +# - parse-preid +# secrets: inherit +# uses: ./.github/workflows/callable-npm-publish-preid.yml +# # The preid should be detected from the branch name recommending feat/{PREID}/whatever as branch naming pattern +# # if your branch doesn't follow this pattern, you can override it here for your branch. +# with: +# preid: ${{ needs.parse-preid.outputs.preid }} From 01bfd831b3d7a7321cf820920cf9d01d5cdec908 Mon Sep 17 00:00:00 2001 From: David McAfee Date: Mon, 4 Mar 2024 22:11:55 -0800 Subject: [PATCH 3/9] empty commit From 7ce5f046663574affc2d0e225f863705b4a63488 Mon Sep 17 00:00:00 2001 From: David McAfee Date: Mon, 4 Mar 2024 22:12:09 -0800 Subject: [PATCH 4/9] empty commit From 1f7b01f0323bae5ec7606f18b7b3ea0c1c452200 Mon Sep 17 00:00:00 2001 From: David McAfee Date: Mon, 4 Mar 2024 22:18:29 -0800 Subject: [PATCH 5/9] revert temp config to run tests in pipeline --- .github/workflows/push-preid-release.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/push-preid-release.yml b/.github/workflows/push-preid-release.yml index c6868cae262..9837290ed14 100644 --- a/.github/workflows/push-preid-release.yml +++ b/.github/workflows/push-preid-release.yml @@ -9,7 +9,7 @@ on: push: branches: # Change this to your branch name where "example-preid" corresponds to the preid you want your changes released on - - ds-storage-adapter-subpath + - feat/example-preid-branch/main jobs: e2e: @@ -25,13 +25,14 @@ jobs: run: echo "preid=$(echo $BRANCH | tr -cd '[:alnum:]_\-/.' | cut -d \/ -f 2)" >> $GITHUB_OUTPUT outputs: preid: ${{ steps.output_preid.outputs.preid }} -# preid-release: -# needs: -# - e2e -# - parse-preid -# secrets: inherit -# uses: ./.github/workflows/callable-npm-publish-preid.yml -# # The preid should be detected from the branch name recommending feat/{PREID}/whatever as branch naming pattern -# # if your branch doesn't follow this pattern, you can override it here for your branch. -# with: -# preid: ${{ needs.parse-preid.outputs.preid }} + + preid-release: + needs: + - e2e + - parse-preid + secrets: inherit + uses: ./.github/workflows/callable-npm-publish-preid.yml + # The preid should be detected from the branch name recommending feat/{PREID}/whatever as branch naming pattern + # if your branch doesn't follow this pattern, you can override it here for your branch. + with: + preid: ${{ needs.parse-preid.outputs.preid }} From 3183f43d2c4aa2e20196e33579b2cd61a45b26ac Mon Sep 17 00:00:00 2001 From: David McAfee Date: Tue, 5 Mar 2024 13:51:23 -0800 Subject: [PATCH 6/9] subpath update --- packages/aws-amplify/package.json | 6 ------ packages/datastore-storage-adapter/package.json | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/aws-amplify/package.json b/packages/aws-amplify/package.json index 161640ec78d..ef74d972717 100644 --- a/packages/aws-amplify/package.json +++ b/packages/aws-amplify/package.json @@ -53,12 +53,6 @@ "require": "./dist/cjs/datastore/index.js", "react-native": "./src/datastore/index.ts" }, - "./datastore-storage-adapter": { - "types": "./dist/esm/datastore-storage-adapter/index.d.ts", - "import": "./dist/esm/datastore-storage-adapter/index.mjs", - "require": "./dist/cjs/datastore-storage-adapter/index.js", - "react-native": "./src/datastore-storage-adapter/index.ts" - }, "./auth/cognito": { "types": "./dist/esm/auth/cognito/index.d.ts", "import": "./dist/esm/auth/cognito/index.mjs", diff --git a/packages/datastore-storage-adapter/package.json b/packages/datastore-storage-adapter/package.json index fd86e607121..85807032f36 100644 --- a/packages/datastore-storage-adapter/package.json +++ b/packages/datastore-storage-adapter/package.json @@ -43,5 +43,13 @@ "react-native-sqlite-storage": "5.0.0", "sqlite3": "^5.0.2", "typescript": "5.0.2" + }, + "exports": { + ".": { + "types": "./dist/esm/index.d.ts", + "import": "./dist/esm/index.mjs", + "require": "./dist/cjs/index.js" + }, + "./package.json": "./package.json" } } From 5b2bded4330349de41dabdee3a3960294b88401b Mon Sep 17 00:00:00 2001 From: David McAfee Date: Tue, 5 Mar 2024 14:00:25 -0800 Subject: [PATCH 7/9] add additional package.json --- .../ExpoSQLiteAdapter/package.json | 8 ++++++++ .../datastore-storage-adapter/SQLiteAdapter/package.json | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 packages/datastore-storage-adapter/ExpoSQLiteAdapter/package.json create mode 100644 packages/datastore-storage-adapter/SQLiteAdapter/package.json diff --git a/packages/datastore-storage-adapter/ExpoSQLiteAdapter/package.json b/packages/datastore-storage-adapter/ExpoSQLiteAdapter/package.json new file mode 100644 index 00000000000..f6da71976e0 --- /dev/null +++ b/packages/datastore-storage-adapter/ExpoSQLiteAdapter/package.json @@ -0,0 +1,8 @@ +{ + "name": "@aws-amplify/datastore-storage-adapter/ExpoSQLiteAdapter", + "types": "../dist/esm/ExpoSQLiteAdapter/ExpoSQLiteAdapter.d.ts", + "main": "../dist/cjs/ExpoSQLiteAdapter/ExpoSQLiteAdapter.js", + "module": "../dist/esm/ExpoSQLiteAdapter/ExpoSQLiteAdapter.mjs", + "react-native": "../src/ExpoSQLiteAdapter/ExpoSQLiteAdapter.ts", + "sideEffects": false +} diff --git a/packages/datastore-storage-adapter/SQLiteAdapter/package.json b/packages/datastore-storage-adapter/SQLiteAdapter/package.json new file mode 100644 index 00000000000..f57a0591218 --- /dev/null +++ b/packages/datastore-storage-adapter/SQLiteAdapter/package.json @@ -0,0 +1,8 @@ +{ + "name": "@aws-amplify/datastore-storage-adapter/SQLiteAdapter", + "types": "../dist/esm/SQLiteAdapter/SQLiteAdapter.d.ts", + "main": "../dist/cjs/SQLiteAdapter/SQLiteAdapter.js", + "module": "../dist/esm/SQLiteAdapter/SQLiteAdapter.mjs", + "react-native": "../src/SQLiteAdapter/SQLiteAdapter.ts", + "sideEffects": false +} From 2e414218923f51ca2cfc64d20855639ee5f7548c Mon Sep 17 00:00:00 2001 From: David McAfee Date: Tue, 5 Mar 2024 14:01:25 -0800 Subject: [PATCH 8/9] remove top-level package.json --- .../aws-amplify/datastore-storage-adapter/package.json | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 packages/aws-amplify/datastore-storage-adapter/package.json diff --git a/packages/aws-amplify/datastore-storage-adapter/package.json b/packages/aws-amplify/datastore-storage-adapter/package.json deleted file mode 100644 index e39a97d270d..00000000000 --- a/packages/aws-amplify/datastore-storage-adapter/package.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "aws-amplify/datastore-storage-adapter", - "main": "../dist/cjs/datastore-storage-adapter/index.js", - "react-native": "../src/datastore-storage-adapter/index.ts", - "browser": "../dist/esm/datastore-storage-adapter/index.mjs", - "module": "../dist/esm/datastore-storage-adapter/index.mjs", - "typings": "../dist/esm/datastore-storage-adapter/index.d.ts" -} From 456f28c9a494c580683c229b4de4e549e52e88d0 Mon Sep 17 00:00:00 2001 From: David McAfee Date: Tue, 5 Mar 2024 16:30:39 -0800 Subject: [PATCH 9/9] add shim files --- packages/datastore-storage-adapter/package.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/datastore-storage-adapter/package.json b/packages/datastore-storage-adapter/package.json index 85807032f36..17a236d0d11 100644 --- a/packages/datastore-storage-adapter/package.json +++ b/packages/datastore-storage-adapter/package.json @@ -44,6 +44,14 @@ "sqlite3": "^5.0.2", "typescript": "5.0.2" }, + "files": [ + "dist/cjs", + "dist/esm", + "dist/umd", + "src", + "SQLiteAdapter", + "ExpoSQLiteAdapter" + ], "exports": { ".": { "types": "./dist/esm/index.d.ts",