fix(nx-plugin): allow some customization when running nx-plugins (#15438

)
nrwl · Mar 21, 2023 · 6834b65 · 6834b65 · vercel · Mar 21, 2023
1 parent 2cc949e
commit 6834b65
Show file tree

Hide file tree

Showing 24 changed files with 68 additions and 32 deletions.
diff --git a/packages/cypress/package.json b/packages/cypress/package.json
@@ -19,7 +19,7 @@
     "Cypress",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",

diff --git a/packages/detox/package.json b/packages/detox/package.json
@@ -22,7 +22,7 @@
   },
   "license": "MIT",
   "author": "Victor Savkin",
-  "main": "index.js",
+  "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
     "@nrwl/devkit": "file:../devkit",

diff --git a/packages/devkit/package.json b/packages/devkit/package.json
@@ -19,7 +19,7 @@
     "Cypress",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",

diff --git a/packages/esbuild/package.json b/packages/esbuild/package.json
@@ -14,7 +14,7 @@
     "Web",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",

diff --git a/packages/expo/package.json b/packages/expo/package.json
@@ -23,7 +23,7 @@
   },
   "license": "MIT",
   "author": "Victor Savkin",
-  "main": "index.js",
+  "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
     "@nrwl/detox": "file:../detox",

diff --git a/packages/express/package.json b/packages/express/package.json
@@ -16,7 +16,7 @@
     "Cypress",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",

diff --git a/packages/jest/package.json b/packages/jest/package.json
@@ -19,7 +19,7 @@
     "Unit Testing",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",

diff --git a/packages/linter/package.json b/packages/linter/package.json
@@ -15,7 +15,7 @@
     "ESLint",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",

diff --git a/packages/nest/package.json b/packages/nest/package.json
@@ -16,7 +16,7 @@
     "Cypress",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -16,7 +16,7 @@
     "Cypress",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",

diff --git a/packages/node/package.json b/packages/node/package.json
@@ -16,7 +16,7 @@
     "Cypress",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",

diff --git a/packages/nx-plugin/package.json b/packages/nx-plugin/package.json
@@ -13,7 +13,7 @@
     "Nx",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "types": "./index.d.ts",
   "author": "Nrwl",
   "license": "MIT",

diff --git a/packages/nx/.eslintrc.json b/packages/nx/.eslintrc.json
@@ -8,8 +8,22 @@
       "rules": {}
     },
     {
-      "files": ["*.ts", "*.tsx"],
-      "rules": {}
+      "files": ["*.ts"],
+      "excludedFiles": ["*.spec.ts"],
+      "rules": {
+        "@typescript-eslint/no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              {
+                "name": "typescript",
+                "message": "TypeScript is an optional dependency for Nx. If you need to use it, make sure its installed first with ensureTypescript.",
+                "allowTypeImports": true
+              }
+            ]
+          }
+        ]
+      }
     },
     {
       "files": ["*.js", "*.jsx"],

diff --git a/packages/nx/src/utils/nx-plugin.ts b/packages/nx/src/utils/nx-plugin.ts
@@ -24,6 +24,9 @@ import {
 import { normalizePath } from './path';
 import { join } from 'path';
 import { getNxRequirePaths } from './installation-directory';
+import { readTsConfig } from './typescript';
+
+import type * as ts from 'typescript';
 
 export type ProjectTargetConfigurator = (
   file: string
@@ -253,17 +256,25 @@ export function registerPluginTSTranspiler() {
   if (!tsNodeAndPathsRegistered) {
     // nx-ignore-next-line
     const ts: typeof import('typescript') = require('typescript');
+    const tsConfigName = existsSync('tsconfig.base.json')
+      ? 'tsconfig.base.json'
+      : existsSync('tsconfig.json')
+      ? 'tsconfig.json'
+      : null;
+    const tsConfig: Partial<ts.ParsedCommandLine> = tsConfigName
+      ? readTsConfig(tsConfigName)
+      : {};
 
     registerTsConfigPaths(join(workspaceRoot, 'tsconfig.base.json'));
     registerTranspiler({
+      experimentalDecorators: true,
+      emitDecoratorMetadata: true,
+      ...tsConfig.options,
       lib: ['es2021'],
       module: ts.ModuleKind.CommonJS,
       target: ts.ScriptTarget.ES2021,
       inlineSourceMap: true,
-      esModuleInterop: true,
       skipLibCheck: true,
-      experimentalDecorators: true,
-      emitDecoratorMetadata: true,
     });
   }
   tsNodeAndPathsRegistered = true;

diff --git a/packages/nx/src/utils/register.ts b/packages/nx/src/utils/register.ts
@@ -1,5 +1,5 @@
 import { dirname, join } from 'path';
-import type { CompilerOptions } from 'typescript';
+import type { CompilerOptions, ModuleResolutionKind } from 'typescript';
 import { logger, NX_PREFIX, stripIndent } from './logger';
 
 const swcNodeInstalled = packageIsInstalled('@swc-node/register');
@@ -178,9 +178,9 @@ export function getTsNodeCompilerOptions(compilerOptions: CompilerOptions) {
     ts = require('typescript');
   }
 
-  const flagMap: Partial<
-    Record<keyof RemoveIndex<CompilerOptions>, keyof typeof ts>
-  > = {
+  const flagMap: Partial<{
+    [key in keyof RemoveIndex<CompilerOptions>]: keyof typeof ts;
+  }> = {
     module: 'ModuleKind',
     target: 'ScriptTarget',
     moduleDetection: 'ModuleDetectionKind',
@@ -189,14 +189,25 @@ export function getTsNodeCompilerOptions(compilerOptions: CompilerOptions) {
     importsNotUsedAsValues: 'ImportsNotUsedAsValues',
   };
 
-  const result = { ...compilerOptions };
+  const result: { [key in keyof CompilerOptions]: any } = {
+    ...compilerOptions,
+  };
 
   for (const flag in flagMap) {
     if (compilerOptions[flag]) {
       result[flag] = ts[flagMap[flag]][compilerOptions[flag]];
     }
   }
 
+  delete result.pathsBasePath;
+  delete result.configFilePath;
+  if (result.moduleResolution) {
+    result.moduleResolution =
+      result.moduleResolution === 'NodeJs'
+        ? 'node'
+        : result.moduleResolution.toLowerCase();
+  }
+
   return result;
 }
 

diff --git a/packages/react-native/package.json b/packages/react-native/package.json
@@ -22,7 +22,7 @@
   },
   "license": "MIT",
   "author": "Victor Savkin",
-  "main": "index.js",
+  "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
     "@nrwl/detox": "file:../detox",

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -16,7 +16,7 @@
     "Cypress",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",

diff --git a/packages/rollup/package.json b/packages/rollup/package.json
@@ -14,7 +14,7 @@
     "Web",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",

diff --git a/packages/storybook/package.json b/packages/storybook/package.json
@@ -15,7 +15,7 @@
     "Storybook",
     "Cypress"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Isaac Mann",
   "license": "MIT",

diff --git a/packages/tao/package.json b/packages/tao/package.json
@@ -19,15 +19,15 @@
     "Cypress",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/nrwl/nx/issues"
   },
   "bin": {
-    "tao": "./index.js"
+    "tao": "./index"
   },
   "homepage": "https://nx.dev",
   "dependencies": {

diff --git a/packages/vite/package.json b/packages/vite/package.json
@@ -14,7 +14,7 @@
     "Web",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",

diff --git a/packages/web/package.json b/packages/web/package.json
@@ -15,7 +15,7 @@
     "Cypress",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",

diff --git a/packages/webpack/package.json b/packages/webpack/package.json
@@ -14,7 +14,7 @@
     "Web",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",

diff --git a/packages/workspace/package.json b/packages/workspace/package.json
@@ -19,7 +19,7 @@
     "Cypress",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",