From 3314451a78bfe6b868fdc3b074190f5ac4372651 Mon Sep 17 00:00:00 2001 From: Kevin He Date: Tue, 30 Aug 2022 16:39:15 -0700 Subject: [PATCH 1/7] fix double dist problem --- packages/internal-lib-build/bin/prepare-dist.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/internal-lib-build/bin/prepare-dist.js b/packages/internal-lib-build/bin/prepare-dist.js index 8031581725..35d8ee803e 100755 --- a/packages/internal-lib-build/bin/prepare-dist.js +++ b/packages/internal-lib-build/bin/prepare-dist.js @@ -59,8 +59,7 @@ const main = async () => { try { // Get a list of files from the `npm pack --dry-run` command. - const packageFiles = await packlist() - + const packageFiles = (await packlist()).filter((path) => !path.startsWith('dist')) // Move the required files into the `dist` folder. await copyFiles(packageFiles, DEST_DIR) } catch (e) { From 5baa53a1644ecc07f6bd2ec223b6567f555af59d Mon Sep 17 00:00:00 2001 From: Kevin He Date: Tue, 30 Aug 2022 16:51:14 -0700 Subject: [PATCH 2/7] remove unused main field --- packages/pwa-kit-dev/package.json | 1 - packages/pwa-kit-react-sdk/package.json | 1 - packages/pwa-kit-runtime/package.json | 1 - 3 files changed, 3 deletions(-) diff --git a/packages/pwa-kit-dev/package.json b/packages/pwa-kit-dev/package.json index 4d8d9ec9d3..e9794664f2 100644 --- a/packages/pwa-kit-dev/package.json +++ b/packages/pwa-kit-dev/package.json @@ -12,7 +12,6 @@ }, "license": "SEE LICENSE IN LICENSE", "author": "dev@mobify.com", - "main": "dist/index.js", "bin": { "pwa-kit-dev": "bin/pwa-kit-dev.js" }, diff --git a/packages/pwa-kit-react-sdk/package.json b/packages/pwa-kit-react-sdk/package.json index 26ae96439c..f9b5b7118a 100644 --- a/packages/pwa-kit-react-sdk/package.json +++ b/packages/pwa-kit-react-sdk/package.json @@ -2,7 +2,6 @@ "name": "pwa-kit-react-sdk", "version": "2.3.0-dev", "description": "A library that supports the isomorphic React rendering pipeline for Commerce Cloud Managed Runtime apps", - "main": "dist/index.js", "engines": { "node": "^14.0.0", "npm": "^6.14.4 || ^7.0.0 || ^8.0.0" diff --git a/packages/pwa-kit-runtime/package.json b/packages/pwa-kit-runtime/package.json index 8dc85e4ac4..d8e24724be 100644 --- a/packages/pwa-kit-runtime/package.json +++ b/packages/pwa-kit-runtime/package.json @@ -12,7 +12,6 @@ }, "license": "SEE LICENSE IN LICENSE", "author": "dev@mobify.com", - "main": "dist/index.js", "files": [ "bin", "LICENSE", From e6f659844a7bd3ce0417f610725f7c41ec0cf4ef Mon Sep 17 00:00:00 2001 From: Kevin He Date: Tue, 30 Aug 2022 16:54:41 -0700 Subject: [PATCH 3/7] update author --- packages/commerce-sdk-react/package.json | 2 +- packages/internal-lib-build/package.json | 2 +- packages/pwa-kit-create-app/package.json | 2 +- packages/pwa-kit-dev/package.json | 2 +- packages/pwa-kit-react-sdk/package.json | 2 +- packages/pwa-kit-runtime/package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/commerce-sdk-react/package.json b/packages/commerce-sdk-react/package.json index 6d0f3f5823..50c925eeb7 100644 --- a/packages/commerce-sdk-react/package.json +++ b/packages/commerce-sdk-react/package.json @@ -2,7 +2,7 @@ "name": "commerce-sdk-react", "version": "2.3.0-dev", "description": "A library that provides react hooks for fetching data from Commerce Cloud", - "author": "dev@mobify.com", + "author": "cc-pwa-kit@salesforce.com", "license": "See license in LICENSE", "engines": { "node": "^14.0.0", diff --git a/packages/internal-lib-build/package.json b/packages/internal-lib-build/package.json index 2429d09a44..23e2856c9f 100644 --- a/packages/internal-lib-build/package.json +++ b/packages/internal-lib-build/package.json @@ -15,7 +15,7 @@ "url": "https://github.com/SalesforceCommerceCloud/pwa-kit/issues" }, "license": "SEE LICENSE IN LICENSE", - "author": "dev@mobify.com", + "author": "cc-pwa-kit@salesforce.com", "bin": { "internal-lib-build": "./bin/internal-lib-build.js" }, diff --git a/packages/pwa-kit-create-app/package.json b/packages/pwa-kit-create-app/package.json index baa9c9dfa4..6ab73d9b2f 100644 --- a/packages/pwa-kit-create-app/package.json +++ b/packages/pwa-kit-create-app/package.json @@ -2,7 +2,7 @@ "name": "pwa-kit-create-app", "version": "2.3.0-dev", "description": "Salesforce's project generator tool", - "author": "dev@mobify.com", + "author": "cc-pwa-kit@salesforce.com", "license": "See license in LICENSE", "repository": { "type": "git", diff --git a/packages/pwa-kit-dev/package.json b/packages/pwa-kit-dev/package.json index e9794664f2..80af942aa1 100644 --- a/packages/pwa-kit-dev/package.json +++ b/packages/pwa-kit-dev/package.json @@ -11,7 +11,7 @@ "url": "https://github.com/SalesforceCommerceCloud/pwa-kit/issues" }, "license": "SEE LICENSE IN LICENSE", - "author": "dev@mobify.com", + "author": "cc-pwa-kit@salesforce.com", "bin": { "pwa-kit-dev": "bin/pwa-kit-dev.js" }, diff --git a/packages/pwa-kit-react-sdk/package.json b/packages/pwa-kit-react-sdk/package.json index f9b5b7118a..bbd26c1ecd 100644 --- a/packages/pwa-kit-react-sdk/package.json +++ b/packages/pwa-kit-react-sdk/package.json @@ -40,7 +40,7 @@ "bugs": { "url": "https://github.com/SalesforceCommerceCloud/pwa-kit/issues" }, - "author": "dev@mobify.com", + "author": "cc-pwa-kit@salesforce.com", "license": "SEE LICENSE IN LICENSE", "dependencies": { "@loadable/babel-plugin": "^5.13.2", diff --git a/packages/pwa-kit-runtime/package.json b/packages/pwa-kit-runtime/package.json index d8e24724be..bc52a725ec 100644 --- a/packages/pwa-kit-runtime/package.json +++ b/packages/pwa-kit-runtime/package.json @@ -11,7 +11,7 @@ "url": "https://github.com/SalesforceCommerceCloud/pwa-kit/issues" }, "license": "SEE LICENSE IN LICENSE", - "author": "dev@mobify.com", + "author": "cc-pwa-kit@salesforce.comm", "files": [ "bin", "LICENSE", From 19e274092236fdea576d97f459784038f9c5bb89 Mon Sep 17 00:00:00 2001 From: Kevin He Date: Tue, 30 Aug 2022 16:58:11 -0700 Subject: [PATCH 4/7] clean up pwa-kit-runtime files --- packages/pwa-kit-runtime/package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/pwa-kit-runtime/package.json b/packages/pwa-kit-runtime/package.json index bc52a725ec..680d2968cf 100644 --- a/packages/pwa-kit-runtime/package.json +++ b/packages/pwa-kit-runtime/package.json @@ -13,13 +13,10 @@ "license": "SEE LICENSE IN LICENSE", "author": "cc-pwa-kit@salesforce.comm", "files": [ - "bin", "LICENSE", "scripts", "ssr", - "TERMS_OF_USE.md", - "utils", - "webpack" + "utils" ], "scripts": { "format": "internal-lib-build format \"**/*.{js,jsx}\"", From 8d41312f2bd26bbcd5a64aa5e2901aa3a47b2ce4 Mon Sep 17 00:00:00 2001 From: Kevin He Date: Tue, 30 Aug 2022 17:00:05 -0700 Subject: [PATCH 5/7] clean up pwa-kit-react-sdk files --- packages/pwa-kit-dev/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/pwa-kit-dev/package.json b/packages/pwa-kit-dev/package.json index 80af942aa1..d70846f55c 100644 --- a/packages/pwa-kit-dev/package.json +++ b/packages/pwa-kit-dev/package.json @@ -20,7 +20,6 @@ "LICENSE", "scripts", "ssr", - "TERMS_OF_USE.md", "utils", "configs" ], From a6df9a485727da8a80ab3c9ec38a328e8832089b Mon Sep 17 00:00:00 2001 From: Kevin He Date: Tue, 30 Aug 2022 17:00:37 -0700 Subject: [PATCH 6/7] clean up pwa-kit-react-sdk files --- packages/pwa-kit-react-sdk/package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/pwa-kit-react-sdk/package.json b/packages/pwa-kit-react-sdk/package.json index bbd26c1ecd..e5090c96ae 100644 --- a/packages/pwa-kit-react-sdk/package.json +++ b/packages/pwa-kit-react-sdk/package.json @@ -7,14 +7,11 @@ "npm": "^6.14.4 || ^7.0.0 || ^8.0.0" }, "files": [ - "bin", "CHANGELOG.md", "LICENSE", "scripts", "ssr", - "TERMS_OF_USE.md", - "utils", - "webpack" + "utils" ], "publishConfig": { "directory": "dist" From 4c4348ec1a6f152ed3186912956a8b9ac77e661b Mon Sep 17 00:00:00 2001 From: Kevin He Date: Wed, 31 Aug 2022 09:58:33 -0700 Subject: [PATCH 7/7] append / --- packages/internal-lib-build/bin/prepare-dist.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/internal-lib-build/bin/prepare-dist.js b/packages/internal-lib-build/bin/prepare-dist.js index 35d8ee803e..9b94db6c3f 100755 --- a/packages/internal-lib-build/bin/prepare-dist.js +++ b/packages/internal-lib-build/bin/prepare-dist.js @@ -59,7 +59,7 @@ const main = async () => { try { // Get a list of files from the `npm pack --dry-run` command. - const packageFiles = (await packlist()).filter((path) => !path.startsWith('dist')) + const packageFiles = (await packlist()).filter((path) => !path.startsWith('dist/')) // Move the required files into the `dist` folder. await copyFiles(packageFiles, DEST_DIR) } catch (e) {