feat(core): expand support for projectRoot token to include project.json

nrwl · Jul 25, 2023 · e4410ca · e4410ca
1 parent 7567a65
commit e4410ca
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 12 deletions.
diff --git a/e2e/nx-run/src/run.test.ts b/e2e/nx-run/src/run.test.ts
@@ -115,6 +115,73 @@ describe('Nx Running Tests', () => {
 
       updateProjectConfig(mylib, (c) => original);
     }, 1000000);
+
+    describe('tokens support', () => {
+      let app: string;
+
+      beforeAll(() => {
+        app = uniq('myapp');
+        runCLI(`generate @nx/web:app ${app}`);
+      });
+
+      it('should support using {projectRoot} in options blocks in project.json', async () => {
+        updateProjectConfig(app, (c) => {
+          c.targets['echo'] = {
+            command: 'node -e console.log({projectRoot})',
+          };
+          return c;
+        });
+
+        const output = runCLI(`echo ${app}`);
+        expect(output).toContain(`apps/${app}`);
+      });
+
+      it('should support using {projectName} in options blocks in project.json', async () => {
+        updateProjectConfig(app, (c) => {
+          c.targets['echo'] = {
+            command: 'node -e console.log({projectName})',
+          };
+          return c;
+        });
+
+        const output = runCLI(`echo ${app}`);
+        expect(output).toContain(app);
+      });
+
+      it('should support using {projectRoot} in targetDefaults', async () => {
+        updateJson(`nx.json`, (json) => {
+          json.targetDefaults = {
+            echo: {
+              command: 'node -e console.log({projectRoot})',
+            },
+          };
+          return json;
+        });
+        updateProjectConfig(app, (c) => {
+          c.targets['echo'] = {};
+          return c;
+        });
+        const output = runCLI(`echo ${app}`);
+        expect(output).toContain(`apps/${app}`);
+      });
+
+      it('should support using {projectName} in targetDefaults', async () => {
+        updateJson(`nx.json`, (json) => {
+          json.targetDefaults = {
+            echo: {
+              command: 'node -e console.log({projectName})',
+            },
+          };
+          return json;
+        });
+        updateProjectConfig(app, (c) => {
+          c.targets['echo'] = {};
+          return c;
+        });
+        const output = runCLI(`echo ${app}`);
+        expect(output).toContain(app);
+      });
+    });
   });
 
   describe('Nx Bail', () => {

diff --git a/packages/nx/src/config/workspaces.spec.ts b/packages/nx/src/config/workspaces.spec.ts
@@ -449,7 +449,7 @@ describe('Workspaces', () => {
             }
           ).configurations
         ).toEqual({
-          dev: { a: '{workspaceRoot}' },
+          dev: { a: '' },
           prod: { a: 'dist/my/project' },
         });
       });

diff --git a/packages/nx/src/config/workspaces.ts b/packages/nx/src/config/workspaces.ts
@@ -576,7 +576,7 @@ function mergeOptions<T extends Object>(
 ): T {
   return {
     ...resolvePathTokensInOptions(defaults, project, key),
-    ...options,
+    ...resolvePathTokensInOptions(options, project, key),
   };
 }
 
@@ -586,16 +586,21 @@ function mergeConfigurations<T extends Object>(
   project: ProjectConfiguration,
   targetName: string
 ): Record<string, T> {
-  const configurations: Record<string, T> = { ...projectDefinedConfigurations };
-  for (const configuration in defaultConfigurations) {
-    configurations[configuration] = mergeOptions(
-      defaultConfigurations[configuration],
-      configurations[configuration],
+  const result: Record<string, T> = {};
+  const configurations = new Set([
+    ...Object.keys(defaultConfigurations),
+    ...Object.keys(projectDefinedConfigurations),
+  ]);
+  for (const configuration of configurations) {
+    result[configuration] = mergeOptions(
+      defaultConfigurations[configuration] ?? ({} as T),
+      projectDefinedConfigurations[configuration] ?? ({} as T),
       project,
       `${targetName}.${configuration}`
     );
   }
-  return configurations;
+  console.log({ configurations, result });
+  return result;
 }
 
 function resolvePathTokensInOptions<T extends Object | Array<unknown>>(
@@ -606,10 +611,10 @@ function resolvePathTokensInOptions<T extends Object | Array<unknown>>(
   const result: T = Array.isArray(object) ? ([...object] as T) : { ...object };
   for (let [opt, value] of Object.entries(object ?? {})) {
     if (typeof value === 'string') {
-      if (value.startsWith('{workspaceRoot}/')) {
-        value = value.replace(/^\{workspaceRoot\}\//, '');
-      }
-      if (value.includes('{workspaceRoot}')) {
+      const workspaceRootMatch = /^(\{workspaceRoot\}\/?)/.exec(value);
+      if (workspaceRootMatch?.length) {
+        value = value.replace(workspaceRootMatch[0], '');
+      } else if (value.includes('{workspaceRoot}')) {
         throw new Error(
           `${NX_PREFIX} The {workspaceRoot} token is only valid at the beginning of an option. (${key})`
         );