From 2055ae1b8c9cce7e068ed63693ebaba54adbf7fe Mon Sep 17 00:00:00 2001 From: Allan Zheng Date: Thu, 17 Nov 2022 11:33:33 -0800 Subject: [PATCH 01/11] chore: update webpack deps to latest --- package.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 137b1d79740..a142f71a280 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "@types/lodash": "4.14.182", "@types/node": "^8.9.5", "@types/puppeteer": "1.3.0", - "babel-loader": "^8.0.0", + "babel-loader": "^8.3.0", "codecov": "^3.6.5", "compression-webpack-plugin": "^1.1.3", "cypress": "^3.2.0", @@ -92,7 +92,8 @@ "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-typescript": "^1.0.0", "size-limit": "^8.1.0", - "source-map-loader": "^0.2.1", + "source-map-loader": "^3.0.2", + "terser-webpack-plugin": "^5.3.6", "ts-jest": "^24.x.x", "tslint": "^5.7.0", "tslint-config-airbnb": "^5.8.0", @@ -101,9 +102,9 @@ "typescript-coverage-report": "^0.6.4", "uglifyjs-webpack-plugin": "^0.4.6", "uuid-validate": "^0.0.3", - "webpack": "^4.32.0", - "webpack-bundle-analyzer": "^3.3.2", - "webpack-cli": "^3.1.0", + "webpack": "^5.75.0", + "webpack-bundle-analyzer": "^4.7.0", + "webpack-cli": "^5.0.0", "winston": "^3.2.1", "wml": "0.0.83" }, From 2fe3acf9263055105da9609a0f376bc95e6ba770 Mon Sep 17 00:00:00 2001 From: Allan Zheng Date: Thu, 17 Nov 2022 12:35:14 -0800 Subject: [PATCH 02/11] test: prepare integration test over dist folder --- .circleci/config.yml | 1 + packages/analytics/package.json | 4 ++-- packages/api-graphql/package.json | 4 ++-- packages/api-rest/package.json | 4 ++-- packages/api/package.json | 4 ++-- packages/auth/package.json | 4 ++-- packages/aws-amplify/package.json | 4 ++-- packages/cache/package.json | 4 ++-- packages/core/package.json | 4 ++-- packages/datastore-storage-adapter/package.json | 2 +- packages/datastore/package.json | 4 ++-- packages/geo/package.json | 4 ++-- packages/interactions/package.json | 4 ++-- packages/notifications/package.json | 4 ++-- packages/predictions/package.json | 4 ++-- packages/pubsub/package.json | 4 ++-- packages/pushnotification/package.json | 2 +- packages/storage/package.json | 4 ++-- packages/xr/package.json | 4 ++-- 19 files changed, 35 insertions(+), 34 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a7abd937a83..a53d440c1df 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1575,6 +1575,7 @@ releasable_branches: &releasable_branches - 1.0-stable - geo/main - in-app-messaging/main + - feat/webpack5-build-scripts # List of test browsers that are always used in every E2E test. Tests that aren't expected to interact with browser APIs # should use `minimal_browser_list` to keep test execution time low. diff --git a/packages/analytics/package.json b/packages/analytics/package.json index 0afc9a84df2..c6197ce1459 100644 --- a/packages/analytics/package.json +++ b/packages/analytics/package.json @@ -3,7 +3,7 @@ "version": "6.0.14", "description": "Analytics category of aws-amplify", "main": "./lib/index.js", - "module": "./lib-esm/index.js", + "module": "./dist/aws-amplify-analytics.js", "typings": "./lib-esm/index.d.ts", "sideEffects": [ "./lib/Analytics.js", @@ -42,7 +42,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ + "files": [ "dist", "lib", "lib-esm", "src" diff --git a/packages/api-graphql/package.json b/packages/api-graphql/package.json index d1c1ff2eb5a..1bdc72bd0a1 100644 --- a/packages/api-graphql/package.json +++ b/packages/api-graphql/package.json @@ -3,7 +3,7 @@ "version": "3.1.2", "description": "Api-graphql category of aws-amplify", "main": "./lib/index.js", - "module": "./lib-esm/index.js", + "module": "./dist/aws-amplify-api-graphql.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -43,7 +43,7 @@ "devDependencies": { "@types/zen-observable": "^0.8.0" }, - "files": [ + "files": [ "dist", "lib", "lib-esm", "src" diff --git a/packages/api-rest/package.json b/packages/api-rest/package.json index fe22c310be6..0fb4ccb29f6 100644 --- a/packages/api-rest/package.json +++ b/packages/api-rest/package.json @@ -3,7 +3,7 @@ "version": "3.0.14", "description": "Api-rest category of aws-amplify", "main": "./lib/index.js", - "module": "./lib-esm/index.js", + "module": "./dist/aws-amplify-api-rest.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -40,7 +40,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ + "files": [ "dist", "lib", "lib-esm", "src" diff --git a/packages/api/package.json b/packages/api/package.json index 38696ada8d9..91886e5c3a7 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -3,7 +3,7 @@ "version": "5.0.14", "description": "Api category of aws-amplify", "main": "./lib/index.js", - "module": "./lib-esm/index.js", + "module": "./dist/aws-amplify-api.js", "typings": "./lib-esm/index.d.ts", "typesVersions": { "<3.8": { @@ -50,7 +50,7 @@ "devDependencies": { "@types/zen-observable": "^0.8.0" }, - "files": [ + "files": [ "dist", "lib", "lib-esm", "src", diff --git a/packages/auth/package.json b/packages/auth/package.json index b26e838acb6..7325d92d58e 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -3,7 +3,7 @@ "version": "5.1.8", "description": "Auth category of aws-amplify", "main": "./lib/index.js", - "module": "./lib-esm/index.js", + "module": "./dist/aws-amplify-auth.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -40,7 +40,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ + "files": [ "dist", "lib", "lib-esm", "src" diff --git a/packages/aws-amplify/package.json b/packages/aws-amplify/package.json index c783602e6d4..fa92f27ca0e 100644 --- a/packages/aws-amplify/package.json +++ b/packages/aws-amplify/package.json @@ -3,7 +3,7 @@ "version": "5.0.14", "description": "AWS Amplify is a JavaScript library for Frontend and mobile developers building cloud-enabled applications.", "main": "./lib/index.js", - "module": "./lib-esm/index.js", + "module": "./dist/aws-amplify.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -34,7 +34,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ + "files": [ "dist", "lib", "lib-esm", "src" diff --git a/packages/cache/package.json b/packages/cache/package.json index 9c45905cecf..770ca33ca0f 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -3,7 +3,7 @@ "version": "5.0.14", "description": "Cache category of aws-amplify", "main": "./lib/index.js", - "module": "./lib-esm/index.js", + "module": "./dist/aws-amplify-cache.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/reactnative.js" @@ -42,7 +42,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ + "files": [ "dist", "lib", "lib-esm", "src" diff --git a/packages/core/package.json b/packages/core/package.json index bfc84840b0e..18ca068ead7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,7 +3,7 @@ "version": "5.0.14", "description": "Core category of aws-amplify", "main": "./lib/index.js", - "module": "./lib-esm/index.js", + "module": "./dist/aws-amplify-core.js", "typings": "./lib-esm/index.d.ts", "publishConfig": { "access": "public" @@ -53,7 +53,7 @@ "prepend-file": "^1.3.1", "react-native": "^0.64.1" }, - "files": [ + "files": [ "dist", "lib", "lib-esm", "src", diff --git a/packages/datastore-storage-adapter/package.json b/packages/datastore-storage-adapter/package.json index 25955c37b0a..3023cd10389 100644 --- a/packages/datastore-storage-adapter/package.json +++ b/packages/datastore-storage-adapter/package.json @@ -3,7 +3,7 @@ "version": "2.0.14", "description": "SQLite storage adapter for Amplify DataStore ", "main": "./lib/index.js", - "module": "./lib-esm/index.js", + "module": "./dist/aws-amplify-datastore-storage-adapter.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" diff --git a/packages/datastore/package.json b/packages/datastore/package.json index 89e5315c240..9f5237c88a7 100644 --- a/packages/datastore/package.json +++ b/packages/datastore/package.json @@ -3,7 +3,7 @@ "version": "4.0.14", "description": "AppSyncLocal support for aws-amplify", "main": "./lib/index.js", - "module": "./lib-esm/index.js", + "module": "./dist/aws-amplify-datastore.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -48,7 +48,7 @@ "dexie-export-import": "1.0.3", "fake-indexeddb": "3.0.0" }, - "files": [ + "files": [ "dist", "lib", "lib-esm", "src", diff --git a/packages/geo/package.json b/packages/geo/package.json index 33e9e242d06..43ece953aab 100644 --- a/packages/geo/package.json +++ b/packages/geo/package.json @@ -3,7 +3,7 @@ "version": "2.0.14", "description": "Geo category for aws-amplify", "main": "./lib/index.js", - "module": "./lib-esm/index.js", + "module": "./dist/aws-amplify-geo.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -40,7 +40,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ + "files": [ "dist", "lib", "lib-esm", "src" diff --git a/packages/interactions/package.json b/packages/interactions/package.json index 016eef6728d..35225643aa0 100644 --- a/packages/interactions/package.json +++ b/packages/interactions/package.json @@ -3,7 +3,7 @@ "version": "5.0.14", "description": "Interactions category of aws-amplify", "main": "./lib/index.js", - "module": "./lib-esm/index.js", + "module": "./dist/aws-amplify-interactions.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -40,7 +40,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ + "files": [ "dist", "lib", "lib-esm", "src" diff --git a/packages/notifications/package.json b/packages/notifications/package.json index 9ae8d462547..61d3920bd4e 100644 --- a/packages/notifications/package.json +++ b/packages/notifications/package.json @@ -3,7 +3,7 @@ "version": "1.0.14", "description": "Notifications category of aws-amplify", "main": "./lib/index.js", - "module": "./lib-esm/index.js", + "module": "./dist/aws-amplify-notifications.js", "typings": "./lib-esm/index.d.ts", "sideEffects": [ "./lib/Notifications.js", @@ -41,7 +41,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://docs.amplify.aws/", - "files": [ + "files": [ "dist", "lib", "lib-esm", "src" diff --git a/packages/predictions/package.json b/packages/predictions/package.json index fecad143357..119a1b779d0 100644 --- a/packages/predictions/package.json +++ b/packages/predictions/package.json @@ -3,7 +3,7 @@ "version": "5.0.14", "description": "Machine learning category of aws-amplify", "main": "./lib/index.js", - "module": "./lib-esm/index.js", + "module": "./dist/aws-amplify-predictions.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -39,7 +39,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ + "files": [ "dist", "lib", "lib-esm", "src" diff --git a/packages/pubsub/package.json b/packages/pubsub/package.json index ec18349edd5..8fb5cd24047 100644 --- a/packages/pubsub/package.json +++ b/packages/pubsub/package.json @@ -3,7 +3,7 @@ "version": "5.0.14", "description": "Pubsub category of aws-amplify", "main": "./lib/index.js", - "module": "./lib-esm/index.js", + "module": "./dist/aws-amplify-pubsub.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -44,7 +44,7 @@ "@types/zen-observable": "^0.8.0", "cpx": "^1.5.0" }, - "files": [ + "files": [ "dist", "lib", "lib-esm", "src" diff --git a/packages/pushnotification/package.json b/packages/pushnotification/package.json index a2738ba36af..6e54dd53b20 100644 --- a/packages/pushnotification/package.json +++ b/packages/pushnotification/package.json @@ -45,7 +45,7 @@ "uglifyjs-webpack-plugin": "^0.4.6", "webpack": "^3.5.5" }, - "files": [ + "files": [ "dist", "lib", "lib-esm", "src", diff --git a/packages/storage/package.json b/packages/storage/package.json index e30276213a8..941b8b64f15 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -3,7 +3,7 @@ "version": "5.1.4", "description": "Storage category of aws-amplify", "main": "./lib/index.js", - "module": "./lib-esm/index.js", + "module": "./dist/aws-amplify-storage.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -40,7 +40,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ + "files": [ "dist", "lib", "lib-esm", "src" diff --git a/packages/xr/package.json b/packages/xr/package.json index c3e0e96cb5b..c38f355fe10 100644 --- a/packages/xr/package.json +++ b/packages/xr/package.json @@ -3,7 +3,7 @@ "version": "4.0.14", "description": "XR category of aws-amplify", "main": "./lib/index.js", - "module": "./lib-esm/index.js", + "module": "./dist/aws-amplify-xr.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -40,7 +40,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ + "files": [ "dist", "lib", "lib-esm", "src" From 6daa6ab072e0642f5a4a2e7de6635f3c44c57eaa Mon Sep 17 00:00:00 2001 From: Allan Zheng Date: Thu, 17 Nov 2022 14:36:38 -0800 Subject: [PATCH 03/11] chore: add webpack externals to pass the build --- packages/api-graphql/webpack.config.js | 7 +++++-- packages/api-rest/webpack.config.js | 5 +++-- packages/api/webpack.config.js | 6 ++++-- packages/aws-amplify/webpack.config.js | 18 ++++++++++++++++++ packages/datastore/webpack.config.js | 11 ++++++++++- packages/predictions/webpack.config.js | 7 ++++++- 6 files changed, 46 insertions(+), 8 deletions(-) diff --git a/packages/api-graphql/webpack.config.js b/packages/api-graphql/webpack.config.js index 4ef247226e1..007d4f2fa0d 100644 --- a/packages/api-graphql/webpack.config.js +++ b/packages/api-graphql/webpack.config.js @@ -10,9 +10,12 @@ module.exports = { { '@aws-amplify/auth': 'aws_amplify_auth', '@aws-amplify/cache': 'aws_amplify_cache', - '@aws-amplify/core': 'aws_amplify_core' - } + '@aws-amplify/core': 'aws_amplify_core', + '@aws-amplify/api-rest': 'aws_amplify_api-rest', + '@aws-amplify/pubsub': 'aws_amplify_pubsub', + }, ], + externalsType: 'umd', output: { filename: '[name].js', path: __dirname + '/dist', diff --git a/packages/api-rest/webpack.config.js b/packages/api-rest/webpack.config.js index 8a3f43a5960..85b465dfeea 100644 --- a/packages/api-rest/webpack.config.js +++ b/packages/api-rest/webpack.config.js @@ -10,9 +10,10 @@ module.exports = { { '@aws-amplify/auth': 'aws_amplify_auth', '@aws-amplify/cache': 'aws_amplify_cache', - '@aws-amplify/core': 'aws_amplify_core' - } + '@aws-amplify/core': 'aws_amplify_core', + }, ], + externalsType: 'umd', output: { filename: '[name].js', path: __dirname + '/dist', diff --git a/packages/api/webpack.config.js b/packages/api/webpack.config.js index bf54eefe7b7..bce55792bc3 100644 --- a/packages/api/webpack.config.js +++ b/packages/api/webpack.config.js @@ -10,8 +10,10 @@ module.exports = { { '@aws-amplify/auth': 'aws_amplify_auth', '@aws-amplify/cache': 'aws_amplify_cache', - '@aws-amplify/core': 'aws_amplify_core' - } + '@aws-amplify/core': 'aws_amplify_core', + '@aws-amplify/api-graphql': 'aws_amplify_api-graphql', + '@aws-amplify/api-rest': 'aws_amplify_api-rest', + }, ], output: { filename: '[name].js', diff --git a/packages/aws-amplify/webpack.config.js b/packages/aws-amplify/webpack.config.js index c77591df09a..962fabba0c4 100644 --- a/packages/aws-amplify/webpack.config.js +++ b/packages/aws-amplify/webpack.config.js @@ -2,6 +2,24 @@ module.exports = { entry: { 'aws-amplify.min': './lib-esm/index.js', }, + externals: [ + { + '@aws-amplify/pubsub': 'aws_amplify_pubsub', + '@aws-amplify/cache': 'aws_amplify_cache', + '@aws-amplify/auth': 'aws_amplify_auth', + '@aws-amplify/core': 'aws_amplify_core', + '@aws-amplify/api': 'aws_amplify_api', + '@aws-amplify/api-graphql': 'aws_amplify_api-graphql', + '@aws-amplify/datastore': 'aws_amplify_datastore', + '@aws-amplify/interactions': 'aws_amplify_interactions', + '@aws-amplify/geo': 'aws_amplify_geo', + '@aws-amplify/storage': 'aws_amplify_storage', + '@aws-amplify/analytics': 'aws_amplify_analytics', + '@aws-amplify/predictions': 'aws_amplify_predictions', + '@aws-amplify/notifications': 'aws_amplify_notifications', + '@aws-amplify/xr': 'aws_amplify_xr', + }, + ], output: { filename: '[name].js', path: __dirname + '/dist', diff --git a/packages/datastore/webpack.config.js b/packages/datastore/webpack.config.js index 3ba43496484..1755435567b 100644 --- a/packages/datastore/webpack.config.js +++ b/packages/datastore/webpack.config.js @@ -2,7 +2,16 @@ module.exports = { entry: { 'aws-amplify-datastore.min': './lib-esm/index.js', }, - externals: [{ '@aws-amplify/pubsub': 'aws_amplify_pubsub' }], + externals: [ + { + '@aws-amplify/pubsub': 'aws_amplify_pubsub', + '@aws-amplify/cache': 'aws_amplify_cache', + '@aws-amplify/auth': 'aws_amplify_auth', + '@aws-amplify/core': 'aws_amplify_core', + '@aws-amplify/api': 'aws_amplify_api', + '@aws-amplify/api-graphql': 'aws_amplify_api-graphql', + }, + ], output: { filename: '[name].js', path: __dirname + '/dist', diff --git a/packages/predictions/webpack.config.js b/packages/predictions/webpack.config.js index de0891ee023..526ad475341 100644 --- a/packages/predictions/webpack.config.js +++ b/packages/predictions/webpack.config.js @@ -2,7 +2,12 @@ module.exports = { entry: { 'aws-amplify-predictions.min': './lib-esm/index.js', }, - externals: [{ '@aws-amplify/core': 'aws_amplify_core' }], + externals: [ + { + '@aws-amplify/core': 'aws_amplify_core', + '@aws-amplify/storage': 'aws_amplify_storage', + }, + ], output: { filename: '[name].js', path: __dirname + '/dist', From 0508ab3809045ae20a921d75b4acec77da9dc55c Mon Sep 17 00:00:00 2001 From: Allan Zheng Date: Thu, 17 Nov 2022 16:21:20 -0800 Subject: [PATCH 04/11] Revert "test: prepare integration test over dist folder" This reverts commit 7a494677f2769c70925f094727027efbdf7f7070. --- packages/analytics/package.json | 4 ++-- packages/api-graphql/package.json | 4 ++-- packages/api-rest/package.json | 4 ++-- packages/api/package.json | 4 ++-- packages/auth/package.json | 4 ++-- packages/aws-amplify/package.json | 4 ++-- packages/cache/package.json | 4 ++-- packages/core/package.json | 4 ++-- packages/datastore-storage-adapter/package.json | 2 +- packages/datastore/package.json | 4 ++-- packages/geo/package.json | 4 ++-- packages/interactions/package.json | 4 ++-- packages/notifications/package.json | 4 ++-- packages/predictions/package.json | 4 ++-- packages/pubsub/package.json | 4 ++-- packages/pushnotification/package.json | 2 +- packages/storage/package.json | 4 ++-- packages/xr/package.json | 4 ++-- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/packages/analytics/package.json b/packages/analytics/package.json index c6197ce1459..0afc9a84df2 100644 --- a/packages/analytics/package.json +++ b/packages/analytics/package.json @@ -3,7 +3,7 @@ "version": "6.0.14", "description": "Analytics category of aws-amplify", "main": "./lib/index.js", - "module": "./dist/aws-amplify-analytics.js", + "module": "./lib-esm/index.js", "typings": "./lib-esm/index.d.ts", "sideEffects": [ "./lib/Analytics.js", @@ -42,7 +42,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ "dist", + "files": [ "lib", "lib-esm", "src" diff --git a/packages/api-graphql/package.json b/packages/api-graphql/package.json index 1bdc72bd0a1..d1c1ff2eb5a 100644 --- a/packages/api-graphql/package.json +++ b/packages/api-graphql/package.json @@ -3,7 +3,7 @@ "version": "3.1.2", "description": "Api-graphql category of aws-amplify", "main": "./lib/index.js", - "module": "./dist/aws-amplify-api-graphql.js", + "module": "./lib-esm/index.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -43,7 +43,7 @@ "devDependencies": { "@types/zen-observable": "^0.8.0" }, - "files": [ "dist", + "files": [ "lib", "lib-esm", "src" diff --git a/packages/api-rest/package.json b/packages/api-rest/package.json index 0fb4ccb29f6..fe22c310be6 100644 --- a/packages/api-rest/package.json +++ b/packages/api-rest/package.json @@ -3,7 +3,7 @@ "version": "3.0.14", "description": "Api-rest category of aws-amplify", "main": "./lib/index.js", - "module": "./dist/aws-amplify-api-rest.js", + "module": "./lib-esm/index.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -40,7 +40,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ "dist", + "files": [ "lib", "lib-esm", "src" diff --git a/packages/api/package.json b/packages/api/package.json index 91886e5c3a7..38696ada8d9 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -3,7 +3,7 @@ "version": "5.0.14", "description": "Api category of aws-amplify", "main": "./lib/index.js", - "module": "./dist/aws-amplify-api.js", + "module": "./lib-esm/index.js", "typings": "./lib-esm/index.d.ts", "typesVersions": { "<3.8": { @@ -50,7 +50,7 @@ "devDependencies": { "@types/zen-observable": "^0.8.0" }, - "files": [ "dist", + "files": [ "lib", "lib-esm", "src", diff --git a/packages/auth/package.json b/packages/auth/package.json index 7325d92d58e..b26e838acb6 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -3,7 +3,7 @@ "version": "5.1.8", "description": "Auth category of aws-amplify", "main": "./lib/index.js", - "module": "./dist/aws-amplify-auth.js", + "module": "./lib-esm/index.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -40,7 +40,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ "dist", + "files": [ "lib", "lib-esm", "src" diff --git a/packages/aws-amplify/package.json b/packages/aws-amplify/package.json index fa92f27ca0e..c783602e6d4 100644 --- a/packages/aws-amplify/package.json +++ b/packages/aws-amplify/package.json @@ -3,7 +3,7 @@ "version": "5.0.14", "description": "AWS Amplify is a JavaScript library for Frontend and mobile developers building cloud-enabled applications.", "main": "./lib/index.js", - "module": "./dist/aws-amplify.js", + "module": "./lib-esm/index.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -34,7 +34,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ "dist", + "files": [ "lib", "lib-esm", "src" diff --git a/packages/cache/package.json b/packages/cache/package.json index 770ca33ca0f..9c45905cecf 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -3,7 +3,7 @@ "version": "5.0.14", "description": "Cache category of aws-amplify", "main": "./lib/index.js", - "module": "./dist/aws-amplify-cache.js", + "module": "./lib-esm/index.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/reactnative.js" @@ -42,7 +42,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ "dist", + "files": [ "lib", "lib-esm", "src" diff --git a/packages/core/package.json b/packages/core/package.json index 18ca068ead7..bfc84840b0e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,7 +3,7 @@ "version": "5.0.14", "description": "Core category of aws-amplify", "main": "./lib/index.js", - "module": "./dist/aws-amplify-core.js", + "module": "./lib-esm/index.js", "typings": "./lib-esm/index.d.ts", "publishConfig": { "access": "public" @@ -53,7 +53,7 @@ "prepend-file": "^1.3.1", "react-native": "^0.64.1" }, - "files": [ "dist", + "files": [ "lib", "lib-esm", "src", diff --git a/packages/datastore-storage-adapter/package.json b/packages/datastore-storage-adapter/package.json index 3023cd10389..25955c37b0a 100644 --- a/packages/datastore-storage-adapter/package.json +++ b/packages/datastore-storage-adapter/package.json @@ -3,7 +3,7 @@ "version": "2.0.14", "description": "SQLite storage adapter for Amplify DataStore ", "main": "./lib/index.js", - "module": "./dist/aws-amplify-datastore-storage-adapter.js", + "module": "./lib-esm/index.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" diff --git a/packages/datastore/package.json b/packages/datastore/package.json index 9f5237c88a7..89e5315c240 100644 --- a/packages/datastore/package.json +++ b/packages/datastore/package.json @@ -3,7 +3,7 @@ "version": "4.0.14", "description": "AppSyncLocal support for aws-amplify", "main": "./lib/index.js", - "module": "./dist/aws-amplify-datastore.js", + "module": "./lib-esm/index.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -48,7 +48,7 @@ "dexie-export-import": "1.0.3", "fake-indexeddb": "3.0.0" }, - "files": [ "dist", + "files": [ "lib", "lib-esm", "src", diff --git a/packages/geo/package.json b/packages/geo/package.json index 43ece953aab..33e9e242d06 100644 --- a/packages/geo/package.json +++ b/packages/geo/package.json @@ -3,7 +3,7 @@ "version": "2.0.14", "description": "Geo category for aws-amplify", "main": "./lib/index.js", - "module": "./dist/aws-amplify-geo.js", + "module": "./lib-esm/index.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -40,7 +40,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ "dist", + "files": [ "lib", "lib-esm", "src" diff --git a/packages/interactions/package.json b/packages/interactions/package.json index 35225643aa0..016eef6728d 100644 --- a/packages/interactions/package.json +++ b/packages/interactions/package.json @@ -3,7 +3,7 @@ "version": "5.0.14", "description": "Interactions category of aws-amplify", "main": "./lib/index.js", - "module": "./dist/aws-amplify-interactions.js", + "module": "./lib-esm/index.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -40,7 +40,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ "dist", + "files": [ "lib", "lib-esm", "src" diff --git a/packages/notifications/package.json b/packages/notifications/package.json index 61d3920bd4e..9ae8d462547 100644 --- a/packages/notifications/package.json +++ b/packages/notifications/package.json @@ -3,7 +3,7 @@ "version": "1.0.14", "description": "Notifications category of aws-amplify", "main": "./lib/index.js", - "module": "./dist/aws-amplify-notifications.js", + "module": "./lib-esm/index.js", "typings": "./lib-esm/index.d.ts", "sideEffects": [ "./lib/Notifications.js", @@ -41,7 +41,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://docs.amplify.aws/", - "files": [ "dist", + "files": [ "lib", "lib-esm", "src" diff --git a/packages/predictions/package.json b/packages/predictions/package.json index 119a1b779d0..fecad143357 100644 --- a/packages/predictions/package.json +++ b/packages/predictions/package.json @@ -3,7 +3,7 @@ "version": "5.0.14", "description": "Machine learning category of aws-amplify", "main": "./lib/index.js", - "module": "./dist/aws-amplify-predictions.js", + "module": "./lib-esm/index.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -39,7 +39,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ "dist", + "files": [ "lib", "lib-esm", "src" diff --git a/packages/pubsub/package.json b/packages/pubsub/package.json index 8fb5cd24047..ec18349edd5 100644 --- a/packages/pubsub/package.json +++ b/packages/pubsub/package.json @@ -3,7 +3,7 @@ "version": "5.0.14", "description": "Pubsub category of aws-amplify", "main": "./lib/index.js", - "module": "./dist/aws-amplify-pubsub.js", + "module": "./lib-esm/index.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -44,7 +44,7 @@ "@types/zen-observable": "^0.8.0", "cpx": "^1.5.0" }, - "files": [ "dist", + "files": [ "lib", "lib-esm", "src" diff --git a/packages/pushnotification/package.json b/packages/pushnotification/package.json index 6e54dd53b20..a2738ba36af 100644 --- a/packages/pushnotification/package.json +++ b/packages/pushnotification/package.json @@ -45,7 +45,7 @@ "uglifyjs-webpack-plugin": "^0.4.6", "webpack": "^3.5.5" }, - "files": [ "dist", + "files": [ "lib", "lib-esm", "src", diff --git a/packages/storage/package.json b/packages/storage/package.json index 941b8b64f15..e30276213a8 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -3,7 +3,7 @@ "version": "5.1.4", "description": "Storage category of aws-amplify", "main": "./lib/index.js", - "module": "./dist/aws-amplify-storage.js", + "module": "./lib-esm/index.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -40,7 +40,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ "dist", + "files": [ "lib", "lib-esm", "src" diff --git a/packages/xr/package.json b/packages/xr/package.json index c38f355fe10..c3e0e96cb5b 100644 --- a/packages/xr/package.json +++ b/packages/xr/package.json @@ -3,7 +3,7 @@ "version": "4.0.14", "description": "XR category of aws-amplify", "main": "./lib/index.js", - "module": "./dist/aws-amplify-xr.js", + "module": "./lib-esm/index.js", "typings": "./lib-esm/index.d.ts", "react-native": { "./lib/index": "./lib-esm/index.js" @@ -40,7 +40,7 @@ "url": "https://github.com/aws/aws-amplify/issues" }, "homepage": "https://aws-amplify.github.io/", - "files": [ "dist", + "files": [ "lib", "lib-esm", "src" From 9b81d553824910cdfa662d721f9dbb967fac7a7b Mon Sep 17 00:00:00 2001 From: Allan Zheng Date: Thu, 17 Nov 2022 16:23:07 -0800 Subject: [PATCH 05/11] chore(aws-amplify): only ship bundled code in aws-amplify --- packages/aws-amplify/webpack.config.js | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/packages/aws-amplify/webpack.config.js b/packages/aws-amplify/webpack.config.js index 962fabba0c4..c77591df09a 100644 --- a/packages/aws-amplify/webpack.config.js +++ b/packages/aws-amplify/webpack.config.js @@ -2,24 +2,6 @@ module.exports = { entry: { 'aws-amplify.min': './lib-esm/index.js', }, - externals: [ - { - '@aws-amplify/pubsub': 'aws_amplify_pubsub', - '@aws-amplify/cache': 'aws_amplify_cache', - '@aws-amplify/auth': 'aws_amplify_auth', - '@aws-amplify/core': 'aws_amplify_core', - '@aws-amplify/api': 'aws_amplify_api', - '@aws-amplify/api-graphql': 'aws_amplify_api-graphql', - '@aws-amplify/datastore': 'aws_amplify_datastore', - '@aws-amplify/interactions': 'aws_amplify_interactions', - '@aws-amplify/geo': 'aws_amplify_geo', - '@aws-amplify/storage': 'aws_amplify_storage', - '@aws-amplify/analytics': 'aws_amplify_analytics', - '@aws-amplify/predictions': 'aws_amplify_predictions', - '@aws-amplify/notifications': 'aws_amplify_notifications', - '@aws-amplify/xr': 'aws_amplify_xr', - }, - ], output: { filename: '[name].js', path: __dirname + '/dist', From 0145a4d676435a424f3f49133c26afef385dc822 Mon Sep 17 00:00:00 2001 From: Allan Zheng Date: Tue, 22 Nov 2022 17:02:25 -0800 Subject: [PATCH 06/11] fix: revert external update in webpack config --- packages/api-graphql/webpack.config.js | 3 --- packages/api-rest/webpack.config.js | 1 - packages/api/webpack.config.js | 2 -- packages/datastore/webpack.config.js | 11 +---------- packages/predictions/webpack.config.js | 7 +------ 5 files changed, 2 insertions(+), 22 deletions(-) diff --git a/packages/api-graphql/webpack.config.js b/packages/api-graphql/webpack.config.js index 007d4f2fa0d..18d5b7dbd59 100644 --- a/packages/api-graphql/webpack.config.js +++ b/packages/api-graphql/webpack.config.js @@ -11,11 +11,8 @@ module.exports = { '@aws-amplify/auth': 'aws_amplify_auth', '@aws-amplify/cache': 'aws_amplify_cache', '@aws-amplify/core': 'aws_amplify_core', - '@aws-amplify/api-rest': 'aws_amplify_api-rest', - '@aws-amplify/pubsub': 'aws_amplify_pubsub', }, ], - externalsType: 'umd', output: { filename: '[name].js', path: __dirname + '/dist', diff --git a/packages/api-rest/webpack.config.js b/packages/api-rest/webpack.config.js index 85b465dfeea..feb00347b27 100644 --- a/packages/api-rest/webpack.config.js +++ b/packages/api-rest/webpack.config.js @@ -13,7 +13,6 @@ module.exports = { '@aws-amplify/core': 'aws_amplify_core', }, ], - externalsType: 'umd', output: { filename: '[name].js', path: __dirname + '/dist', diff --git a/packages/api/webpack.config.js b/packages/api/webpack.config.js index bce55792bc3..cfefe634368 100644 --- a/packages/api/webpack.config.js +++ b/packages/api/webpack.config.js @@ -11,8 +11,6 @@ module.exports = { '@aws-amplify/auth': 'aws_amplify_auth', '@aws-amplify/cache': 'aws_amplify_cache', '@aws-amplify/core': 'aws_amplify_core', - '@aws-amplify/api-graphql': 'aws_amplify_api-graphql', - '@aws-amplify/api-rest': 'aws_amplify_api-rest', }, ], output: { diff --git a/packages/datastore/webpack.config.js b/packages/datastore/webpack.config.js index 1755435567b..3ba43496484 100644 --- a/packages/datastore/webpack.config.js +++ b/packages/datastore/webpack.config.js @@ -2,16 +2,7 @@ module.exports = { entry: { 'aws-amplify-datastore.min': './lib-esm/index.js', }, - externals: [ - { - '@aws-amplify/pubsub': 'aws_amplify_pubsub', - '@aws-amplify/cache': 'aws_amplify_cache', - '@aws-amplify/auth': 'aws_amplify_auth', - '@aws-amplify/core': 'aws_amplify_core', - '@aws-amplify/api': 'aws_amplify_api', - '@aws-amplify/api-graphql': 'aws_amplify_api-graphql', - }, - ], + externals: [{ '@aws-amplify/pubsub': 'aws_amplify_pubsub' }], output: { filename: '[name].js', path: __dirname + '/dist', diff --git a/packages/predictions/webpack.config.js b/packages/predictions/webpack.config.js index 526ad475341..de0891ee023 100644 --- a/packages/predictions/webpack.config.js +++ b/packages/predictions/webpack.config.js @@ -2,12 +2,7 @@ module.exports = { entry: { 'aws-amplify-predictions.min': './lib-esm/index.js', }, - externals: [ - { - '@aws-amplify/core': 'aws_amplify_core', - '@aws-amplify/storage': 'aws_amplify_storage', - }, - ], + externals: [{ '@aws-amplify/core': 'aws_amplify_core' }], output: { filename: '[name].js', path: __dirname + '/dist', From 4f2bcf625f5dcbf5004e1ca943c99d67d6fe9601 Mon Sep 17 00:00:00 2001 From: Allan Zheng Date: Wed, 30 Nov 2022 17:51:11 -0800 Subject: [PATCH 07/11] chore: remove unexpected format diffs --- packages/api-graphql/webpack.config.js | 4 ++-- packages/api-rest/webpack.config.js | 4 ++-- packages/api/webpack.config.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/api-graphql/webpack.config.js b/packages/api-graphql/webpack.config.js index 18d5b7dbd59..4ef247226e1 100644 --- a/packages/api-graphql/webpack.config.js +++ b/packages/api-graphql/webpack.config.js @@ -10,8 +10,8 @@ module.exports = { { '@aws-amplify/auth': 'aws_amplify_auth', '@aws-amplify/cache': 'aws_amplify_cache', - '@aws-amplify/core': 'aws_amplify_core', - }, + '@aws-amplify/core': 'aws_amplify_core' + } ], output: { filename: '[name].js', diff --git a/packages/api-rest/webpack.config.js b/packages/api-rest/webpack.config.js index feb00347b27..8a3f43a5960 100644 --- a/packages/api-rest/webpack.config.js +++ b/packages/api-rest/webpack.config.js @@ -10,8 +10,8 @@ module.exports = { { '@aws-amplify/auth': 'aws_amplify_auth', '@aws-amplify/cache': 'aws_amplify_cache', - '@aws-amplify/core': 'aws_amplify_core', - }, + '@aws-amplify/core': 'aws_amplify_core' + } ], output: { filename: '[name].js', diff --git a/packages/api/webpack.config.js b/packages/api/webpack.config.js index cfefe634368..bf54eefe7b7 100644 --- a/packages/api/webpack.config.js +++ b/packages/api/webpack.config.js @@ -10,8 +10,8 @@ module.exports = { { '@aws-amplify/auth': 'aws_amplify_auth', '@aws-amplify/cache': 'aws_amplify_cache', - '@aws-amplify/core': 'aws_amplify_core', - }, + '@aws-amplify/core': 'aws_amplify_core' + } ], output: { filename: '[name].js', From 0e56fd602af1c6e01c903e9a4109842d62e8a91f Mon Sep 17 00:00:00 2001 From: Allan Zheng Date: Tue, 27 Dec 2022 11:42:47 -0800 Subject: [PATCH 08/11] test(core): fix browser test detects Node environment --- packages/core/__tests__/JS-browser-runtime-test.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/packages/core/__tests__/JS-browser-runtime-test.ts b/packages/core/__tests__/JS-browser-runtime-test.ts index 9c9bc2f513b..be5a22e39f9 100644 --- a/packages/core/__tests__/JS-browser-runtime-test.ts +++ b/packages/core/__tests__/JS-browser-runtime-test.ts @@ -9,6 +9,19 @@ import { browserOrNode } from '../dist/aws-amplify-core.js'; describe('JS browserOrNode build test', () => { + // Prevent Jest test resolves Node.js version from the global `process` of the + // testing the Node.js process. + const originalVersions = process.versions; + beforeEach(() => { + //@ts-ignore + delete global.process.versions; + }); + + afterEach(() => { + //@ts-ignore + global.process.versions = originalVersions; + }); + test('when its browser ', () => { expect(browserOrNode()).toStrictEqual({ isBrowser: true, From 3637dd15c9e706184ed8804891b0403b47a61c4b Mon Sep 17 00:00:00 2001 From: Allan Zheng Date: Tue, 27 Dec 2022 18:07:09 -0800 Subject: [PATCH 09/11] chore: disable integ test --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a53d440c1df..a7abd937a83 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1575,7 +1575,6 @@ releasable_branches: &releasable_branches - 1.0-stable - geo/main - in-app-messaging/main - - feat/webpack5-build-scripts # List of test browsers that are always used in every E2E test. Tests that aren't expected to interact with browser APIs # should use `minimal_browser_list` to keep test execution time low. From 7be173987891d327e8ecbe01ea8ad92bd55604cd Mon Sep 17 00:00:00 2001 From: Allan Zheng Date: Wed, 15 Feb 2023 10:12:09 -0800 Subject: [PATCH 10/11] test: enable integ test --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index a7abd937a83..a53d440c1df 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1575,6 +1575,7 @@ releasable_branches: &releasable_branches - 1.0-stable - geo/main - in-app-messaging/main + - feat/webpack5-build-scripts # List of test browsers that are always used in every E2E test. Tests that aren't expected to interact with browser APIs # should use `minimal_browser_list` to keep test execution time low. From bc29b236d4f25bef224c2f8fb22d70cc9146d471 Mon Sep 17 00:00:00 2001 From: Allan Zheng Date: Wed, 15 Feb 2023 11:39:08 -0800 Subject: [PATCH 11/11] Revert "test: enable integ test" This reverts commit 7be173987891d327e8ecbe01ea8ad92bd55604cd. --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a53d440c1df..a7abd937a83 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1575,7 +1575,6 @@ releasable_branches: &releasable_branches - 1.0-stable - geo/main - in-app-messaging/main - - feat/webpack5-build-scripts # List of test browsers that are always used in every E2E test. Tests that aren't expected to interact with browser APIs # should use `minimal_browser_list` to keep test execution time low.