Skip to content

Commit

Permalink
fix: experience metadata meta file suffix (#423)
Browse files Browse the repository at this point in the history
Issue introduced by commit 71c0a02
From PR #397
  • Loading branch information
scolladon authored Jan 19, 2023
1 parent 8c5a832 commit b18e388
Show file tree
Hide file tree
Showing 15 changed files with 495 additions and 234 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: yarn test:coverage --runInBand

- name: Upload coverage
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
continue-on-error: true
8 changes: 4 additions & 4 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run: yarn install --immutable --immutable-cache --check-cache --frozen-lockfile

- name: Lint sources
uses: wearerequired/lint-action@v1
uses: wearerequired/lint-action@v2
with:
eslint: true
continue-on-error: true
Expand All @@ -50,7 +50,7 @@ jobs:
continue-on-error: true

- name: Upload coverage
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
continue-on-error: true
Expand Down Expand Up @@ -100,13 +100,13 @@ jobs:
fetch-depth: 0

- name: Lint commits
uses: wagoid/commitlint-github-action@v4
uses: wagoid/commitlint-github-action@v5
continue-on-error: true

pull-request-lint:
runs-on: ubuntu-latest
steps:
- name: Lint PR
uses: amannn/action-semantic-pull-request@v1.2.0
uses: amannn/action-semantic-pull-request@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22 changes: 18 additions & 4 deletions __tests__/unit/lib/service/inResourceHandler.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,30 @@ describe('InResourceHandler', () => {
beforeEach(() => {
work.config.generateDelta = true
})
describe('when matching zip resource exist', () => {
describe('when matching resource exist', () => {
beforeEach(() => {
readDir.mockImplementation(() =>
Promise.resolve([
'other.resource-meta.xml',
'other/',
'image.resource-meta.xml',
'my_experience_bundle.site-meta.xml',
'my_experience_bundle/',
'other_experience_bundle.resource-meta.xml',
])
)
})
it.each([
['staticresources', 'image', 'image.png', 3],
['staticresources', 'image', 'image/logo.png', 3],
[
'experiences',
'my_experience_bundle',
'my_experience_bundle/config/myexperiencebundle.json',
5,
],
])(
'should copy the matching resource',
'should copy the matching folder resource, matching meta file and subject file',
async (type, entity, path, expectedCount) => {
// Arrange
const base = 'force-app/main/default/'
Expand All @@ -96,11 +105,16 @@ describe('InResourceHandler', () => {
)
expect(copyFiles).toHaveBeenCalledWith(
work.config,
`${base}${type}/${entity}.resource${METAFILE_SUFFIX}`,
`${base}${type}/${entity}.resource${METAFILE_SUFFIX}`
`${base}${type}/${entity}.${
globalMetadata.get(type).suffix
}${METAFILE_SUFFIX}`,
`${base}${type}/${entity}.${
globalMetadata.get(type).suffix
}${METAFILE_SUFFIX}`
)
}
)

it('should copy the matching lwc', async () => {
// Arrange
const type = 'lwc'
Expand Down
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
},
"author": "Sebastien Colladon <[email protected]>",
"dependencies": {
"@oclif/command": "^1.8.20",
"@oclif/command": "^1.8.21",
"@oclif/config": "^1.18.6",
"@oclif/errors": "^1.3.6",
"@salesforce/command": "^5.2.37",
"@salesforce/core": "^3.32.12",
"fast-xml-parser": "^4.0.12",
"@salesforce/command": "^5.2.40",
"@salesforce/core": "^3.32.13",
"fast-xml-parser": "^4.0.13",
"fs-extra": "^11.1.0",
"ignore": "^5.2.4",
"micromatch": "^4.0.5",
Expand All @@ -57,7 +57,7 @@
"test:debug:break": "node --inspect-brk node_modules/.bin/jest",
"test:watch": "jest --watch",
"postpack": "rm -f oclif.manifest.json && prettier --write README.md",
"postrelease": "yarn release:tags && yarn release:github",
"postrelease": "yarn release:tags && yarn release:github",
"prepack": "rm -rf lib && tsc -b && oclif-dev manifest && oclif-dev readme",
"prepare": "husky install",
"release": "standard-version --no-verify --commit-all",
Expand All @@ -67,35 +67,35 @@
"upgrade:dependencies": "yarn yarn-upgrade-all"
},
"devDependencies": {
"@commitlint/cli": "^17.4.0",
"@commitlint/config-angular": "^17.4.0",
"@commitlint/prompt-cli": "^17.4.0",
"@commitlint/cli": "^17.4.2",
"@commitlint/config-angular": "^17.4.2",
"@commitlint/prompt-cli": "^17.4.2",
"@oclif/dev-cli": "^1.26.10",
"@oclif/plugin-help": "^5.1.22",
"@oclif/test": "^2.2.19",
"@oclif/plugin-help": "^5.1.23",
"@oclif/test": "^2.2.21",
"@salesforce/dev-config": "^3.1.0",
"@types/chai": "^4.3.4",
"@types/mocha": "^10.0.1",
"@types/node": "^18.11.18",
"@typescript-eslint/eslint-plugin": "^5.48.0",
"@typescript-eslint/parser": "^5.48.0",
"@typescript-eslint/eslint-plugin": "^5.48.2",
"@typescript-eslint/parser": "^5.48.2",
"conventional-github-releaser": "^3.1.5",
"eslint": "^8.31.0",
"eslint": "^8.32.0",
"eslint-config-prettier": "^8.6.0",
"eslint-config-salesforce-typescript": "^1.1.1",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsdoc": "^39.6.4",
"eslint-plugin-prettier": "^4.2.1",
"husky": "^8.0.3",
"jest": "^29.3.1",
"lint-staged": "^13.1.0",
"nyc": "^15.1.0",
"prettier": "^2.8.1",
"prettier": "^2.8.3",
"prettier-eslint": "^15.0.1",
"standard-version": "^9.5.0",
"ts-node": "^10.9.1",
"typescript": "^4.9.4",
"yarn-upgrade-all": "^0.7.1"
"yarn-upgrade-all": "^0.7.2"
},
"oclif": {
"commands": "./lib/commands",
Expand Down
2 changes: 1 addition & 1 deletion src/metadata/a48.json
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@
"directoryName": "experiences",
"inFolder": false,
"metaFile": true,
"suffix": "experience",
"suffix": "site",
"xmlName": "ExperienceBundle"
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/metadata/v47.json
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@
"directoryName": "experiences",
"inFolder": false,
"metaFile": true,
"suffix": "experience",
"suffix": "site",
"xmlName": "ExperienceBundle"
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/metadata/v49.json
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@
"directoryName": "experiences",
"inFolder": false,
"metaFile": true,
"suffix": "experience",
"suffix": "site",
"xmlName": "ExperienceBundle"
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/metadata/v50.json
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@
"directoryName": "experiences",
"inFolder": false,
"metaFile": true,
"suffix": "experience",
"suffix": "site",
"xmlName": "ExperienceBundle"
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/metadata/v51.json
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@
"directoryName": "experiences",
"inFolder": false,
"metaFile": true,
"suffix": "experience",
"suffix": "site",
"xmlName": "ExperienceBundle"
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/metadata/v52.json
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@
"directoryName": "experiences",
"inFolder": false,
"metaFile": true,
"suffix": "experience",
"suffix": "site",
"xmlName": "ExperienceBundle"
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/metadata/v53.json
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@
"directoryName": "experiences",
"inFolder": false,
"metaFile": true,
"suffix": "experience",
"suffix": "site",
"xmlName": "ExperienceBundle"
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/metadata/v54.json
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@
"directoryName": "experiences",
"inFolder": false,
"metaFile": true,
"suffix": "experience",
"suffix": "site",
"xmlName": "ExperienceBundle"
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/metadata/v55.json
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@
"directoryName": "experiences",
"inFolder": false,
"metaFile": true,
"suffix": "experience",
"suffix": "site",
"xmlName": "ExperienceBundle"
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/metadata/v56.json
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@
"directoryName": "experiences",
"inFolder": false,
"metaFile": true,
"suffix": "experience",
"suffix": "site",
"xmlName": "ExperienceBundle"
},
{
Expand Down
Loading

0 comments on commit b18e388

Please sign in to comment.