fix(js): normalize excluded paths to task inputs correctly in typescr…

…ipt plugin (#26801) (cherry picked from commit adb81af)
nrwl · Jul 5, 2024 · ec37b1e · ec37b1e
1 parent 4c76b95
commit ec37b1e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/packages/js/src/plugins/typescript/plugin.spec.ts b/packages/js/src/plugins/typescript/plugin.spec.ts
@@ -439,14 +439,16 @@ describe(`Plugin: ${PLUGIN_NAME}`, () => {
 
       it('should add extended config files', async () => {
         await applyFilesToTempFsAndContext(tempFs, context, {
-          'libs/my-lib/tsconfig.json': JSON.stringify({
-            extends: '../../tsconfig.foo.json',
-            include: ['src/**/*.ts'],
+          'tsconfig.base.json': JSON.stringify({
+            exclude: ['node_modules', 'tmp'],
           }),
           'tsconfig.foo.json': JSON.stringify({
             extends: './tsconfig.base.json',
           }),
-          'tsconfig.base.json': '{}',
+          'libs/my-lib/tsconfig.json': JSON.stringify({
+            extends: '../../tsconfig.foo.json',
+            include: ['src/**/*.ts'],
+          }),
           'libs/my-lib/package.json': `{}`,
         });
         expect(await invokeCreateNodesOnMatchingFiles(context, {}))
@@ -467,6 +469,8 @@ describe(`Plugin: ${PLUGIN_NAME}`, () => {
                       "{workspaceRoot}/tsconfig.base.json",
                       "{projectRoot}/tsconfig.json",
                       "{projectRoot}/src/**/*.ts",
+                      "!{workspaceRoot}/node_modules",
+                      "!{workspaceRoot}/tmp",
                       "^production",
                       {
                         "externalDependencies": [
@@ -1455,15 +1459,17 @@ describe(`Plugin: ${PLUGIN_NAME}`, () => {
 
       it('should add extended config files', async () => {
         await applyFilesToTempFsAndContext(tempFs, context, {
+          'tsconfig.base.json': JSON.stringify({
+            exclude: ['node_modules', 'tmp'],
+          }),
+          'tsconfig.foo.json': JSON.stringify({
+            extends: './tsconfig.base.json',
+          }),
           'libs/my-lib/tsconfig.json': '{}',
           'libs/my-lib/tsconfig.lib.json': JSON.stringify({
             extends: '../../tsconfig.foo.json',
             include: ['src/**/*.ts'],
           }),
-          'tsconfig.foo.json': JSON.stringify({
-            extends: './tsconfig.base.json',
-          }),
-          'tsconfig.base.json': '{}',
           'libs/my-lib/package.json': `{}`,
         });
         expect(
@@ -1488,6 +1494,8 @@ describe(`Plugin: ${PLUGIN_NAME}`, () => {
                       "{workspaceRoot}/tsconfig.base.json",
                       "{projectRoot}/tsconfig.lib.json",
                       "{projectRoot}/src/**/*.ts",
+                      "!{workspaceRoot}/node_modules",
+                      "!{workspaceRoot}/tmp",
                       "^production",
                       {
                         "externalDependencies": [

diff --git a/packages/js/src/plugins/typescript/plugin.ts b/packages/js/src/plugins/typescript/plugin.ts
@@ -282,7 +282,11 @@ function getInputs(
         pathToInputOrOutput(p, workspaceRoot, projectRoot)
       ),
       ...Array.from(includePaths).map((p: string) =>
-        joinPathFragments('{projectRoot}', p)
+        pathToInputOrOutput(
+          joinPathFragments(projectRoot, p),
+          workspaceRoot,
+          projectRoot
+        )
       )
     );
   } else {
@@ -294,7 +298,12 @@ function getInputs(
   if (excludePaths.size) {
     inputs.push(
       ...Array.from(excludePaths).map(
-        (p: string) => `!${joinPathFragments('{projectRoot}', p)}`
+        (p: string) =>
+          `!${pathToInputOrOutput(
+            joinPathFragments(projectRoot, p),
+            workspaceRoot,
+            projectRoot
+          )}`
       )
     );
   }