fix: replace all occurences of a token in an option, not only the fir…

…st one
ruscon · Mar 26, 2023 · 320877a · 320877a
1 parent 57f00f5
commit 320877a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -154,7 +154,7 @@ You may see other tokens like `${nextRelease.version}`, those are tokens that ar
 >             [
 >               '@semantic-release/exec',
 >               {
->                 prepareCmd: 'cp ${WORKSPACE_DIR}/src ${WORKSPACE_DIR}/dist',
+>                 prepareCmd: 'cp LICENSE dist/packages/${PROJECT_NAME} && cp README.md dist/packages/${PROJECT_NAME}',
 >                 execCwd: '${WORKSPACE_DIR}',
 >                 fakeStringArrayOption: ['${WORKSPACE_DIR}/src', '${WORKSPACE_DIR}/dist'],
 >                 fakeBooleanOption: true,

diff --git a/packages/nx-semantic-release/src/config/apply-tokens.spec.ts b/packages/nx-semantic-release/src/config/apply-tokens.spec.ts
@@ -35,7 +35,7 @@ describe('applyTokensToSemanticReleaseOptions', () => {
         [
           '@semantic-release/exec',
           {
-            prepareCmd: 'cp LICENSE dist/packages/${PROJECT_NAME}',
+            prepareCmd: 'cp LICENSE dist/packages/${PROJECT_NAME} && cp README.md dist/packages/${PROJECT_NAME}',
             execCwd: '${WORKSPACE_DIR}',
             fakeStringArrayOption: ['${WORKSPACE_DIR}/src', '${WORKSPACE_DIR}/dist'],
             fakeBooleanOption: true,
@@ -98,7 +98,7 @@ describe('applyTokensToSemanticReleaseOptions', () => {
       [
         '@semantic-release/exec',
         {
-          prepareCmd: 'cp LICENSE dist/packages/app-a',
+          prepareCmd: 'cp LICENSE dist/packages/app-a && cp README.md dist/packages/app-a',
           execCwd: '.',
           fakeStringArrayOption: ['./src', './dist'],
           fakeBooleanOption: true,

diff --git a/packages/nx-semantic-release/src/config/apply-tokens.ts b/packages/nx-semantic-release/src/config/apply-tokens.ts
@@ -12,9 +12,9 @@ export function applyTokensToSemanticReleaseOptions(
 ) {
   const replaceTokens = (value: string): string => {
     return value
-      .replace('${PROJECT_DIR}', tokens.projectDir)
-      .replace('${PROJECT_NAME}', tokens.projectName)
-      .replace('${WORKSPACE_DIR}', tokens.workspaceDir);
+      .replaceAll('${PROJECT_DIR}', tokens.projectDir)
+      .replaceAll('${PROJECT_NAME}', tokens.projectName)
+      .replaceAll('${WORKSPACE_DIR}', tokens.workspaceDir);
   };
 
   [

diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -10,9 +10,9 @@
     "experimentalDecorators": true,
     "resolveJsonModule": true,
     "esModuleInterop": true,
-    "target": "es2020",
+    "target": "es2021",
     "module": "esnext",
-    "lib": ["es2020", "dom"],
+    "lib": ["es2021", "dom"],
     "skipLibCheck": true,
     "skipDefaultLibCheck": true,
     "baseUrl": ".",