fix: make ${PROJECT_DIR} relative

ruscon · Aug 31, 2023 · da9a52f · da9a52f
1 parent ab3f565
commit da9a52f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -136,11 +136,11 @@ $ pnpm nx semantic-release app-c --repositoryUrl "https://github.com/ruscon/nx-s
 
 ### Available Tokens
 
-| Token            | Expands into                                                                                  |
-| ---------------- | --------------------------------------------------------------------------------------------- |
-| ${PROJECT_DIR}   | Resolves to the current project direcory (ex. `/Users/theunderscorer/nx-monorepo/apps/app-a`) |
-| ${PROJECT_NAME}  | Resolves to the current project name (ex. `app-a`)                                            |
-| ${WORKSPACE_DIR} | Resolves to the current workspace direcory (ex. `/Users/theunderscorer/nx-monorepo`)          |
+| Token            | Expands into                                                                         |
+| ---------------- |--------------------------------------------------------------------------------------|
+| ${PROJECT_DIR}   | Resolves to the project's current *relative* directory (ex. `apps/app-a`)            |
+| ${PROJECT_NAME}  | Resolves to the current project name (ex. `app-a`)                                   |
+| ${WORKSPACE_DIR} | Resolves to the current workspace direcory (ex. `/Users/theunderscorer/nx-monorepo`) |
 
 The following options support tokens: `buildTarget`, `changelogFile`, `commitMessage`, `gitAssets`, `packageJsonDir`, `outputPath`, `plugins`'s options<sup>\*</sup>, and `tagFormat`.
 

diff --git a/packages/nx-semantic-release-pnpm/src/config/apply-tokens.spec.ts b/packages/nx-semantic-release-pnpm/src/config/apply-tokens.spec.ts
@@ -29,9 +29,9 @@ describe('applyTokensToSemanticReleaseOptions', () => {
       commitMessage: 'release ${PROJECT_NAME} in ${PROJECT_DIR}',
       packageJsonDir: '${PROJECT_DIR}/src',
       tagFormat: '${PROJECT_NAME}-v${version}',
-      outputPath: '${WORKSPACE_DIR}/dist/apps/${PROJECT_NAME}',
+      outputPath: 'dist/apps/${PROJECT_NAME}',
       plugins: [
-        '@fake/plugin-without-options1', 
+        '@fake/plugin-without-options1',
         [
           '@semantic-release/exec',
           {
@@ -42,7 +42,7 @@ describe('applyTokensToSemanticReleaseOptions', () => {
             fakeNumberOption: 10
           }
         ],
-        '@fake/plugin-without-options2', 
+        '@fake/plugin-without-options2',
     ]
     };
   });
@@ -73,7 +73,7 @@ describe('applyTokensToSemanticReleaseOptions', () => {
       mockTokens
     );
 
-    expect(results.outputPath).toEqual(`./dist/apps/app-a`);
+    expect(results.outputPath).toEqual(`dist/apps/app-a`);
   });
 
   it('should return options with multiple tokens replaced', () => {
@@ -83,7 +83,7 @@ describe('applyTokensToSemanticReleaseOptions', () => {
     );
 
     expect(results.commitMessage).toEqual(`release app-a in apps/app-a`);
-    expect(results.outputPath).toEqual(`./dist/apps/app-a`);
+    expect(results.outputPath).toEqual(`dist/apps/app-a`);
   });
 
 
@@ -94,7 +94,7 @@ describe('applyTokensToSemanticReleaseOptions', () => {
     );
 
     expect(results.plugins).toEqual([
-      '@fake/plugin-without-options1', 
+      '@fake/plugin-without-options1',
       [
         '@semantic-release/exec',
         {
@@ -105,7 +105,7 @@ describe('applyTokensToSemanticReleaseOptions', () => {
           fakeNumberOption: 10
         }
       ],
-      '@fake/plugin-without-options2', 
+      '@fake/plugin-without-options2',
   ]);
   });
 });
diff --git a/packages/nx-semantic-release-pnpm/src/executors/semantic-release/semantic-release.ts b/packages/nx-semantic-release-pnpm/src/executors/semantic-release/semantic-release.ts
@@ -19,6 +19,7 @@ import { unwrapExecutorOptions } from '../../utils/executor';
 import { applyTokensToSemanticReleaseOptions } from '../../config/apply-tokens';
 import { getDefaultProjectRoot, GetProjectContext } from '../../common/project';
 import { createProjectGraphAsync } from '@nx/devkit';
+import path from "path";
 
 export type SemanticReleaseOptions = Omit<
   BaseSemanticReleaseOptions,
@@ -139,7 +140,7 @@ export function resolveOptions(
 
   return applyTokensToSemanticReleaseOptions(mergedOptions, {
     projectName: context.projectName as string,
-    projectDir: getDefaultProjectRoot(context),
+    projectDir: path.relative(context.cwd, getDefaultProjectRoot(context)),
     workspaceDir: workspaceRoot,
   });
 }