Skip to content

Commit 54ff696

Browse files
authored
Sync the config/utils.js file in the generator (#3331)
* Apply PR #3244 to the corresponding files in generator * Bonus: update script and CI for the pwa-kit-mcp package
1 parent e6c0f3e commit 54ff696

File tree

5 files changed

+17
-5
lines changed

5 files changed

+17
-5
lines changed

.github/workflows/nightly_release.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/checkout@v4
1616
with:
1717
fetch-depth: 0
18-
18+
1919
- name: Get Timestamp
2020
run: |-
2121
echo "release_timestamp=$(date +'%Y%m%d%H%M%S')" >> "$GITHUB_ENV"
@@ -41,6 +41,11 @@ jobs:
4141
version=`jq -r ".version" packages/commerce-sdk-react/package.json | cut -d "-" -f 1`
4242
echo "commerce_sdk_react_version_base=$version" >> "$GITHUB_ENV"
4343
44+
- name: Get pwa-kit-mcp version
45+
run: |-
46+
version=`jq -r ".version" packages/pwa-kit-mcp/package.json | cut -d "-" -f 1`
47+
echo "pwa_kit_mcp_version_base=$version" >> "$GITHUB_ENV"
48+
4449
- name: Setup Node
4550
uses: actions/setup-node@v4
4651
with:
@@ -83,6 +88,10 @@ jobs:
8388
run: |-
8489
npm run bump-version:commerce-sdk-react -- "${{ env.commerce_sdk_react_version_base }}-nightly-${{ env.release_timestamp }}"
8590
91+
- name: Bump version (pwa-kit-mcp)
92+
run: |-
93+
npm run bump-version:mcp -- "${{ env.pwa_kit_mcp_version_base }}-nightly-${{ env.release_timestamp }}"
94+
8695
- name: Push version changes to origin
8796
run: |-
8897
git commit -am "Release ${{ env.nightly_version }}"
@@ -122,4 +131,4 @@ jobs:
122131
"message": "Failed to release PWA Kit v${{ env.monorepo_version_base }}-nightly-${{ env.release_timestamp }} (${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})"
123132
}
124133
env:
125-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
134+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"bump-version": "node ./scripts/bump-version/index.js",
66
"bump-version:retail-react-app": "node ./scripts/bump-version/index.js --package=@salesforce/retail-react-app",
77
"bump-version:commerce-sdk-react": "node ./scripts/bump-version/index.js --package=@salesforce/commerce-sdk-react",
8+
"bump-version:mcp": "node ./scripts/bump-version/index.js --package=@salesforce/pwa-kit-mcp",
89
"publish-to-npm": "node ./scripts/publish-to-npm.js",
910
"format": "lerna run --stream format",
1011
"preinstall": "node ./scripts/check-version.js && npm run check-eslint-deps",

packages/pwa-kit-create-app/assets/bootstrap/js/config/utils.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ function parseSettings(settings) {
2626
}
2727
}
2828

29-
console.warn('Cannot parse settings from:', settings)
3029
return
3130
}
3231

packages/pwa-kit-create-app/assets/templates/@salesforce/retail-react-app/config/utils.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ function parseSettings(settings) {
2626
}
2727
}
2828

29-
console.warn('Cannot parse settings from:', settings)
3029
return
3130
}
3231

scripts/bump-version/index.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ const lernaConfigPath = path.join(rootPath, 'lerna.json')
2121
const monorepoPackages = JSON.parse(sh.exec('lerna list --all --json', {silent: true}))
2222
const monorepoPackageNames = monorepoPackages.map((pkg) => pkg.name)
2323

24-
const INDEPENDENT_PACKAGES = ['@salesforce/retail-react-app', '@salesforce/commerce-sdk-react', '@salesforce/pwa-kit-mcp']
24+
const INDEPENDENT_PACKAGES = [
25+
'@salesforce/retail-react-app',
26+
'@salesforce/commerce-sdk-react',
27+
'@salesforce/pwa-kit-mcp'
28+
]
2529
const independentPackages = INDEPENDENT_PACKAGES.map((pkgName) =>
2630
monorepoPackages.find((pkg) => pkg.name === pkgName)
2731
)

0 commit comments

Comments
 (0)