diff --git a/.github/workflows/publish-npm-dev.yml b/.github/workflows/publish-npm-dev.yml index 2c25f31a2f..d988052524 100644 --- a/.github/workflows/publish-npm-dev.yml +++ b/.github/workflows/publish-npm-dev.yml @@ -31,4 +31,4 @@ jobs: git config user.name "Github Workflow (on behalf of ${{ github.actor }})" git config user.email "users.noreply.github.com" echo $GITHUB_REF_NAME - npx lerna publish prerelease --conventional-commits --conventional-prerelease --preid dev-$(date +\"%Y%m%dT%H%M%S\") --dist-tag dev --allow-branch $GITHUB_REF_NAME --force-publish --no-verify-access --no-changelog --no-git-tag-version --no-push --yes + npx lerna publish prerelease --conventional-commits --conventional-prerelease --preid dev-$(date +"%Y%m%dT%H%M%S") --dist-tag dev --allow-branch $GITHUB_REF_NAME --force-publish --no-verify-access --no-changelog --no-git-tag-version --no-push --yes diff --git a/cli/src/cordova.ts b/cli/src/cordova.ts index 9cccb27d1c..b1ddf888b7 100644 --- a/cli/src/cordova.ts +++ b/cli/src/cordova.ts @@ -497,7 +497,8 @@ async function logiOSPlist(configElement: any, config: Config, plugin: Plugin) { for (const existingElement of existingElementsArray) { if ( existingElement.name === requiredElement.name && - existingElement.value === requiredElement.value + (existingElement.value === requiredElement.value || + /^[$].{1,}$/.test((requiredElement.value as string).trim())) ) { foundMatch = true; break; @@ -909,10 +910,16 @@ export async function writeCordovaAndroidManifest( ); for (const key of requiredELementAttrKeys) { if ( - requiredElement.attrs[key] !== - existingElement.attrs[key] + !/^[$].{1,}$/.test( + (requiredElement.attrs[key] as string).trim(), + ) ) { - return false; + if ( + requiredElement.attrs[key] !== + existingElement.attrs[key] + ) { + return false; + } } } } @@ -945,6 +952,7 @@ export async function writeCordovaAndroidManifest( } return true; }; + ///////// const parsedExistingElements: any[] = []; const rootKeyOfExistingElements = Object.keys(existingElements)[0];