feat(core): extract js related code from affected and hasher (#16244)

nrwl · Apr 18, 2023 · 2dd59c3 · 2dd59c3 · vercel · Apr 18, 2023
1 parent 0d7dbbc
commit 2dd59c3
Show file tree

Hide file tree

Showing 77 changed files with 397 additions and 329 deletions.
diff --git a/docs/generated/devkit/nrwl_devkit.md b/docs/generated/devkit/nrwl_devkit.md
@@ -101,8 +101,6 @@ It only uses language primitives and immutable objects
 - [applySharedFunction](../../devkit/documents/nrwl_devkit#applysharedfunction)
 - [convertNxExecutor](../../devkit/documents/nrwl_devkit#convertnxexecutor)
 - [convertNxGenerator](../../devkit/documents/nrwl_devkit#convertnxgenerator)
-- [createLockFile](../../devkit/documents/nrwl_devkit#createlockfile)
-- [createPackageJson](../../devkit/documents/nrwl_devkit#createpackagejson)
 - [createProjectGraphAsync](../../devkit/documents/nrwl_devkit#createprojectgraphasync)
 - [defaultTasksRunner](../../devkit/documents/nrwl_devkit#defaulttasksrunner)
 - [detectPackageManager](../../devkit/documents/nrwl_devkit#detectpackagemanager)
@@ -1054,53 +1052,6 @@ Convert an Nx Generator into an Angular Devkit Schematic.
 
 ---
 
-### createLockFile
-
-▸ **createLockFile**(`packageJson`, `packageManager?`): `string`
-
-**`Deprecated`**
-
-Import this from @nrwl/js instead
-
-#### Parameters
-
-| Name             | Type                                                                  |
-| :--------------- | :-------------------------------------------------------------------- |
-| `packageJson`    | `PackageJson`                                                         |
-| `packageManager` | [`PackageManager`](../../devkit/documents/nrwl_devkit#packagemanager) |
-
-#### Returns
-
-`string`
-
----
-
-### createPackageJson
-
-▸ **createPackageJson**(`projectName`, `graph`, `options?`): `PackageJson`
-
-**`Deprecated`**
-
-Import this from @nrwl/js instead
-
-#### Parameters
-
-| Name                          | Type                                                              |
-| :---------------------------- | :---------------------------------------------------------------- |
-| `projectName`                 | `string`                                                          |
-| `graph`                       | [`ProjectGraph`](../../devkit/documents/nrwl_devkit#projectgraph) |
-| `options`                     | `Object`                                                          |
-| `options.helperDependencies?` | `string`[]                                                        |
-| `options.isProduction?`       | `boolean`                                                         |
-| `options.root?`               | `string`                                                          |
-| `options.target?`             | `string`                                                          |
-
-#### Returns
-
-`PackageJson`
-
----
-
 ### createProjectGraphAsync
 
 ▸ **createProjectGraphAsync**(`opts?`): `Promise`<[`ProjectGraph`](../../devkit/documents/nrwl_devkit#projectgraph)\>

diff --git a/docs/generated/packages/devkit/documents/nrwl_devkit.md b/docs/generated/packages/devkit/documents/nrwl_devkit.md
@@ -101,8 +101,6 @@ It only uses language primitives and immutable objects
 - [applySharedFunction](../../devkit/documents/nrwl_devkit#applysharedfunction)
 - [convertNxExecutor](../../devkit/documents/nrwl_devkit#convertnxexecutor)
 - [convertNxGenerator](../../devkit/documents/nrwl_devkit#convertnxgenerator)
-- [createLockFile](../../devkit/documents/nrwl_devkit#createlockfile)
-- [createPackageJson](../../devkit/documents/nrwl_devkit#createpackagejson)
 - [createProjectGraphAsync](../../devkit/documents/nrwl_devkit#createprojectgraphasync)
 - [defaultTasksRunner](../../devkit/documents/nrwl_devkit#defaulttasksrunner)
 - [detectPackageManager](../../devkit/documents/nrwl_devkit#detectpackagemanager)
@@ -1054,53 +1052,6 @@ Convert an Nx Generator into an Angular Devkit Schematic.
 
 ---
 
-### createLockFile
-
-▸ **createLockFile**(`packageJson`, `packageManager?`): `string`
-
-**`Deprecated`**
-
-Import this from @nrwl/js instead
-
-#### Parameters
-
-| Name             | Type                                                                  |
-| :--------------- | :-------------------------------------------------------------------- |
-| `packageJson`    | `PackageJson`                                                         |
-| `packageManager` | [`PackageManager`](../../devkit/documents/nrwl_devkit#packagemanager) |
-
-#### Returns
-
-`string`
-
----
-
-### createPackageJson
-
-▸ **createPackageJson**(`projectName`, `graph`, `options?`): `PackageJson`
-
-**`Deprecated`**
-
-Import this from @nrwl/js instead
-
-#### Parameters
-
-| Name                          | Type                                                              |
-| :---------------------------- | :---------------------------------------------------------------- |
-| `projectName`                 | `string`                                                          |
-| `graph`                       | [`ProjectGraph`](../../devkit/documents/nrwl_devkit#projectgraph) |
-| `options`                     | `Object`                                                          |
-| `options.helperDependencies?` | `string`[]                                                        |
-| `options.isProduction?`       | `boolean`                                                         |
-| `options.root?`               | `string`                                                          |
-| `options.target?`             | `string`                                                          |
-
-#### Returns
-
-`PackageJson`
-
----
-
 ### createProjectGraphAsync
 
 ▸ **createProjectGraphAsync**(`opts?`): `Promise`<[`ProjectGraph`](../../devkit/documents/nrwl_devkit#projectgraph)\>

diff --git a/docs/generated/packages/jest/documents/overview.md b/docs/generated/packages/jest/documents/overview.md
@@ -135,7 +135,7 @@ In order to use Jest's global setup/teardown functions that reference nx librari
 Nx provides a helper function that you can import within your setup/teardown file.
 
 ```typescript {% fileName="global-setup.ts" %}
-import { registerTsProject } from 'nx/src/utils/register';
+import { registerTsProject } from '@nrwl/js/src/internal';
 const cleanupRegisteredPaths = registerTsProject('.', 'tsconfig.base.json');
 
 import { yourFancyFunction } from '@some-org/my-util-library';

diff --git a/docs/shared/packages/jest/jest-plugin.md b/docs/shared/packages/jest/jest-plugin.md
@@ -135,7 +135,7 @@ In order to use Jest's global setup/teardown functions that reference nx librari
 Nx provides a helper function that you can import within your setup/teardown file.
 
 ```typescript {% fileName="global-setup.ts" %}
-import { registerTsProject } from 'nx/src/utils/register';
+import { registerTsProject } from '@nrwl/js/src/internal';
 const cleanupRegisteredPaths = registerTsProject('.', 'tsconfig.base.json');
 
 import { yourFancyFunction } from '@some-org/my-util-library';

diff --git a/e2e/jest/src/jest.test.ts b/e2e/jest/src/jest.test.ts
@@ -48,7 +48,7 @@ describe('Jest', () => {
     updateFile(
       `libs/${mylib}/setup.ts`,
       stripIndents`
-      const { registerTsProject } = require('nx/src/utils/register');
+      const { registerTsProject } = require('@nx/js/src/internal');
       const cleanup = registerTsProject('.', 'tsconfig.base.json');
 
       import {setup} from '@global-fun/globals';
@@ -61,7 +61,7 @@ describe('Jest', () => {
     updateFile(
       `libs/${mylib}/teardown.ts`,
       stripIndents`
-      import { registerTsProject } from 'nx/src/utils/register';
+      const { registerTsProject } = require('@nx/js/src/internal');
       const cleanup = registerTsProject('.', 'tsconfig.base.json');
 
       import {teardown} from '@global-fun/globals';
@@ -73,19 +73,18 @@ describe('Jest', () => {
     updateFile(
       `libs/${mylib}/jest.config.ts`,
       stripIndents`
-          module.exports = {
-            testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
-            transform: {
-              '^.+\\.(ts|js|html)$': 'ts-jest'
-            },
-            resolver: '@nrwl/jest/plugins/resolver',
-            moduleFileExtensions: ['ts', 'js', 'html'],
-            coverageReporters: ['html'],
-            passWithNoTests: true,
-            globals: { testGlobal: ${testGlobal} },
-            globalSetup: '<rootDir>/setup.ts',
-            globalTeardown: '<rootDir>/teardown.ts'
-          };`
+        export default {
+          displayName: "${mylib}",
+          preset: "../../jest.preset.js",
+          transform: {
+            "^.+\\.[tj]s$": ["ts-jest", { tsconfig: "<rootDir>/tsconfig.spec.json" }],
+          },
+          moduleFileExtensions: ["ts", "js", "html"],
+          coverageDirectory: "../../coverage/libs/${mylib}",
+          globals: { testGlobal: ${testGlobal} },
+          globalSetup: '<rootDir>/setup.ts',
+          globalTeardown: '<rootDir>/teardown.ts'
+        };`
     );
 
     const appResult = await runCLIAsync(`test ${mylib} --no-watch`);

diff --git a/e2e/node/src/node.test.ts b/e2e/node/src/node.test.ts
@@ -14,7 +14,6 @@ import {
   packageManagerLockFile,
   promisifiedTreeKill,
   readFile,
-  readJson,
   runCLI,
   runCLIAsync,
   runCommand,
@@ -26,7 +25,7 @@ import {
 } from '@nrwl/e2e/utils';
 import { exec, execSync } from 'child_process';
 import * as http from 'http';
-import { getLockFileName } from 'nx/src/plugins/js/lock-file/lock-file';
+import { getLockFileName } from '@nx/js';
 import { satisfies } from 'semver';
 
 function getData(port, path = '/api'): Promise<any> {

diff --git a/packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts b/packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts
@@ -17,7 +17,7 @@ import type { Schema } from './schema';
 import { createTmpTsConfigForBuildableLibs } from '../utilities/buildable-libs';
 import { from } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
-import { getRootTsConfigPath } from 'nx/src/utils/typescript';
+import { getRootTsConfigPath } from '@nx/js';
 
 type BuildTargetOptions = {
   tsConfig: string;

diff --git a/packages/angular/src/generators/component-cypress-spec/lib/get-component-selector.ts b/packages/angular/src/generators/component-cypress-spec/lib/get-component-selector.ts
@@ -1,6 +1,6 @@
 import type { Tree } from '@nx/devkit';
 import { ensureTypescript } from '@nx/js/src/utils/typescript/ensure-typescript';
-import { findNodes } from 'nx/src/utils/typescript';
+import { findNodes } from '@nx/js';
 import type { PropertyAssignment } from 'typescript';
 
 import {

diff --git a/packages/angular/src/generators/utils/storybook-ast/module-info.ts b/packages/angular/src/generators/utils/storybook-ast/module-info.ts
@@ -5,7 +5,7 @@ import {
   stripIndents,
   visitNotIgnoredFiles,
 } from '@nx/devkit';
-import { findNodes } from 'nx/src/utils/typescript';
+import { findNodes } from '@nx/js';
 import { extname } from 'path';
 import type {
   ClassDeclaration,

diff --git a/packages/angular/src/generators/utils/storybook-ast/storybook-inputs.ts b/packages/angular/src/generators/utils/storybook-ast/storybook-inputs.ts
@@ -1,6 +1,5 @@
 import type { Tree } from '@nx/devkit';
-import { findNodes } from 'nx/src/utils/typescript';
-import { getSourceNodes } from '@nx/js';
+import { findNodes, getSourceNodes } from '@nx/js';
 import type { PropertyDeclaration } from 'typescript';
 import { getTsSourceFile } from '../../../utils/nx-devkit/ast-utils';
 import { ensureTypescript } from '@nx/js/src/utils/typescript/ensure-typescript';

diff --git a/packages/angular/src/utils/nx-devkit/ast-utils.ts b/packages/angular/src/utils/nx-devkit/ast-utils.ts
@@ -1,5 +1,5 @@
 import type * as ts from 'typescript';
-import { findNodes } from 'nx/src/utils/typescript';
+import { findNodes } from '@nx/js';
 import {
   getImport,
   getSourceNodes,

diff --git a/packages/devkit/src/generators/to-js.ts b/packages/devkit/src/generators/to-js.ts
@@ -1,6 +1,5 @@
 import type { Tree } from 'nx/src/generators/tree';
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-import { typescriptVersion } from 'nx/src/utils/versions';
+import { typescriptVersion } from '../utils/versions';
 import { ensurePackage } from '../utils/package-json';
 
 /**

diff --git a/packages/devkit/src/utils/module-federation/share.ts b/packages/devkit/src/utils/module-federation/share.ts
@@ -12,7 +12,7 @@ import {
   collectWorkspaceLibrarySecondaryEntryPoints,
 } from './secondary-entry-points';
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
-import { getRootTsConfigPath } from 'nx/src/utils/typescript';
+import { getRootTsConfigPath } from 'nx/src/plugins/js/utils/typescript';
 import type { ProjectGraph } from 'nx/src/config/project-graph';
 import { requireNx } from '../../../nx';
 

diff --git a/packages/devkit/src/utils/module-federation/typescript.ts b/packages/devkit/src/utils/module-federation/typescript.ts
@@ -1,7 +1,7 @@
 import { existsSync } from 'fs';
 import { ParsedCommandLine } from 'typescript';
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
-import { getRootTsConfigPath } from 'nx/src/utils/typescript';
+import { getRootTsConfigPath } from 'nx/src/plugins/js/utils/typescript';
 import { dirname } from 'path';
 
 let tsConfig: ParsedCommandLine;

diff --git a/packages/devkit/src/utils/versions.ts b/packages/devkit/src/utils/versions.ts
@@ -0,0 +1 @@
+export const typescriptVersion = '~4.9.5';
diff --git a/packages/eslint-plugin-nx/package.json b/packages/eslint-plugin-nx/package.json
@@ -33,11 +33,12 @@
     }
   },
   "dependencies": {
+    "@nx/devkit": "file:../devkit",
+    "@nx/js": "file:../js",
     "@typescript-eslint/utils": "^5.58.0",
     "chalk": "^4.1.0",
     "confusing-browser-globals": "^1.0.9",
-    "semver": "7.3.4",
-    "@nx/devkit": "file:../devkit"
+    "semver": "7.3.4"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/eslint-plugin-nx/src/resolve-workspace-rules.ts b/packages/eslint-plugin-nx/src/resolve-workspace-rules.ts
@@ -1,6 +1,6 @@
 import type { TSESLint } from '@typescript-eslint/utils';
 import { existsSync } from 'fs';
-import { registerTsProject } from 'nx/src/utils/register';
+import { registerTsProject } from '@nx/js/src/internal';
 import { WORKSPACE_PLUGIN_DIR, WORKSPACE_RULE_NAMESPACE } from './constants';
 
 type ESLintRules = Record<string, TSESLint.RuleModule<string, unknown[]>>;

diff --git a/packages/eslint-plugin-nx/src/rules/enforce-module-boundaries.ts b/packages/eslint-plugin-nx/src/rules/enforce-module-boundaries.ts
@@ -33,7 +33,7 @@ import {
   isComboDepConstraint,
 } from '../utils/runtime-lint-utils';
 import { AST_NODE_TYPES, TSESTree } from '@typescript-eslint/utils';
-import { TargetProjectLocator } from 'nx/src/plugins/js/project-graph/build-dependencies/target-project-locator';
+import { TargetProjectLocator } from '@nx/js/src/internal';
 import { basename, dirname, relative } from 'path';
 import {
   getBarrelEntryPointByImportScope,

diff --git a/packages/eslint-plugin-nx/src/rules/nx-plugin-checks.ts b/packages/eslint-plugin-nx/src/rules/nx-plugin-checks.ts
@@ -8,7 +8,7 @@ import {
 } from '@nx/devkit';
 import { findProject, getSourceFilePath } from '../utils/runtime-lint-utils';
 import { existsSync } from 'fs';
-import { registerTsProject } from 'nx/src/utils/register';
+import { registerTsProject } from '@nx/js/src/internal';
 import * as path from 'path';
 
 import { createESLintRule } from '../utils/create-eslint-rule';

diff --git a/packages/eslint-plugin-nx/src/utils/ast-utils.ts b/packages/eslint-plugin-nx/src/utils/ast-utils.ts
@@ -3,7 +3,7 @@ import {
   ProjectGraphProjectNode,
   readJsonFile,
 } from '@nx/devkit';
-import { findNodes } from 'nx/src/utils/typescript';
+import { findNodes } from 'nx/src/plugins/js/utils/typescript';
 import { existsSync, readFileSync } from 'fs';
 import { dirname } from 'path';
 import ts = require('typescript');

diff --git a/packages/eslint-plugin-nx/src/utils/runtime-lint-utils.ts b/packages/eslint-plugin-nx/src/utils/runtime-lint-utils.ts
@@ -13,15 +13,15 @@ import {
 } from '@nx/devkit';
 import { getPath, pathExists } from './graph-utils';
 import { readFileIfExisting } from 'nx/src/utils/fileutils';
-import { TargetProjectLocator } from 'nx/src/plugins/js/project-graph/build-dependencies/target-project-locator';
 import {
   findProjectForPath,
   ProjectRootMappings,
 } from 'nx/src/project-graph/utils/find-project-for-path';
+import { getRootTsConfigFileName } from '@nx/js';
 import {
-  getRootTsConfigFileName,
   resolveModuleByImport,
-} from 'nx/src/utils/typescript';
+  TargetProjectLocator,
+} from '@nx/js/src/internal';
 
 export type Deps = { [projectName: string]: ProjectGraphDependency[] };
 type SingleSourceTagConstraint = {

diff --git a/packages/expo/src/generators/component/lib/add-import.ts b/packages/expo/src/generators/component/lib/add-import.ts
@@ -1,4 +1,4 @@
-import { findNodes } from 'nx/src/utils/typescript';
+import { findNodes } from '@nx/js';
 import * as ts from 'typescript';
 import { ChangeType, StringChange } from '@nx/devkit';
 

diff --git a/packages/js/src/index.ts b/packages/js/src/index.ts
@@ -11,5 +11,13 @@ export * from './utils/assets';
 export * from './utils/package-json/update-package-json';
 export { libraryGenerator } from './generators/library/library';
 export { initGenerator } from './generators/init/init';
-export { createLockFile } from 'nx/src/plugins/js/lock-file/lock-file';
+
+export {
+  createLockFile,
+  getLockFileName,
+} from 'nx/src/plugins/js/lock-file/lock-file';
 export { createPackageJson } from 'nx/src/plugins/js/package-json/create-package-json';
+export {
+  findNodes,
+  getRootTsConfigPath,
+} from 'nx/src/plugins/js/utils/typescript';
diff --git a/packages/js/src/internal.ts b/packages/js/src/internal.ts
@@ -0,0 +1,6 @@
+export { resolveModuleByImport } from 'nx/src/plugins/js/utils/typescript';
+export {
+  registerTsProject,
+  registerTsConfigPaths,
+} from 'nx/src/plugins/js/utils/register';
+export { TargetProjectLocator } from 'nx/src/plugins/js/project-graph/build-dependencies/target-project-locator';