diff --git a/.claude/skills/dist-build-migration/SKILL.md b/.claude/skills/dist-build-migration/SKILL.md new file mode 100644 index 00000000000..2854558eb94 --- /dev/null +++ b/.claude/skills/dist-build-migration/SKILL.md @@ -0,0 +1,278 @@ +--- +name: dist-build-migration +description: Migrate an Nx package to build to a local dist/ directory with nodenext module resolution, exports map, and @nx/nx-source condition. +allowed-tools: Bash, Read, Glob, Grep, Agent, Edit, Write +--- + +# Migrate Package to Local Dist Build + +You are migrating an Nx monorepo package from building to `../../dist/packages/` to building locally to `packages//dist/`. This matches the pattern already used by `nx` and `devkit`. + +## Argument + +The user provides a package name (e.g., `js`, `webpack`, `angular`). The package lives at `packages//`. + +## Steps + +### 1. Read current state + +Read these files for the target package: + +- `packages//package.json` +- `packages//project.json` +- `packages//tsconfig.lib.json` +- `packages//tsconfig.spec.json` (if exists) +- `packages//.eslintrc.json` (if exists) +- `packages//assets.json` (if exists) +- `packages//.npmignore` (if exists) +- `packages//.gitignore` (if exists) + +Also read the reference implementations: + +- `packages/devkit/tsconfig.lib.json` +- `packages/devkit/package.json` +- `packages/devkit/project.json` +- `packages/devkit/.npmignore` + +Run `pnpm nx show target :build-base` to see the inferred build target. +Run `pnpm nx show target :build` to see the full build target. + +### 2. Identify entry points + +Look at the package's root `.ts` files and any existing `exports` field. Common entry points: + +- `index.ts` (main) +- `testing.ts` +- `internal.ts` +- `ngcli-adapter.ts` +- Any other `.ts` files at the package root that re-export from `src/` + +Also check for `migrations.json` and `generators.json`/`executors.json` — these need exports entries too. + +### 3. Update `tsconfig.lib.json` + +Transform from the old pattern to the new pattern: + +**Before:** + +```json +{ + "compilerOptions": { + "module": "commonjs", + "outDir": "../../dist/packages/", + "tsBuildInfoFile": "../../dist/packages//tsconfig.tsbuildinfo" + } +} +``` + +**After:** + +```json +{ + "compilerOptions": { + "outDir": "dist", + "rootDir": ".", + "declarationDir": "dist", + "declarationMap": false, + "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo", + "types": ["node"], + "composite": true, + "module": "nodenext", + "moduleResolution": "nodenext", + "esModuleInterop": true, + "allowSyntheticDefaultImports": true + }, + "exclude": ["node_modules", "dist", ...existing excludes, ".eslintrc.json"], + "include": ["*.ts", "src/**/*.ts"] +} +``` + +**Important**: Adjust `include` based on the package's actual structure. If the package has directories like `bin/`, `plugins/`, etc. at the root level (like `nx` does), include those too. + +### 4. Update `tsconfig.spec.json` (if exists) + +Change `outDir` from `../../dist/packages//spec` to `dist/spec`. + +### 5. Update `package.json` + +Key changes: + +- Add `"type": "commonjs"` near the top (after `private`) +- Change `"main"` to `"./dist/index.js"` +- Change `"types"` to `"./dist/index.d.ts"` +- Add `"typesVersions"` for backwards compatibility with `moduleResolution: "node"` consumers +- Add `"exports"` map with entries for each entry point + +Each export entry follows this pattern: + +```json +"./entry-name": { + "@nx/nx-source": "./entry-name.ts", + "types": "./entry-name.d.ts", + "default": "./dist/entry-name.js" +} +``` + +The main entry (`.`) uses `./index.ts`, `./index.d.ts`, `./dist/index.js`. + +Always include: + +```json +"./package.json": "./package.json" +``` + +Include `"./migrations.json": "./migrations.json"` if the package has migrations. + +**Note**: The `@nx/nx-source` condition is a custom condition used for source-level resolution within the workspace (so other packages import from source, not dist). + +Add a `typesVersions` field for consumers using `moduleResolution: "node"` (which doesn't read `exports`): + +```json +"typesVersions": { + "*": { + "testing": ["dist/testing.d.ts"], + "ngcli-adapter": ["dist/ngcli-adapter.d.ts"] + } +} +``` + +Add an entry for each subpath export (excluding `.`, `./package.json`, and `./migrations.json`). + +### 6. Update `project.json` + +Add these sections: + +```json +{ + "release": { + "version": { + "generator": "@nx/js:release-version", + "preserveLocalDependencyProtocols": true, + "manifestRootsToUpdate": ["packages/{projectName}"] + } + }, + "targets": { + "nx-release-publish": { + "options": { + "packageRoot": "packages/{projectName}" + } + }, + "build-base": { + "outputs": [ + "{projectRoot}/dist/**/*.{js,cjs,mjs,d.ts}", + "{projectRoot}/*.d.ts", + "{projectRoot}/src/**/*.d.ts" + ] + } + } +} +``` + +Update the existing `build` target's `outputs` if they reference `{workspaceRoot}/dist/packages/` — they should now reference `{projectRoot}/dist/`. + +Also update `dependsOn` in the `build` target: replace `"^build"` with `"^build"` if it isn't already, and make sure `"build-base"` is listed. + +### 7. Update `.eslintrc.json` + +Add `"dist"` and `"*.d.ts"` to `ignorePatterns`: + +```json +"ignorePatterns": ["!**/*", "node_modules", "dist", "*.d.ts"] +``` + +### 8. Update `assets.json` (if exists) + +Change `outDir` from `"dist/packages/"` to `"packages//dist"`. + +### 9. Add `files` field to `package.json` + +Instead of using `.npmignore`, add a `"files"` field to `package.json` (matching the `nx` package pattern). Remove `.npmignore` if it exists. + +```json +"files": [ + "dist", + "!dist/tsconfig.tsbuildinfo", + "migrations.json" +] +``` + +Adjust based on the package's needs: + +- Add `"executors.json"` and/or `"generators.json"` if the package has them +- Add any other non-TS files that need to be published +- npm always includes `package.json` and `README.md` automatically — no need to list them + +### 10. Rename README.md and update build command + +If the package has a `README.md` at its root and uses the `copy-readme.js` script in its build target: + +1. Rename `README.md` to `readme-template.md` (`git mv`) +2. Update the build command to pass explicit paths: + ``` + node ./scripts/copy-readme.js packages//readme-template.md packages//README.md + ``` +3. Update the build target `outputs` to `["{projectRoot}/README.md"]` + +The script's default behavior reads `packages//README.md` and writes to `dist/packages//README.md` — both wrong for the new layout. Passing explicit args fixes both. + +### 11. Update root `.gitignore` + +Add two entries to the workspace root `.gitignore`: + +1. Under the section that lists generated README files (look for `packages/nx/README.md`), add: + + ``` + packages//README.md + ``` + +2. Under the section that lists generated `.d.ts` files (look for `packages/nx/**/*.d.ts`), add: + ``` + packages//**/*.d.ts + ``` + +These are build outputs that shouldn't be committed. + +### 12. Update docs generation paths + +Check `astro-docs/src/plugins/utils/` for any code that references `.d.ts` files from the package. The docs generation reads `.d.ts` entry points to build API reference pages. Paths that previously pointed to `dist/packages//foo.d.ts` (workspace root dist) or `packages//foo.d.ts` (package root) now need to point to `packages//dist/foo.d.ts`. + +For example, `devkit-generation.ts` had to be updated to look for `packages/devkit/dist/index.d.ts` instead of `packages/devkit/index.d.ts`. + +### 13. Update `scripts/nx-release.ts` + +If the package has special release handling in `scripts/nx-release.ts` (like devkit's `hackFixForDevkitPeerDependencies`), update any paths from `./dist/packages//` to `./packages//`. + +### 14. Update imports across the workspace + +Search for imports from `@nx//src/` across all other packages. These internal imports need to be updated: + +- If the imported thing is re-exported through a public entry point (index.ts, internal.ts, etc.), update the import to use that entry point +- If not, consider adding it to `internal.ts` or the appropriate entry point + +Use: `grep -r "from '@nx//src/" packages/ --include="*.ts" -l` to find affected files. + +Also check for imports in: + +- `e2e/` tests +- `scripts/` +- `tools/workspace-plugin/` +- `astro-docs/` +- `examples/` + +### 15. Verify + +Run: + +```bash +pnpm nx run-many -t test,build,lint -p +``` + +Then: + +```bash +pnpm nx affected -t build,test,lint +``` + +### Summary of the pattern + +The core idea is simple: instead of building to a shared `dist/packages//` at the workspace root, each package builds to its own `packages//dist/`. The `exports` map with `@nx/nx-source` condition lets workspace packages resolve to `.ts` source files during development, while external consumers get the built `.js` from `dist/`. This is like giving each package its own "output mailbox" instead of sharing one big mailbox. diff --git a/.gitignore b/.gitignore index fbc0487fe14..52383a5bdfe 100644 --- a/.gitignore +++ b/.gitignore @@ -133,6 +133,7 @@ packages/angular-rspack-compiler/README.md packages/dotnet/README.md packages/maven/README.md packages/nx/README.md +packages/devkit/README.md test-output test-results diff --git a/astro-docs/src/plugins/utils/devkit-generation.ts b/astro-docs/src/plugins/utils/devkit-generation.ts index be3a6f9856e..5e73f1a2cdc 100644 --- a/astro-docs/src/plugins/utils/devkit-generation.ts +++ b/astro-docs/src/plugins/utils/devkit-generation.ts @@ -24,9 +24,9 @@ export async function loadDevkitPackage( // generate main @nx/devkit docs const devkitEntryPoint = join( workspaceRoot, - 'dist', 'packages', 'devkit', + 'dist', 'index.d.ts' ); if (existsSync(devkitEntryPoint)) { @@ -47,9 +47,9 @@ export async function loadDevkitPackage( // generate ngcli docs in same dir const ngcliEntryPoint = join( workspaceRoot, - 'dist', 'packages', 'devkit', + 'dist', 'ngcli-adapter.d.ts' ); if (existsSync(ngcliEntryPoint)) { diff --git a/astro-docs/src/plugins/utils/typedoc/typedoc.ts b/astro-docs/src/plugins/utils/typedoc/typedoc.ts index 0dca9202943..89991eec0e6 100644 --- a/astro-docs/src/plugins/utils/typedoc/typedoc.ts +++ b/astro-docs/src/plugins/utils/typedoc/typedoc.ts @@ -75,18 +75,12 @@ export function setupTypeDoc(logger: LoaderContext['logger']) { join(projectRoot, 'node_modules', '@types'), ]; - // This ensures that nx and @nx/ modules resolve to `dist` rather than what's installed in node_modules. - // TODO(jack,caleb): If we move outDir from `dist/packages/nx` to `packages/nx/dist` like standard TS solution setup, - // then this isn't needed anymore since we should have devDependencies that resolve to local - // `node_modules` not the root one. - tsconfigObj.compilerOptions.baseUrl = workspaceRoot; - tsconfigObj.compilerOptions.paths = { - 'nx/*': ['dist/packages/nx/*', 'packages/nx/src/*'], - '@nx/*': ['dist/packages/*', 'packages/*/src/*'], - }; + // TypeDoc requires its entry points to be referenced by `include` or + // `files` in the tsconfig. Point at devkit's compiled .d.ts files. + tsconfigObj.include = [join(devkitPath, 'dist', '**', '*.d.ts')]; tsconfigObj.exclude = [ - ...(tsconfigObj.exclude || []), + ...(tsconfigObj.exclude || []).filter((e: string) => e !== 'dist'), '**/*.spec.ts', '**/*.test.ts', '**/test/**', @@ -95,16 +89,6 @@ export function setupTypeDoc(logger: LoaderContext['logger']) { 'node_modules/@types/jest/**', ]; - // The tsconfig now lives in tempDir but it operates on devkit's compiled - // dist (entry point is dist/packages/devkit/index.d.ts). Resolve include - // patterns to absolute paths anchored at the dist directory so TypeDoc - // picks up the .d.ts files instead of looking for sources next to the temp - // tsconfig. - const distDevkitDir = join(workspaceRoot, 'dist', 'packages', 'devkit'); - tsconfigObj.include = (tsconfigObj.include || ['**/*.ts']).map( - (pattern: string) => join(distDevkitDir, pattern) - ); - writeFileSync(generatedTsconfigPath, JSON.stringify(tsconfigObj, null, 2)); rmSync(outDir, { recursive: true, force: true }); diff --git a/e2e/angular/src/misc.test.ts b/e2e/angular/src/misc.test.ts index 9a1d50fe2c6..8b22c0a7af2 100644 --- a/e2e/angular/src/misc.test.ts +++ b/e2e/angular/src/misc.test.ts @@ -7,7 +7,8 @@ import { uniq, updateFile, } from '@nx/e2e-utils'; -import { classify } from '@nx/devkit/src/utils/string-utils'; +import { names } from '@nx/devkit'; +const classify = (s: string) => names(s).className; describe('Move Angular Project', () => { let proj: string; diff --git a/e2e/angular/src/projects-linting.test.ts b/e2e/angular/src/projects-linting.test.ts index d76c06b46b1..280fb2d436c 100644 --- a/e2e/angular/src/projects-linting.test.ts +++ b/e2e/angular/src/projects-linting.test.ts @@ -23,14 +23,17 @@ describe('Angular Projects - Linting', () => { it('should lint correctly with eslint and handle external HTML files and inline templates', async () => { const { app1, lib1 } = setup; - // disable the prefer-standalone rule for app1 which is not standalone - let app1EslintConfig = readFile(`${app1}/eslint.config.mjs`); - app1EslintConfig = app1EslintConfig.replace( - `'@angular-eslint/directive-selector': [`, - `'@angular-eslint/prefer-standalone': 'off', - '@angular-eslint/directive-selector': [` - ); - updateFile(`${app1}/eslint.config.mjs`, app1EslintConfig); + // disable the prefer-standalone rule for app1 and lib1 which are not standalone. + // Use a regex so we match regardless of whether the generated config uses + // single or double quotes around the rule name. + for (const project of [app1, lib1]) { + let eslintConfig = readFile(`${project}/eslint.config.mjs`); + eslintConfig = eslintConfig.replace( + /(['"])@angular-eslint\/directive-selector\1:\s*\[/, + `"@angular-eslint/prefer-standalone": "off",\n "@angular-eslint/directive-selector": [` + ); + updateFile(`${project}/eslint.config.mjs`, eslintConfig); + } // check apps and lib pass linting for initial generated code runCLI(`run-many --target lint --projects=${app1},${lib1} --parallel`); diff --git a/e2e/next/src/next-legacy.test.ts b/e2e/next/src/next-legacy.test.ts index 54e28ae2a39..6821ef3a4f8 100644 --- a/e2e/next/src/next-legacy.test.ts +++ b/e2e/next/src/next-legacy.test.ts @@ -1,5 +1,4 @@ -import { capitalize } from '@nx/devkit/src/utils/string-utils'; -import { joinPathFragments } from '@nx/devkit'; +import { joinPathFragments, names } from '@nx/devkit'; import { checkFilesExist, cleanupProject, @@ -199,9 +198,9 @@ describe('@nx/next (legacy)', () => { import dynamic from 'next/dynamic'; const TestComponent = dynamic( - () => import('@${proj}/${nextLib}').then(d => d.${capitalize( - nextLib - )}) + () => import('@${proj}/${nextLib}').then(d => d.${ + names(nextLib).className + }) ); ${content.replace( ``, diff --git a/e2e/nx-build/src/nx-build.test.ts b/e2e/nx-build/src/nx-build.test.ts index dcbdb9fd4ad..5cabfe70ce0 100644 --- a/e2e/nx-build/src/nx-build.test.ts +++ b/e2e/nx-build/src/nx-build.test.ts @@ -15,7 +15,7 @@ const packagesToVerify = [ { name: 'devkit', sourceFile: 'index.ts', - outputFile: 'dist/packages/devkit/index.js', + outputFile: 'packages/devkit/dist/index.js', }, { name: 'js', diff --git a/examples/angular-rspack/appshell-css/package.json b/examples/angular-rspack/appshell-css/package.json index 5fc8c6f6e55..ec98abc7990 100644 --- a/examples/angular-rspack/appshell-css/package.json +++ b/examples/angular-rspack/appshell-css/package.json @@ -20,7 +20,6 @@ "dependentTasksOutputFiles": "**/*.js", "transitive": true }, - "{workspaceRoot}/examples/angular-rspack/patch-devkit-request-path.js", "{workspaceRoot}/examples/angular-rspack/tsconfig.base.json", "{workspaceRoot}/LICENSE", "{workspaceRoot}/tsconfig.json" diff --git a/examples/angular-rspack/appshell-css/rspack.config.js b/examples/angular-rspack/appshell-css/rspack.config.js index 40b9e2ed214..3162143167e 100644 --- a/examples/angular-rspack/appshell-css/rspack.config.js +++ b/examples/angular-rspack/appshell-css/rspack.config.js @@ -1,10 +1,5 @@ module.exports = () => { if (global.NX_GRAPH_CREATION === undefined) { - // This is needed to ensure that the `@nx/angular-rspack` package can find the build artefact for `@nx/devkit` - // TODO(colum): Remove this once packages in Nx are built to local dist - // eslint-disable-next-line @nx/enforce-module-boundaries - const { patchDevkitRequestPath } = require('../patch-devkit-request-path'); - const cleanupPatch = patchDevkitRequestPath(); const { createConfig } = require('@nx/angular-rspack'); const config = createConfig( { @@ -32,7 +27,6 @@ module.exports = () => { }, } ); - cleanupPatch(); return config; } return {}; diff --git a/examples/angular-rspack/csr-css-assets/package.json b/examples/angular-rspack/csr-css-assets/package.json index f41fa064690..88f3a5a2262 100644 --- a/examples/angular-rspack/csr-css-assets/package.json +++ b/examples/angular-rspack/csr-css-assets/package.json @@ -33,7 +33,6 @@ "dependentTasksOutputFiles": "**/*.js", "transitive": true }, - "{workspaceRoot}/examples/angular-rspack/patch-devkit-request-path.js", "{workspaceRoot}/examples/angular-rspack/tsconfig.base.json", "{workspaceRoot}/LICENSE", "{workspaceRoot}/tsconfig.json", diff --git a/examples/angular-rspack/csr-css-assets/rspack.config.js b/examples/angular-rspack/csr-css-assets/rspack.config.js index 6c91c1a1fb9..9fc72b76c25 100644 --- a/examples/angular-rspack/csr-css-assets/rspack.config.js +++ b/examples/angular-rspack/csr-css-assets/rspack.config.js @@ -1,10 +1,5 @@ module.exports = () => { if (global.NX_GRAPH_CREATION === undefined) { - // This is needed to ensure that the `@nx/angular-rspack` package can find the build artefact for `@nx/devkit` - // TODO(colum): Remove this once packages in Nx are built to local dist - // eslint-disable-next-line @nx/enforce-module-boundaries - const { patchDevkitRequestPath } = require('../patch-devkit-request-path'); - const cleanupPatch = patchDevkitRequestPath(); const { createConfig } = require('@nx/angular-rspack'); const config = createConfig( { @@ -101,7 +96,6 @@ module.exports = () => { }, } ); - cleanupPatch(); return config; } return {}; diff --git a/examples/angular-rspack/csr-css/package.json b/examples/angular-rspack/csr-css/package.json index 1cd77e186bb..91105ef2f59 100644 --- a/examples/angular-rspack/csr-css/package.json +++ b/examples/angular-rspack/csr-css/package.json @@ -33,7 +33,6 @@ "dependentTasksOutputFiles": "**/*.js", "transitive": true }, - "{workspaceRoot}/examples/angular-rspack/patch-devkit-request-path.js", "{workspaceRoot}/examples/angular-rspack/tsconfig.base.json", "{workspaceRoot}/LICENSE", "{workspaceRoot}/tsconfig.json", diff --git a/examples/angular-rspack/csr-css/rspack.config.js b/examples/angular-rspack/csr-css/rspack.config.js index 6c91c1a1fb9..9fc72b76c25 100644 --- a/examples/angular-rspack/csr-css/rspack.config.js +++ b/examples/angular-rspack/csr-css/rspack.config.js @@ -1,10 +1,5 @@ module.exports = () => { if (global.NX_GRAPH_CREATION === undefined) { - // This is needed to ensure that the `@nx/angular-rspack` package can find the build artefact for `@nx/devkit` - // TODO(colum): Remove this once packages in Nx are built to local dist - // eslint-disable-next-line @nx/enforce-module-boundaries - const { patchDevkitRequestPath } = require('../patch-devkit-request-path'); - const cleanupPatch = patchDevkitRequestPath(); const { createConfig } = require('@nx/angular-rspack'); const config = createConfig( { @@ -101,7 +96,6 @@ module.exports = () => { }, } ); - cleanupPatch(); return config; } return {}; diff --git a/examples/angular-rspack/csr-i18n/package.json b/examples/angular-rspack/csr-i18n/package.json index 7b2670e881c..7b2a17717b3 100644 --- a/examples/angular-rspack/csr-i18n/package.json +++ b/examples/angular-rspack/csr-i18n/package.json @@ -32,7 +32,6 @@ "dependentTasksOutputFiles": "**/*.js", "transitive": true }, - "{workspaceRoot}/examples/angular-rspack/patch-devkit-request-path.js", "{workspaceRoot}/examples/angular-rspack/tsconfig.base.json", "{workspaceRoot}/LICENSE", "{workspaceRoot}/tsconfig.json" diff --git a/examples/angular-rspack/csr-i18n/rspack.config.js b/examples/angular-rspack/csr-i18n/rspack.config.js index 94a8736c6df..4aa0af2a837 100644 --- a/examples/angular-rspack/csr-i18n/rspack.config.js +++ b/examples/angular-rspack/csr-i18n/rspack.config.js @@ -1,10 +1,5 @@ module.exports = () => { if (global.NX_GRAPH_CREATION === undefined) { - // This is needed to ensure that the `@nx/angular-rspack` package can find the build artefact for `@nx/devkit` - // TODO(colum): Remove this once packages in Nx are built to local dist - // eslint-disable-next-line @nx/enforce-module-boundaries - const { patchDevkitRequestPath } = require('../patch-devkit-request-path'); - const cleanupPatch = patchDevkitRequestPath(); const { createConfig } = require('@nx/angular-rspack'); const config = createConfig( { @@ -41,7 +36,6 @@ module.exports = () => { }, } ); - cleanupPatch(); return config; } return {}; diff --git a/examples/angular-rspack/csr-scss/package.json b/examples/angular-rspack/csr-scss/package.json index d97ccd9e895..df0d3cfaa71 100644 --- a/examples/angular-rspack/csr-scss/package.json +++ b/examples/angular-rspack/csr-scss/package.json @@ -23,7 +23,6 @@ "dependentTasksOutputFiles": "**/*.js", "transitive": true }, - "{workspaceRoot}/examples/angular-rspack/patch-devkit-request-path.js", "{workspaceRoot}/examples/angular-rspack/tsconfig.base.json", "{workspaceRoot}/LICENSE", "{workspaceRoot}/tsconfig.json", diff --git a/examples/angular-rspack/csr-scss/rspack.config.js b/examples/angular-rspack/csr-scss/rspack.config.js index 509d253a116..b6e1ba1991f 100644 --- a/examples/angular-rspack/csr-scss/rspack.config.js +++ b/examples/angular-rspack/csr-scss/rspack.config.js @@ -1,10 +1,5 @@ module.exports = () => { if (global.NX_GRAPH_CREATION === undefined) { - // This is needed to ensure that the `@nx/angular-rspack` package can find the build artefact for `@nx/devkit` - // TODO(colum): Remove this once packages in Nx are built to local dist - // eslint-disable-next-line @nx/enforce-module-boundaries - const { patchDevkitRequestPath } = require('../patch-devkit-request-path'); - const cleanupPatch = patchDevkitRequestPath(); const { createConfig } = require('@nx/angular-rspack'); const config = createConfig( { @@ -50,7 +45,6 @@ module.exports = () => { }, } ); - cleanupPatch(); return config; } return {}; diff --git a/examples/angular-rspack/csr-tailwind/package.json b/examples/angular-rspack/csr-tailwind/package.json index 15153e662c2..41959ab7c69 100644 --- a/examples/angular-rspack/csr-tailwind/package.json +++ b/examples/angular-rspack/csr-tailwind/package.json @@ -21,7 +21,6 @@ "dependentTasksOutputFiles": "**/*.js", "transitive": true }, - "{workspaceRoot}/examples/angular-rspack/patch-devkit-request-path.js", "{workspaceRoot}/examples/angular-rspack/tsconfig.base.json", "{workspaceRoot}/LICENSE", "{workspaceRoot}/tsconfig.json" diff --git a/examples/angular-rspack/csr-tailwind/rspack.config.js b/examples/angular-rspack/csr-tailwind/rspack.config.js index 442b6606b05..843c341ffa9 100644 --- a/examples/angular-rspack/csr-tailwind/rspack.config.js +++ b/examples/angular-rspack/csr-tailwind/rspack.config.js @@ -1,10 +1,5 @@ module.exports = () => { if (global.NX_GRAPH_CREATION === undefined) { - // This is needed to ensure that the `@nx/angular-rspack` package can find the build artefact for `@nx/devkit` - // TODO(colum): Remove this once packages in Nx are built to local dist - // eslint-disable-next-line @nx/enforce-module-boundaries - const { patchDevkitRequestPath } = require('../patch-devkit-request-path'); - const cleanupPatch = patchDevkitRequestPath(); const { createConfig } = require('@nx/angular-rspack'); const config = createConfig( { @@ -39,7 +34,6 @@ module.exports = () => { }, } ); - cleanupPatch(); return config; } return {}; diff --git a/examples/angular-rspack/module-federation/host/rspack.config.js b/examples/angular-rspack/module-federation/host/rspack.config.js index 374fc487833..8f631f6cab6 100644 --- a/examples/angular-rspack/module-federation/host/rspack.config.js +++ b/examples/angular-rspack/module-federation/host/rspack.config.js @@ -1,20 +1,12 @@ -/* eslint-disable @nx/enforce-module-boundaries */ -const { - patchDevkitRequestPath, - patchModuleFederationRequestPath, -} = require('../../patch-devkit-request-path'); -/* eslint-enable @nx/enforce-module-boundaries */ module.exports = () => { if (global.NX_GRAPH_CREATION === undefined) { - // This is needed to ensure that the `@nx/angular-rspack` package can find the build artefact for `@nx/devkit` - // TODO(colum): Remove this once packages in Nx are built to local dist + // This is needed to ensure that the `@nx/angular-rspack` package can find the build artefact for `@nx/module-federation`. + // TODO(colum): Remove this once @nx/module-federation builds to local dist. /* eslint-disable @nx/enforce-module-boundaries */ const { - patchDevkitRequestPath, patchModuleFederationRequestPath, } = require('../../patch-devkit-request-path'); /* eslint-enable @nx/enforce-module-boundaries */ - const cleanupDevkitPatch = patchDevkitRequestPath(); const cleanupModuleFederationPatch = patchModuleFederationRequestPath(); const { NxModuleFederationPlugin, @@ -83,7 +75,6 @@ module.exports = () => { }, } ); - cleanupDevkitPatch(); cleanupModuleFederationPatch(); return config; } diff --git a/examples/angular-rspack/module-federation/remote/rspack.config.js b/examples/angular-rspack/module-federation/remote/rspack.config.js index 2045ab15e59..3037475ec56 100644 --- a/examples/angular-rspack/module-federation/remote/rspack.config.js +++ b/examples/angular-rspack/module-federation/remote/rspack.config.js @@ -1,14 +1,12 @@ module.exports = () => { if (global.NX_GRAPH_CREATION === undefined) { - // This is needed to ensure that the `@nx/angular-rspack` package can find the build artefact for `@nx/devkit` - // TODO(colum): Remove this once packages in Nx are built to local dist + // This is needed to ensure that the `@nx/angular-rspack` package can find the build artefact for `@nx/module-federation`. + // TODO(colum): Remove this once @nx/module-federation builds to local dist. /* eslint-disable @nx/enforce-module-boundaries */ const { - patchDevkitRequestPath, patchModuleFederationRequestPath, } = require('../../patch-devkit-request-path'); /* eslint-enable @nx/enforce-module-boundaries */ - const cleanupDevkitPatch = patchDevkitRequestPath(); const cleanupModuleFederationPatch = patchModuleFederationRequestPath(); const { NxModuleFederationPlugin, @@ -77,7 +75,6 @@ module.exports = () => { }, } ); - cleanupDevkitPatch(); cleanupModuleFederationPatch(); return config; } diff --git a/examples/angular-rspack/patch-devkit-request-path.js b/examples/angular-rspack/patch-devkit-request-path.js index 49fbff3458c..1a8aa88b2cf 100644 --- a/examples/angular-rspack/patch-devkit-request-path.js +++ b/examples/angular-rspack/patch-devkit-request-path.js @@ -2,33 +2,6 @@ const Module = require('module'); const path = require('path'); module.exports = { - patchDevkitRequestPath() { - const originalResolveFilename = Module._resolveFilename; - - Module._resolveFilename = function (request, parent, isMain) { - if (request === '@nx/devkit') { - const possiblePaths = [ - path.resolve(__dirname, '../../dist/packages/devkit'), - ]; - - for (const tryPath of possiblePaths) { - try { - return originalResolveFilename.call(this, tryPath, parent, isMain); - } catch (err) { - // Continue to next path - } - } - - // If none work, fall back to original error - console.error(`Could not find @nx/devkit in any of the fallback paths`); - } - - return originalResolveFilename.call(this, request, parent, isMain); - }; - return () => { - Module._resolveFilename = originalResolveFilename; - }; - }, // Required to use the built module federation package rather than installed patchModuleFederationRequestPath() { const originalResolveFilename = Module._resolveFilename; diff --git a/examples/angular-rspack/ssg-css/package.json b/examples/angular-rspack/ssg-css/package.json index 31120517d3d..4a8297a7855 100644 --- a/examples/angular-rspack/ssg-css/package.json +++ b/examples/angular-rspack/ssg-css/package.json @@ -20,7 +20,6 @@ "dependentTasksOutputFiles": "**/*.js", "transitive": true }, - "{workspaceRoot}/examples/angular-rspack/patch-devkit-request-path.js", "{workspaceRoot}/examples/angular-rspack/tsconfig.base.json", "{workspaceRoot}/LICENSE", "{workspaceRoot}/tsconfig.json" diff --git a/examples/angular-rspack/ssg-css/rspack.config.js b/examples/angular-rspack/ssg-css/rspack.config.js index 597a37d7149..fdb2da1809b 100644 --- a/examples/angular-rspack/ssg-css/rspack.config.js +++ b/examples/angular-rspack/ssg-css/rspack.config.js @@ -1,10 +1,5 @@ module.exports = () => { if (global.NX_GRAPH_CREATION === undefined) { - // This is needed to ensure that the `@nx/angular-rspack` package can find the build artefact for `@nx/devkit` - // TODO(colum): Remove this once packages in Nx are built to local dist - // eslint-disable-next-line @nx/enforce-module-boundaries - const { patchDevkitRequestPath } = require('../patch-devkit-request-path'); - const cleanupPatch = patchDevkitRequestPath(); const { createConfig } = require('@nx/angular-rspack'); const config = createConfig( { @@ -32,7 +27,6 @@ module.exports = () => { }, } ); - cleanupPatch(); return config; } return {}; diff --git a/examples/angular-rspack/ssr-css/package.json b/examples/angular-rspack/ssr-css/package.json index a888218f6ef..02d1f7fa86f 100644 --- a/examples/angular-rspack/ssr-css/package.json +++ b/examples/angular-rspack/ssr-css/package.json @@ -20,7 +20,6 @@ "dependentTasksOutputFiles": "**/*.js", "transitive": true }, - "{workspaceRoot}/examples/angular-rspack/patch-devkit-request-path.js", "{workspaceRoot}/examples/angular-rspack/tsconfig.base.json", "{workspaceRoot}/LICENSE", "{workspaceRoot}/tsconfig.json" diff --git a/examples/angular-rspack/ssr-css/rspack.config.js b/examples/angular-rspack/ssr-css/rspack.config.js index cc30e5bb0fe..df7bb4484b1 100644 --- a/examples/angular-rspack/ssr-css/rspack.config.js +++ b/examples/angular-rspack/ssr-css/rspack.config.js @@ -1,10 +1,5 @@ module.exports = () => { if (global.NX_GRAPH_CREATION === undefined) { - // This is needed to ensure that the `@nx/angular-rspack` package can find the build artefact for `@nx/devkit` - // TODO(colum): Remove this once packages in Nx are built to local dist - // eslint-disable-next-line @nx/enforce-module-boundaries - const { patchDevkitRequestPath } = require('../patch-devkit-request-path'); - const cleanupPatch = patchDevkitRequestPath(); const { createConfig } = require('@nx/angular-rspack'); const config = createConfig( { @@ -32,7 +27,6 @@ module.exports = () => { }, } ); - cleanupPatch(); return config; } return {}; diff --git a/examples/angular-rspack/zoneless-csr-css/package.json b/examples/angular-rspack/zoneless-csr-css/package.json index cf742e9049c..9580580651a 100644 --- a/examples/angular-rspack/zoneless-csr-css/package.json +++ b/examples/angular-rspack/zoneless-csr-css/package.json @@ -33,7 +33,6 @@ "dependentTasksOutputFiles": "**/*.js", "transitive": true }, - "{workspaceRoot}/examples/angular-rspack/patch-devkit-request-path.js", "{workspaceRoot}/examples/angular-rspack/tsconfig.base.json", "{workspaceRoot}/LICENSE", "{workspaceRoot}/tsconfig.json", diff --git a/examples/angular-rspack/zoneless-csr-css/rspack.config.js b/examples/angular-rspack/zoneless-csr-css/rspack.config.js index f18f6cda6f2..7346c26c47d 100644 --- a/examples/angular-rspack/zoneless-csr-css/rspack.config.js +++ b/examples/angular-rspack/zoneless-csr-css/rspack.config.js @@ -1,10 +1,5 @@ module.exports = () => { if (global.NX_GRAPH_CREATION === undefined) { - // This is needed to ensure that the `@nx/angular-rspack` package can find the build artefact for `@nx/devkit` - // TODO(colum): Remove this once packages in Nx are built to local dist - // eslint-disable-next-line @nx/enforce-module-boundaries - const { patchDevkitRequestPath } = require('../patch-devkit-request-path'); - const cleanupPatch = patchDevkitRequestPath(); const { createConfig } = require('@nx/angular-rspack'); const config = createConfig( { @@ -101,7 +96,6 @@ module.exports = () => { }, } ); - cleanupPatch(); return config; } return {}; diff --git a/examples/angular-rspack/zoneless-csr-i18n/package.json b/examples/angular-rspack/zoneless-csr-i18n/package.json index 98ec64032da..a6b793e4315 100644 --- a/examples/angular-rspack/zoneless-csr-i18n/package.json +++ b/examples/angular-rspack/zoneless-csr-i18n/package.json @@ -32,7 +32,6 @@ "dependentTasksOutputFiles": "**/*.js", "transitive": true }, - "{workspaceRoot}/examples/angular-rspack/patch-devkit-request-path.js", "{workspaceRoot}/examples/angular-rspack/tsconfig.base.json", "{workspaceRoot}/LICENSE", "{workspaceRoot}/tsconfig.json" diff --git a/examples/angular-rspack/zoneless-csr-i18n/rspack.config.js b/examples/angular-rspack/zoneless-csr-i18n/rspack.config.js index 4e0e6c88b2f..e726a776921 100644 --- a/examples/angular-rspack/zoneless-csr-i18n/rspack.config.js +++ b/examples/angular-rspack/zoneless-csr-i18n/rspack.config.js @@ -1,10 +1,5 @@ module.exports = () => { if (global.NX_GRAPH_CREATION === undefined) { - // This is needed to ensure that the `@nx/angular-rspack` package can find the build artefact for `@nx/devkit` - // TODO(colum): Remove this once packages in Nx are built to local dist - // eslint-disable-next-line @nx/enforce-module-boundaries - const { patchDevkitRequestPath } = require('../patch-devkit-request-path'); - const cleanupPatch = patchDevkitRequestPath(); const { createConfig } = require('@nx/angular-rspack'); const config = createConfig( { @@ -41,7 +36,6 @@ module.exports = () => { }, } ); - cleanupPatch(); return config; } return {}; diff --git a/examples/angular-rspack/zoneless-ssg-css/package.json b/examples/angular-rspack/zoneless-ssg-css/package.json index 24f836d600d..42563736175 100644 --- a/examples/angular-rspack/zoneless-ssg-css/package.json +++ b/examples/angular-rspack/zoneless-ssg-css/package.json @@ -20,7 +20,6 @@ "dependentTasksOutputFiles": "**/*.js", "transitive": true }, - "{workspaceRoot}/examples/angular-rspack/patch-devkit-request-path.js", "{workspaceRoot}/examples/angular-rspack/tsconfig.base.json", "{workspaceRoot}/LICENSE", "{workspaceRoot}/tsconfig.json" diff --git a/examples/angular-rspack/zoneless-ssg-css/rspack.config.js b/examples/angular-rspack/zoneless-ssg-css/rspack.config.js index 2c5d7ce2909..19af12f7a7a 100644 --- a/examples/angular-rspack/zoneless-ssg-css/rspack.config.js +++ b/examples/angular-rspack/zoneless-ssg-css/rspack.config.js @@ -1,10 +1,5 @@ module.exports = () => { if (global.NX_GRAPH_CREATION === undefined) { - // This is needed to ensure that the `@nx/angular-rspack` package can find the build artefact for `@nx/devkit` - // TODO(colum): Remove this once packages in Nx are built to local dist - // eslint-disable-next-line @nx/enforce-module-boundaries - const { patchDevkitRequestPath } = require('../patch-devkit-request-path'); - const cleanupPatch = patchDevkitRequestPath(); const { createConfig } = require('@nx/angular-rspack'); const config = createConfig( { @@ -32,7 +27,6 @@ module.exports = () => { }, } ); - cleanupPatch(); return config; } return {}; diff --git a/examples/angular-rspack/zoneless-ssr-css/package.json b/examples/angular-rspack/zoneless-ssr-css/package.json index 8615ae653e3..ab4cc48612f 100644 --- a/examples/angular-rspack/zoneless-ssr-css/package.json +++ b/examples/angular-rspack/zoneless-ssr-css/package.json @@ -20,7 +20,6 @@ "dependentTasksOutputFiles": "**/*.js", "transitive": true }, - "{workspaceRoot}/examples/angular-rspack/patch-devkit-request-path.js", "{workspaceRoot}/examples/angular-rspack/tsconfig.base.json", "{workspaceRoot}/LICENSE", "{workspaceRoot}/tsconfig.json" diff --git a/examples/angular-rspack/zoneless-ssr-css/rspack.config.js b/examples/angular-rspack/zoneless-ssr-css/rspack.config.js index 28f6dcba8be..0bb753809f2 100644 --- a/examples/angular-rspack/zoneless-ssr-css/rspack.config.js +++ b/examples/angular-rspack/zoneless-ssr-css/rspack.config.js @@ -1,10 +1,5 @@ module.exports = () => { if (global.NX_GRAPH_CREATION === undefined) { - // This is needed to ensure that the `@nx/angular-rspack` package can find the build artefact for `@nx/devkit` - // TODO(colum): Remove this once packages in Nx are built to local dist - // eslint-disable-next-line @nx/enforce-module-boundaries - const { patchDevkitRequestPath } = require('../patch-devkit-request-path'); - const cleanupPatch = patchDevkitRequestPath(); const { createConfig } = require('@nx/angular-rspack'); const config = createConfig( { @@ -32,7 +27,6 @@ module.exports = () => { }, } ); - cleanupPatch(); return config; } return {}; diff --git a/packages/angular/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts b/packages/angular/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts index 009d1249631..3f54570cf47 100644 --- a/packages/angular/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts +++ b/packages/angular/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts @@ -1,3 +1,9 @@ +import { + eachValueFrom, + combineAsyncIterables, + createAsyncIterable, + mapAsyncIterable, +} from '@nx/devkit/internal'; import { type ExecutorContext, logger, @@ -5,12 +11,6 @@ import { } from '@nx/devkit'; import { type Schema } from './schema'; import { normalizeOptions, startRemotes } from './lib'; -import { eachValueFrom } from '@nx/devkit/src/utils/rxjs-for-await'; -import { - combineAsyncIterables, - createAsyncIterable, - mapAsyncIterable, -} from '@nx/devkit/src/utils/async-iterable'; import { startRemoteIterators } from '@nx/module-federation/src/executors/utils'; import { waitForPortOpen } from '@nx/web/src/utils/wait-for-port-open'; import fileServerExecutor from '@nx/web/src/executors/file-server/file-server.impl'; diff --git a/packages/angular/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts b/packages/angular/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts index 95dd1a72556..c2876f7b4d5 100644 --- a/packages/angular/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts +++ b/packages/angular/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts @@ -3,8 +3,8 @@ import { combineAsyncIterables, createAsyncIterable, mapAsyncIterable, -} from '@nx/devkit/src/utils/async-iterable'; -import { eachValueFrom } from '@nx/devkit/src/utils/rxjs-for-await'; + eachValueFrom, +} from '@nx/devkit/internal'; import { startRemoteIterators } from '@nx/module-federation/src/executors/utils'; import { waitForPortOpen } from '@nx/web/src/utils/wait-for-port-open'; import { existsSync } from 'fs'; diff --git a/packages/angular/src/executors/package/package.impl.ts b/packages/angular/src/executors/package/package.impl.ts index 34c19809223..1057a99f40b 100644 --- a/packages/angular/src/executors/package/package.impl.ts +++ b/packages/angular/src/executors/package/package.impl.ts @@ -1,5 +1,5 @@ import type { ExecutorContext } from '@nx/devkit'; -import { eachValueFrom } from '@nx/devkit/src/utils/rxjs-for-await'; +import { eachValueFrom } from '@nx/devkit/internal'; import { calculateProjectBuildableDependencies, createTmpTsConfig, diff --git a/packages/angular/src/generators/add-linting/add-linting.ts b/packages/angular/src/generators/add-linting/add-linting.ts index 8a0668d6faa..63fd8a800ec 100755 --- a/packages/angular/src/generators/add-linting/add-linting.ts +++ b/packages/angular/src/generators/add-linting/add-linting.ts @@ -1,3 +1,4 @@ +import { camelize, dasherize } from '@nx/devkit/internal'; import { formatFiles, joinPathFragments, @@ -5,7 +6,6 @@ import { type GeneratorCallback, type Tree, } from '@nx/devkit'; -import { camelize, dasherize } from '@nx/devkit/src/utils/string-utils'; import { lintProjectGenerator } from '@nx/eslint'; import { javaScriptOverride, diff --git a/packages/angular/src/generators/application/application.ts b/packages/angular/src/generators/application/application.ts index 44e1b014568..d00d5f65a94 100644 --- a/packages/angular/src/generators/application/application.ts +++ b/packages/angular/src/generators/application/application.ts @@ -1,3 +1,4 @@ +import { logShowProjectCommand } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, formatFiles, @@ -10,7 +11,6 @@ import { Tree, updateNxJson, } from '@nx/devkit'; -import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-command'; import { initGenerator as jsInitGenerator } from '@nx/js'; import { convertToRspack } from '../convert-to-rspack/convert-to-rspack'; import { angularInitGenerator } from '../init/init'; diff --git a/packages/angular/src/generators/application/lib/add-e2e.ts b/packages/angular/src/generators/application/lib/add-e2e.ts index 26172591324..306b32d0360 100644 --- a/packages/angular/src/generators/application/lib/add-e2e.ts +++ b/packages/angular/src/generators/application/lib/add-e2e.ts @@ -1,4 +1,5 @@ import { Tree } from '@nx/devkit'; +import { E2EWebServerDetails } from '@nx/devkit/internal'; import { addProjectConfiguration, ensurePackage, @@ -8,7 +9,6 @@ import { } from '@nx/devkit'; import { nxVersion } from '../../../utils/versions'; import type { NormalizedSchema } from './normalized-schema'; -import { E2EWebServerDetails } from '@nx/devkit/src/generators/e2e-web-server-info-utils'; export async function addE2e(tree: Tree, options: NormalizedSchema) { // since e2e are separate projects, default to adding plugins diff --git a/packages/angular/src/generators/application/lib/create-project.ts b/packages/angular/src/generators/application/lib/create-project.ts index dbef9ef18a3..b29b69aba50 100644 --- a/packages/angular/src/generators/application/lib/create-project.ts +++ b/packages/angular/src/generators/application/lib/create-project.ts @@ -1,10 +1,10 @@ +import { addBuildTargetDefaults } from '@nx/devkit/internal'; import { addProjectConfiguration, joinPathFragments, type ProjectConfiguration, type Tree, } from '@nx/devkit'; -import { addBuildTargetDefaults } from '@nx/devkit/src/generators/target-defaults-utils'; import type { AngularProjectConfiguration } from '../../../utils/types'; import { getInstalledAngularVersionInfo } from '../../utils/version-utils'; import type { NormalizedSchema } from './normalized-schema'; diff --git a/packages/angular/src/generators/application/lib/normalize-options.ts b/packages/angular/src/generators/application/lib/normalize-options.ts index 41529f0b6c2..3117f9ba8ab 100644 --- a/packages/angular/src/generators/application/lib/normalize-options.ts +++ b/packages/angular/src/generators/application/lib/normalize-options.ts @@ -2,7 +2,7 @@ import { joinPathFragments, readNxJson, type Tree } from '@nx/devkit'; import { determineProjectNameAndRootOptions, ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; +} from '@nx/devkit/internal'; import { E2eTestRunner, UnitTestRunner } from '../../../utils/test-runners'; import { getInstalledAngularVersionInfo } from '../../utils/version-utils'; import type { Schema } from '../schema'; diff --git a/packages/angular/src/generators/component/lib/normalize-options.ts b/packages/angular/src/generators/component/lib/normalize-options.ts index a68a1c9bc5c..2353a6c4965 100644 --- a/packages/angular/src/generators/component/lib/normalize-options.ts +++ b/packages/angular/src/generators/component/lib/normalize-options.ts @@ -1,6 +1,6 @@ import type { Tree } from '@nx/devkit'; import { names, readProjectConfiguration } from '@nx/devkit'; -import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; +import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/internal'; import type { AngularProjectConfiguration } from '../../../utils/types'; import { buildSelector, validateHtmlSelector } from '../../utils/selector'; import { validateClassName } from '../../utils/validations'; diff --git a/packages/angular/src/generators/convert-to-rspack/convert-to-rspack.ts b/packages/angular/src/generators/convert-to-rspack/convert-to-rspack.ts index f54cbe6f166..198da1ea323 100644 --- a/packages/angular/src/generators/convert-to-rspack/convert-to-rspack.ts +++ b/packages/angular/src/generators/convert-to-rspack/convert-to-rspack.ts @@ -1,3 +1,4 @@ +import { forEachExecutorOptions, getNamedInputs } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, ensurePackage, @@ -16,8 +17,6 @@ import { type TargetConfiguration, type Tree, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import type { RspackPluginOptions } from '@nx/rspack/plugin'; import { prompt } from 'enquirer'; import { relative, resolve } from 'path'; diff --git a/packages/angular/src/generators/convert-to-rspack/lib/get-custom-webpack-config.ts b/packages/angular/src/generators/convert-to-rspack/lib/get-custom-webpack-config.ts index 00d67d0abed..54a244d0351 100644 --- a/packages/angular/src/generators/convert-to-rspack/lib/get-custom-webpack-config.ts +++ b/packages/angular/src/generators/convert-to-rspack/lib/get-custom-webpack-config.ts @@ -1,5 +1,5 @@ import { logger, Tree } from '@nx/devkit'; -import { loadConfigFile } from '@nx/devkit/src/utils/config-utils'; +import { loadConfigFile } from '@nx/devkit/internal'; import { join, relative } from 'path'; import { ast, query } from '@phenomnomnominal/tsquery'; diff --git a/packages/angular/src/generators/directive/lib/normalize-options.ts b/packages/angular/src/generators/directive/lib/normalize-options.ts index e43e4e5ee7d..69cf796522d 100644 --- a/packages/angular/src/generators/directive/lib/normalize-options.ts +++ b/packages/angular/src/generators/directive/lib/normalize-options.ts @@ -1,6 +1,6 @@ import type { Tree } from '@nx/devkit'; import { names, readProjectConfiguration } from '@nx/devkit'; -import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; +import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/internal'; import type { AngularProjectConfiguration } from '../../../utils/types'; import { buildSelector, validateHtmlSelector } from '../../utils/selector'; import { validateClassName } from '../../utils/validations'; diff --git a/packages/angular/src/generators/federate-module/lib/add-remote.ts b/packages/angular/src/generators/federate-module/lib/add-remote.ts index d7476dcf49d..cd568738956 100644 --- a/packages/angular/src/generators/federate-module/lib/add-remote.ts +++ b/packages/angular/src/generators/federate-module/lib/add-remote.ts @@ -1,5 +1,5 @@ import type { GeneratorCallback, Tree } from '@nx/devkit'; -import { determineProjectNameAndRootOptions } from '@nx/devkit/src/generators/project-name-and-root-utils'; +import { determineProjectNameAndRootOptions } from '@nx/devkit/internal'; import { E2eTestRunner, UnitTestRunner } from '../../../utils/test-runners'; import remoteGenerator from '../../remote/remote'; import { type Schema } from '../schema'; diff --git a/packages/angular/src/generators/host/host.ts b/packages/angular/src/generators/host/host.ts index e4c884f405b..5bdb3028130 100644 --- a/packages/angular/src/generators/host/host.ts +++ b/packages/angular/src/generators/host/host.ts @@ -1,3 +1,7 @@ +import { + determineProjectNameAndRootOptions, + ensureRootProjectName, +} from '@nx/devkit/internal'; import { formatFiles, getProjects, @@ -7,10 +11,6 @@ import { Tree, updateProjectConfiguration, } from '@nx/devkit'; -import { - determineProjectNameAndRootOptions, - ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; import { isValidVariable } from '@nx/js'; import { E2eTestRunner } from '../../utils/test-runners'; import applicationGenerator from '../application/application'; diff --git a/packages/angular/src/generators/init/init.ts b/packages/angular/src/generators/init/init.ts index de2579dfbe4..8bc28004c54 100755 --- a/packages/angular/src/generators/init/init.ts +++ b/packages/angular/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, createProjectGraphAsync, @@ -9,7 +10,6 @@ import { readNxJson, type Tree, } from '@nx/devkit'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { createNodesV2 } from '../../plugins/plugin'; import { assertNotUsingTsSolutionSetup } from '../utils/validations'; import { diff --git a/packages/angular/src/generators/library/lib/add-project.ts b/packages/angular/src/generators/library/lib/add-project.ts index 33ccd997f54..bf03a295eac 100644 --- a/packages/angular/src/generators/library/lib/add-project.ts +++ b/packages/angular/src/generators/library/lib/add-project.ts @@ -1,10 +1,10 @@ import type { Tree } from '@nx/devkit'; +import { addBuildTargetDefaults } from '@nx/devkit/internal'; import { addProjectConfiguration, joinPathFragments, readJson, } from '@nx/devkit'; -import { addBuildTargetDefaults } from '@nx/devkit/src/generators/target-defaults-utils'; import { addReleaseConfigForNonTsSolution } from '@nx/js/src/generators/library/utils/add-release-config'; import type { AngularProjectConfiguration } from '../../../utils/types'; import type { NormalizedSchema } from './normalized-schema'; diff --git a/packages/angular/src/generators/library/lib/normalize-options.ts b/packages/angular/src/generators/library/lib/normalize-options.ts index 953f3d1f2dc..19d2f02378e 100644 --- a/packages/angular/src/generators/library/lib/normalize-options.ts +++ b/packages/angular/src/generators/library/lib/normalize-options.ts @@ -2,7 +2,7 @@ import { names, type Tree } from '@nx/devkit'; import { determineProjectNameAndRootOptions, ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; +} from '@nx/devkit/internal'; import { UnitTestRunner } from '../../../utils/test-runners'; import { getComponentType, diff --git a/packages/angular/src/generators/library/library.ts b/packages/angular/src/generators/library/library.ts index b9b7d724f36..3281bc1916a 100644 --- a/packages/angular/src/generators/library/library.ts +++ b/packages/angular/src/generators/library/library.ts @@ -1,3 +1,4 @@ +import { logShowProjectCommand } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, formatFiles, @@ -7,7 +8,6 @@ import { runTasksInSerial, Tree, } from '@nx/devkit'; -import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-command'; import { initGenerator as jsInitGenerator } from '@nx/js'; import { releaseTasks } from '@nx/js/src/generators/library/utils/add-release-config'; import init from '../../generators/init/init'; diff --git a/packages/angular/src/generators/ngrx-feature-store/lib/normalize-options.ts b/packages/angular/src/generators/ngrx-feature-store/lib/normalize-options.ts index a080f30e98b..c5ced3ba228 100644 --- a/packages/angular/src/generators/ngrx-feature-store/lib/normalize-options.ts +++ b/packages/angular/src/generators/ngrx-feature-store/lib/normalize-options.ts @@ -1,6 +1,6 @@ import type { Tree } from '@nx/devkit'; import { joinPathFragments, names, readJson } from '@nx/devkit'; -import { checkAndCleanWithSemver } from '@nx/devkit/src/utils/semver'; +import { checkAndCleanWithSemver } from '@nx/devkit/internal'; import { dirname } from 'path'; import { major } from 'semver'; import { rxjsVersion as defaultRxjsVersion } from '../../../utils/versions'; diff --git a/packages/angular/src/generators/ngrx-root-store/lib/normalize-options.ts b/packages/angular/src/generators/ngrx-root-store/lib/normalize-options.ts index 63120fb63a5..e7e44abfbe6 100644 --- a/packages/angular/src/generators/ngrx-root-store/lib/normalize-options.ts +++ b/packages/angular/src/generators/ngrx-root-store/lib/normalize-options.ts @@ -1,11 +1,11 @@ import type { Tree } from '@nx/devkit'; +import { checkAndCleanWithSemver } from '@nx/devkit/internal'; import { getDependencyVersionFromPackageJson, joinPathFragments, names, readProjectConfiguration, } from '@nx/devkit'; -import { checkAndCleanWithSemver } from '@nx/devkit/src/utils/semver'; import { rxjsVersion as defaultRxjsVersion } from '../../../utils/versions'; import type { Schema } from '../schema'; import { isNgStandaloneApp } from '../../../utils/nx-devkit/ast-utils'; diff --git a/packages/angular/src/generators/ngrx/lib/normalize-options.ts b/packages/angular/src/generators/ngrx/lib/normalize-options.ts index 684152d72b9..52788db6d88 100644 --- a/packages/angular/src/generators/ngrx/lib/normalize-options.ts +++ b/packages/angular/src/generators/ngrx/lib/normalize-options.ts @@ -1,5 +1,5 @@ import { names, readJson, Tree } from '@nx/devkit'; -import { checkAndCleanWithSemver } from '@nx/devkit/src/utils/semver'; +import { checkAndCleanWithSemver } from '@nx/devkit/internal'; import { dirname } from 'path'; import { major } from 'semver'; import { rxjsVersion as defaultRxjsVersion } from '../../../utils/versions'; diff --git a/packages/angular/src/generators/pipe/lib/normalize-options.ts b/packages/angular/src/generators/pipe/lib/normalize-options.ts index ea353088c7e..398b58d17a5 100644 --- a/packages/angular/src/generators/pipe/lib/normalize-options.ts +++ b/packages/angular/src/generators/pipe/lib/normalize-options.ts @@ -1,6 +1,6 @@ import type { Tree } from '@nx/devkit'; import { names } from '@nx/devkit'; -import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; +import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/internal'; import { validateClassName } from '../../utils/validations'; import { getInstalledAngularVersionInfo } from '../../utils/version-utils'; import type { NormalizedSchema, Schema } from '../schema'; diff --git a/packages/angular/src/generators/remote/remote.ts b/packages/angular/src/generators/remote/remote.ts index 5ed04fb5424..0fd21a42f13 100644 --- a/packages/angular/src/generators/remote/remote.ts +++ b/packages/angular/src/generators/remote/remote.ts @@ -1,3 +1,7 @@ +import { + determineProjectNameAndRootOptions, + ensureRootProjectName, +} from '@nx/devkit/internal'; import { addDependenciesToPackageJson, formatFiles, @@ -8,10 +12,6 @@ import { Tree, updateProjectConfiguration, } from '@nx/devkit'; -import { - determineProjectNameAndRootOptions, - ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; import { swcHelpersVersion } from '@nx/js/src/utils/versions'; import { E2eTestRunner } from '../../utils/test-runners'; import { applicationGenerator } from '../application/application'; diff --git a/packages/angular/src/generators/scam-directive/lib/normalize-options.ts b/packages/angular/src/generators/scam-directive/lib/normalize-options.ts index c81245b9772..8a1530e115b 100644 --- a/packages/angular/src/generators/scam-directive/lib/normalize-options.ts +++ b/packages/angular/src/generators/scam-directive/lib/normalize-options.ts @@ -1,6 +1,6 @@ import type { Tree } from '@nx/devkit'; import { joinPathFragments, names } from '@nx/devkit'; -import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; +import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/internal'; import { getModuleTypeSeparator } from '../../utils/artifact-types'; import { validateClassName } from '../../utils/validations'; import { getInstalledAngularVersionInfo } from '../../utils/version-utils'; diff --git a/packages/angular/src/generators/scam-pipe/lib/normalize-options.ts b/packages/angular/src/generators/scam-pipe/lib/normalize-options.ts index d764fc65c00..afa4d24885f 100644 --- a/packages/angular/src/generators/scam-pipe/lib/normalize-options.ts +++ b/packages/angular/src/generators/scam-pipe/lib/normalize-options.ts @@ -1,6 +1,6 @@ import type { Tree } from '@nx/devkit'; import { joinPathFragments, names } from '@nx/devkit'; -import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; +import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/internal'; import { getModuleTypeSeparator } from '../../utils/artifact-types'; import { validateClassName } from '../../utils/validations'; import { getInstalledAngularVersionInfo } from '../../utils/version-utils'; diff --git a/packages/angular/src/generators/scam/lib/normalize-options.ts b/packages/angular/src/generators/scam/lib/normalize-options.ts index b0cad4be247..5070c11147d 100644 --- a/packages/angular/src/generators/scam/lib/normalize-options.ts +++ b/packages/angular/src/generators/scam/lib/normalize-options.ts @@ -1,6 +1,6 @@ import type { Tree } from '@nx/devkit'; import { joinPathFragments, names } from '@nx/devkit'; -import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; +import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/internal'; import { getModuleTypeSeparator } from '../../utils/artifact-types'; import { validateClassName } from '../../utils/validations'; import { getInstalledAngularVersionInfo } from '../../utils/version-utils'; diff --git a/packages/angular/src/generators/setup-mf/lib/change-build-target.ts b/packages/angular/src/generators/setup-mf/lib/change-build-target.ts index 1c766b2b2b0..50d44355e72 100644 --- a/packages/angular/src/generators/setup-mf/lib/change-build-target.ts +++ b/packages/angular/src/generators/setup-mf/lib/change-build-target.ts @@ -1,11 +1,11 @@ import type { Tree } from '@nx/devkit'; +import { addBuildTargetDefaults } from '@nx/devkit/internal'; import type { Schema } from '../schema'; import { readProjectConfiguration, updateProjectConfiguration, } from '@nx/devkit'; -import { addBuildTargetDefaults } from '@nx/devkit/src/generators/target-defaults-utils'; export function changeBuildTarget(host: Tree, options: Schema) { const appConfig = readProjectConfiguration(host, options.appName); diff --git a/packages/angular/src/generators/setup-ssr/lib/normalize-options.ts b/packages/angular/src/generators/setup-ssr/lib/normalize-options.ts index 948ff6caa81..3976cb38468 100644 --- a/packages/angular/src/generators/setup-ssr/lib/normalize-options.ts +++ b/packages/angular/src/generators/setup-ssr/lib/normalize-options.ts @@ -1,9 +1,9 @@ +import { promptWhenInteractive } from '@nx/devkit/internal'; import { joinPathFragments, readProjectConfiguration, type Tree, } from '@nx/devkit'; -import { promptWhenInteractive } from '@nx/devkit/src/generators/prompt'; import { isNgStandaloneApp } from '../../../utils/nx-devkit/ast-utils'; import { getInstalledAngularVersionInfo } from '../../utils/version-utils'; import type { NormalizedGeneratorOptions, Schema } from '../schema'; diff --git a/packages/angular/src/migrations/update-17-1-0/browser-target-to-build-target.ts b/packages/angular/src/migrations/update-17-1-0/browser-target-to-build-target.ts index a55094f5815..37f86e4e3bf 100644 --- a/packages/angular/src/migrations/update-17-1-0/browser-target-to-build-target.ts +++ b/packages/angular/src/migrations/update-17-1-0/browser-target-to-build-target.ts @@ -1,3 +1,4 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { formatFiles, readNxJson, @@ -6,7 +7,6 @@ import { updateProjectConfiguration, type Tree, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; export const executors = [ '@angular-devkit/build-angular:dev-server', diff --git a/packages/angular/src/migrations/update-19-6-0/turn-off-dts-by-default.ts b/packages/angular/src/migrations/update-19-6-0/turn-off-dts-by-default.ts index fc88c4051ee..a9b87301cb5 100644 --- a/packages/angular/src/migrations/update-19-6-0/turn-off-dts-by-default.ts +++ b/packages/angular/src/migrations/update-19-6-0/turn-off-dts-by-default.ts @@ -1,5 +1,5 @@ import { type Tree, formatFiles, visitNotIgnoredFiles } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; +import { forEachExecutorOptions } from '@nx/devkit/internal'; import picomatch = require('picomatch'); import { ast, query } from '@phenomnomnominal/tsquery'; diff --git a/packages/angular/src/migrations/update-19-6-1/ensure-depends-on-for-mf.ts b/packages/angular/src/migrations/update-19-6-1/ensure-depends-on-for-mf.ts index 5855489b638..968098a4b20 100644 --- a/packages/angular/src/migrations/update-19-6-1/ensure-depends-on-for-mf.ts +++ b/packages/angular/src/migrations/update-19-6-1/ensure-depends-on-for-mf.ts @@ -1,5 +1,5 @@ import { formatFiles, readNxJson, type Tree, updateNxJson } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; +import { forEachExecutorOptions } from '@nx/devkit/internal'; import type { WebpackExecutorOptions } from '@nx/webpack'; export default async function (tree: Tree) { diff --git a/packages/angular/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts b/packages/angular/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts index 898a58a4f9c..b77a08ed8c7 100644 --- a/packages/angular/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts +++ b/packages/angular/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts @@ -1,3 +1,4 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { type Tree, formatFiles, @@ -5,7 +6,6 @@ import { visitNotIgnoredFiles, addDependenciesToPackageJson, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; import { ast, query } from '@phenomnomnominal/tsquery'; import { nxVersion } from '../../utils/versions'; diff --git a/packages/angular/src/migrations/update-20-2-0/remove-tailwind-config-from-ng-packagr-executors.ts b/packages/angular/src/migrations/update-20-2-0/remove-tailwind-config-from-ng-packagr-executors.ts index bb1fce8f1f7..d925297c781 100644 --- a/packages/angular/src/migrations/update-20-2-0/remove-tailwind-config-from-ng-packagr-executors.ts +++ b/packages/angular/src/migrations/update-20-2-0/remove-tailwind-config-from-ng-packagr-executors.ts @@ -1,3 +1,4 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { formatFiles, readNxJson, @@ -6,7 +7,6 @@ import { updateProjectConfiguration, type Tree, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; export const executors = ['@nx/angular:ng-packagr-lite', '@nx/angular:package']; diff --git a/packages/angular/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts b/packages/angular/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts index 3491a8aed90..ceb7da137bd 100644 --- a/packages/angular/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts +++ b/packages/angular/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts @@ -1,9 +1,9 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { type Tree, readProjectConfiguration, addDependenciesToPackageJson, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; import { nxVersion } from '../../utils/versions'; export default async function ensureMfPackage(tree: Tree) { diff --git a/packages/angular/src/plugins/plugin.ts b/packages/angular/src/plugins/plugin.ts index 7c92b224820..df71b092fbb 100644 --- a/packages/angular/src/plugins/plugin.ts +++ b/packages/angular/src/plugins/plugin.ts @@ -1,3 +1,7 @@ +import { + calculateHashForCreateNodes, + getNamedInputs, +} from '@nx/devkit/internal'; import { type CreateNodesContextV2, createNodesFromFiles, @@ -11,8 +15,6 @@ import { type TargetConfiguration, writeJsonFile, } from '@nx/devkit'; -import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import { getLockFileName } from '@nx/js'; import { existsSync, readdirSync, statSync } from 'node:fs'; import { dirname, isAbsolute, join, relative } from 'node:path'; diff --git a/packages/angular/src/utils/get-mf-projects.ts b/packages/angular/src/utils/get-mf-projects.ts index 15bc2e73926..4900bccb747 100644 --- a/packages/angular/src/utils/get-mf-projects.ts +++ b/packages/angular/src/utils/get-mf-projects.ts @@ -1,5 +1,5 @@ import type { Tree } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; +import { forEachExecutorOptions } from '@nx/devkit/internal'; function _getMfProjects( tree: Tree, diff --git a/packages/cypress/src/generators/configuration/configuration.ts b/packages/cypress/src/generators/configuration/configuration.ts index 15b25f7ea4f..1489d3dc5b4 100644 --- a/packages/cypress/src/generators/configuration/configuration.ts +++ b/packages/cypress/src/generators/configuration/configuration.ts @@ -1,3 +1,4 @@ +import { resolveImportPath, promptWhenInteractive } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, createProjectGraphAsync, @@ -19,8 +20,6 @@ import { updateProjectConfiguration, writeJson, } from '@nx/devkit'; -import { resolveImportPath } from '@nx/devkit/src/generators/project-name-and-root-utils'; -import { promptWhenInteractive } from '@nx/devkit/src/generators/prompt'; import { Linter, LinterType } from '@nx/eslint'; import { getRelativePathToRootTsConfig, diff --git a/packages/cypress/src/generators/convert-to-inferred/convert-to-inferred.ts b/packages/cypress/src/generators/convert-to-inferred/convert-to-inferred.ts index e7aae45a567..4e83834437b 100644 --- a/packages/cypress/src/generators/convert-to-inferred/convert-to-inferred.ts +++ b/packages/cypress/src/generators/convert-to-inferred/convert-to-inferred.ts @@ -1,17 +1,15 @@ +import { + migrateProjectExecutorsToPlugin, + NoTargetsToMigrateError, + processTargetOutputs, + toProjectRelativePath, +} from '@nx/devkit/internal'; import { createProjectGraphAsync, formatFiles, type TargetConfiguration, type Tree, } from '@nx/devkit'; -import { - migrateProjectExecutorsToPlugin, - NoTargetsToMigrateError, -} from '@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator'; -import { - processTargetOutputs, - toProjectRelativePath, -} from '@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils'; import { createNodesV2, type CypressPluginOptions } from '../../plugins/plugin'; import { addDevServerTargetToConfig } from './lib/add-dev-server-target-to-config'; import { addExcludeSpecPattern } from './lib/add-exclude-spec-pattern'; diff --git a/packages/cypress/src/generators/init/init.ts b/packages/cypress/src/generators/init/init.ts index fb408aa1903..3431d42765c 100644 --- a/packages/cypress/src/generators/init/init.ts +++ b/packages/cypress/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin as _addPlugin } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, createProjectGraphAsync, @@ -10,7 +11,6 @@ import { Tree, updateNxJson, } from '@nx/devkit'; -import { addPlugin as _addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { createNodesV2 } from '../../plugins/plugin'; import { cypressVersion, diff --git a/packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.ts b/packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.ts index 30b7a4ffa7f..f6d7f3aa96b 100644 --- a/packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.ts +++ b/packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.ts @@ -1,3 +1,4 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { formatFiles, installPackagesTask, @@ -10,7 +11,6 @@ import { updateJson, updateProjectConfiguration, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; import { CypressExecutorOptions } from '../../executors/cypress/cypress.impl'; import { assertMinimumCypressVersion, diff --git a/packages/cypress/src/migrations/update-20-8-0/replace-experimental-just-in-time-compile.ts b/packages/cypress/src/migrations/update-20-8-0/replace-experimental-just-in-time-compile.ts index 20684f39642..7b0cf86591a 100644 --- a/packages/cypress/src/migrations/update-20-8-0/replace-experimental-just-in-time-compile.ts +++ b/packages/cypress/src/migrations/update-20-8-0/replace-experimental-just-in-time-compile.ts @@ -1,5 +1,5 @@ import { formatFiles, workspaceRoot, type Tree } from '@nx/devkit'; -import { loadConfigFile } from '@nx/devkit/src/utils/config-utils'; +import { loadConfigFile } from '@nx/devkit/internal'; import { ensureTypescript } from '@nx/js/src/utils/typescript/ensure-typescript'; import { ast, query } from '@phenomnomnominal/tsquery'; import { join } from 'node:path'; diff --git a/packages/cypress/src/migrations/update-21-0-0/remove-tsconfig-and-copy-files-options-from-cypress-executor.ts b/packages/cypress/src/migrations/update-21-0-0/remove-tsconfig-and-copy-files-options-from-cypress-executor.ts index a48e2454cf1..63cac0035fd 100644 --- a/packages/cypress/src/migrations/update-21-0-0/remove-tsconfig-and-copy-files-options-from-cypress-executor.ts +++ b/packages/cypress/src/migrations/update-21-0-0/remove-tsconfig-and-copy-files-options-from-cypress-executor.ts @@ -1,3 +1,4 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { formatFiles, type ProjectConfiguration, @@ -8,7 +9,6 @@ import { updateNxJson, updateProjectConfiguration, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; import type { CypressExecutorOptions } from '../../executors/cypress/cypress.impl'; const EXECUTOR_TO_MIGRATE = '@nx/cypress:cypress'; diff --git a/packages/cypress/src/plugins/plugin.ts b/packages/cypress/src/plugins/plugin.ts index 8c2df45218c..0422b28ea9e 100644 --- a/packages/cypress/src/plugins/plugin.ts +++ b/packages/cypress/src/plugins/plugin.ts @@ -1,3 +1,8 @@ +import { + calculateHashForCreateNodes, + loadConfigFile, + getNamedInputs, +} from '@nx/devkit/internal'; import { type CreateNodesContextV2, createNodesFromFiles, @@ -10,9 +15,6 @@ import { type ProjectConfiguration, type TargetConfiguration, } from '@nx/devkit'; -import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; -import { loadConfigFile } from '@nx/devkit/src/utils/config-utils'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import { getLockFileName } from '@nx/js'; import { readdirSync } from 'fs'; import { hashObject } from 'nx/src/devkit-internals'; diff --git a/packages/detox/src/generators/application/lib/normalize-options.ts b/packages/detox/src/generators/application/lib/normalize-options.ts index 063d5871be9..61eac3077e8 100644 --- a/packages/detox/src/generators/application/lib/normalize-options.ts +++ b/packages/detox/src/generators/application/lib/normalize-options.ts @@ -1,5 +1,5 @@ import { names, readNxJson, readProjectConfiguration, Tree } from '@nx/devkit'; -import { determineProjectNameAndRootOptions } from '@nx/devkit/src/generators/project-name-and-root-utils'; +import { determineProjectNameAndRootOptions } from '@nx/devkit/internal'; import { Schema } from '../schema'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; diff --git a/packages/detox/src/generators/convert-to-inferred/convert-to-inferred.ts b/packages/detox/src/generators/convert-to-inferred/convert-to-inferred.ts index 7fe3a389a07..48cdd0271cb 100644 --- a/packages/detox/src/generators/convert-to-inferred/convert-to-inferred.ts +++ b/packages/detox/src/generators/convert-to-inferred/convert-to-inferred.ts @@ -1,3 +1,8 @@ +import { + AggregatedLog, + migrateProjectExecutorsToPlugin, + NoTargetsToMigrateError, +} from '@nx/devkit/internal'; import { createProjectGraphAsync, formatFiles, @@ -5,11 +10,6 @@ import { type Tree, updateNxJson, } from '@nx/devkit'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; -import { - migrateProjectExecutorsToPlugin, - NoTargetsToMigrateError, -} from '@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator'; import { createNodesV2 } from '../../plugins/plugin'; import { processBuildOptions } from './lib/process-build-options'; import { postTargetTransformer } from './lib/post-target-transformer'; diff --git a/packages/detox/src/generators/convert-to-inferred/lib/post-target-transformer.ts b/packages/detox/src/generators/convert-to-inferred/lib/post-target-transformer.ts index 84fc057a98e..69ec1653748 100644 --- a/packages/detox/src/generators/convert-to-inferred/lib/post-target-transformer.ts +++ b/packages/detox/src/generators/convert-to-inferred/lib/post-target-transformer.ts @@ -1,6 +1,5 @@ import type { TargetConfiguration, Tree } from '@nx/devkit'; -import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; -import { processTargetOutputs } from '@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils'; +import { processTargetOutputs, type AggregatedLog } from '@nx/devkit/internal'; export function postTargetTransformer( migrationLogs: AggregatedLog, diff --git a/packages/detox/src/generators/convert-to-inferred/lib/process-build-options.ts b/packages/detox/src/generators/convert-to-inferred/lib/process-build-options.ts index 5e651457122..4ba1c5105e1 100644 --- a/packages/detox/src/generators/convert-to-inferred/lib/process-build-options.ts +++ b/packages/detox/src/generators/convert-to-inferred/lib/process-build-options.ts @@ -1,5 +1,5 @@ import { names, type TargetConfiguration, type Tree } from '@nx/devkit'; -import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; +import type { AggregatedLog } from '@nx/devkit/internal'; export function processBuildOptions( _tree: Tree, diff --git a/packages/detox/src/generators/convert-to-inferred/lib/process-test-options.ts b/packages/detox/src/generators/convert-to-inferred/lib/process-test-options.ts index b779323ce12..5610fbdb903 100644 --- a/packages/detox/src/generators/convert-to-inferred/lib/process-test-options.ts +++ b/packages/detox/src/generators/convert-to-inferred/lib/process-test-options.ts @@ -1,5 +1,5 @@ import { names, type TargetConfiguration, type Tree } from '@nx/devkit'; -import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; +import type { AggregatedLog } from '@nx/devkit/internal'; export function processTestOptions( _tree: Tree, diff --git a/packages/detox/src/generators/init/init.ts b/packages/detox/src/generators/init/init.ts index 8d6d4790e84..6186f380f15 100644 --- a/packages/detox/src/generators/init/init.ts +++ b/packages/detox/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, createProjectGraphAsync, @@ -8,7 +9,6 @@ import { runTasksInSerial, Tree, } from '@nx/devkit'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { createNodesV2 } from '../../plugins/plugin'; import { detoxVersion, nxVersion } from '../../utils/versions'; import { Schema } from './schema'; diff --git a/packages/detox/src/plugins/plugin.ts b/packages/detox/src/plugins/plugin.ts index 52f24a6f242..46b470f6d6c 100644 --- a/packages/detox/src/plugins/plugin.ts +++ b/packages/detox/src/plugins/plugin.ts @@ -1,3 +1,7 @@ +import { + getNamedInputs, + calculateHashForCreateNodes, +} from '@nx/devkit/internal'; import { CreateNodesContextV2, createNodesFromFiles, @@ -12,9 +16,7 @@ import { } from '@nx/devkit'; import { dirname, join } from 'path'; import { getLockFileName } from '@nx/js'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import { existsSync } from 'fs'; -import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; import { workspaceDataDirectory } from 'nx/src/utils/cache-directory'; import { hashObject } from 'nx/src/devkit-internals'; import { addBuildAndWatchDepsTargets } from '@nx/js/src/plugins/typescript/util'; diff --git a/packages/devkit/assets.json b/packages/devkit/assets.json index a4e83d1a0d2..9fccd268b08 100644 --- a/packages/devkit/assets.json +++ b/packages/devkit/assets.json @@ -1,5 +1,5 @@ { - "outDir": "dist/packages/devkit", + "outDir": "packages/devkit/dist", "assets": [ { "glob": "**/files/**" diff --git a/packages/devkit/eslint.config.mjs b/packages/devkit/eslint.config.mjs index 19c0ed253fb..b23cafde13b 100644 --- a/packages/devkit/eslint.config.mjs +++ b/packages/devkit/eslint.config.mjs @@ -3,6 +3,9 @@ import * as jsoncEslintParser from 'jsonc-eslint-parser'; export default [ ...baseConfig, + { + ignores: ['dist'], + }, { files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'], rules: { diff --git a/packages/devkit/internal.ts b/packages/devkit/internal.ts index 4298dcddd43..1642427b4b0 100644 --- a/packages/devkit/internal.ts +++ b/packages/devkit/internal.ts @@ -4,3 +4,62 @@ export { PluginCache, safeWriteFileCache, } from 'nx/src/devkit-internals'; + +// Generators +export { + determineArtifactNameAndDirectoryOptions, + getRelativeCwd, + type FileExtensionType, +} from './src/generators/artifact-name-and-directory-utils'; +export { + getE2EWebServerInfo, + type E2EWebServerDetails, +} from './src/generators/e2e-web-server-info-utils'; +export { forEachExecutorOptions } from './src/generators/executor-options-utils'; +export { AggregatedLog } from './src/generators/plugin-migrations/aggregate-log-util'; +export { + migrateProjectExecutorsToPlugin, + migrateProjectExecutorsToPluginV1, + NoTargetsToMigrateError, + type InferredTargetConfiguration, +} from './src/generators/plugin-migrations/executor-to-plugin-migrator'; +export { + processTargetOutputs, + deleteMatchingProperties, + toProjectRelativePath, +} from './src/generators/plugin-migrations/plugin-migration-utils'; +export { + determineProjectNameAndRootOptions, + ensureRootProjectName, + resolveImportPath, +} from './src/generators/project-name-and-root-utils'; +export { promptWhenInteractive } from './src/generators/prompt'; +export { + addBuildTargetDefaults, + addE2eCiTargetDefaults, +} from './src/generators/target-defaults-utils'; + +// Utils +export { addPlugin } from './src/utils/add-plugin'; +export { + createAsyncIterable, + combineAsyncIterables, + mapAsyncIterable, +} from './src/utils/async-iterable'; +export { + calculateHashForCreateNodes, + calculateHashesForCreateNodes, +} from './src/utils/calculate-hash-for-create-nodes'; +export { getCatalogManager } from './src/utils/catalog'; +export { loadConfigFile, clearRequireCache } from './src/utils/config-utils'; +export { findPluginForConfigFile } from './src/utils/find-plugin-for-config-file'; +export { getNamedInputs } from './src/utils/get-named-inputs'; +export { logShowProjectCommand } from './src/utils/log-show-project-command'; +export { eachValueFrom } from './src/utils/rxjs-for-await'; +export { checkAndCleanWithSemver } from './src/utils/semver'; +export { + camelize, + capitalize, + classify, + dasherize, +} from './src/utils/string-utils'; diff --git a/packages/devkit/package.json b/packages/devkit/package.json index 1cc734455a2..eb2935039d0 100644 --- a/packages/devkit/package.json +++ b/packages/devkit/package.json @@ -2,6 +2,12 @@ "name": "@nx/devkit", "version": "0.0.1", "private": false, + "type": "commonjs", + "files": [ + "dist", + "!dist/tsconfig.tsbuildinfo", + "migrations.json" + ], "description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more. Learn more about [extending Nx by leveraging the Nx Devkit](https://nx.dev/extending-nx/intro/getting-started) on our docs.", "repository": { "type": "git", @@ -19,9 +25,24 @@ "Cypress", "CLI" ], - "main": "./index.js", - "type": "commonjs", - "types": "./index.d.ts", + "main": "./dist/index.js", + "types": "./dist/index.d.ts", + "typesVersions": { + "*": { + "testing": [ + "dist/testing.d.ts" + ], + "ngcli-adapter": [ + "dist/ngcli-adapter.d.ts" + ], + "internal": [ + "dist/internal.d.ts" + ], + "internal-testing-utils": [ + "dist/internal-testing-utils.d.ts" + ] + } + }, "author": "Victor Savkin", "license": "MIT", "bugs": { @@ -42,12 +63,41 @@ "nx": "workspace:*" }, "peerDependencies": { - "nx": ">= 21 <= 23 || ^22.0.0-0" + "nx": ">= 22 <= 24 || ^23.0.0-0" }, "publishConfig": { "access": "public" }, "nx-migrations": { "migrations": "./migrations.json" + }, + "exports": { + ".": { + "@nx/nx-source": "./index.ts", + "types": "./dist/index.d.ts", + "default": "./dist/index.js" + }, + "./package.json": "./package.json", + "./migrations.json": "./migrations.json", + "./internal": { + "@nx/nx-source": "./internal.ts", + "types": "./dist/internal.d.ts", + "default": "./dist/internal.js" + }, + "./internal-testing-utils": { + "@nx/nx-source": "./internal-testing-utils.ts", + "types": "./dist/internal-testing-utils.d.ts", + "default": "./dist/internal-testing-utils.js" + }, + "./ngcli-adapter": { + "@nx/nx-source": "./ngcli-adapter.ts", + "types": "./dist/ngcli-adapter.d.ts", + "default": "./dist/ngcli-adapter.js" + }, + "./testing": { + "@nx/nx-source": "./testing.ts", + "types": "./dist/testing.d.ts", + "default": "./dist/testing.js" + } } } diff --git a/packages/devkit/project.json b/packages/devkit/project.json index 94df9fb1631..a9d721f352c 100644 --- a/packages/devkit/project.json +++ b/packages/devkit/project.json @@ -3,10 +3,29 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "packages/devkit", "projectType": "library", + "release": { + "version": { + "generator": "@nx/js:release-version", + "preserveLocalDependencyProtocols": true, + "manifestRootsToUpdate": ["packages/{projectName}"] + } + }, "targets": { + "nx-release-publish": { + "options": { + "packageRoot": "packages/{projectName}" + } + }, + "build-base": { + "outputs": [ + "{projectRoot}/dist/**/*.{js,cjs,mjs,d.ts}", + "{projectRoot}/*.d.ts", + "{projectRoot}/src/**/*.d.ts" + ] + }, "build": { - "outputs": ["{workspaceRoot}/dist/packages/devkit/README.md"], - "command": "node ./scripts/copy-readme.js devkit", + "outputs": ["{projectRoot}/README.md"], + "command": "node ./scripts/copy-readme.js devkit packages/devkit/readme-template.md packages/devkit/README.md", "inputs": ["copyReadme"], "dependsOn": ["^build", "build-base"] } diff --git a/packages/devkit/README.md b/packages/devkit/readme-template.md similarity index 100% rename from packages/devkit/README.md rename to packages/devkit/readme-template.md diff --git a/packages/devkit/tsconfig.lib.json b/packages/devkit/tsconfig.lib.json index 83451704f9a..b7613db290d 100644 --- a/packages/devkit/tsconfig.lib.json +++ b/packages/devkit/tsconfig.lib.json @@ -1,20 +1,30 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "module": "commonjs", - "outDir": "../../dist/packages/devkit", + "outDir": "dist", + "rootDir": ".", + "declarationDir": "dist", + "declarationMap": false, + "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo", "types": ["node"], - "tsBuildInfoFile": "../../dist/packages/devkit/tsconfig.tsbuildinfo" + "composite": true, + "module": "nodenext", + "moduleResolution": "nodenext", + "esModuleInterop": true, + "allowSyntheticDefaultImports": true }, "exclude": [ + "node_modules", + "dist", "**/*.spec.ts", "**/*.test.ts", "**/*_spec.ts", "**/*_test.ts", "internal-testing-utils.ts", - "jest.config.ts" + "jest.config.ts", + ".eslintrc.json" ], - "include": ["**/*.ts", "*.json", "migrations.json"], + "include": ["*.ts", "src/**/*.ts"], "references": [ { "path": "../nx/tsconfig.lib.json" diff --git a/packages/devkit/tsconfig.spec.json b/packages/devkit/tsconfig.spec.json index 1eefcaf982d..bcb5a3c497a 100644 --- a/packages/devkit/tsconfig.spec.json +++ b/packages/devkit/tsconfig.spec.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../dist/packages/devkit/spec", + "outDir": "dist/spec", "module": "commonjs", "types": ["jest", "node"], "composite": true diff --git a/packages/docker/src/generators/init/init.ts b/packages/docker/src/generators/init/init.ts index 582a3daeab1..66a7e7213f9 100644 --- a/packages/docker/src/generators/init/init.ts +++ b/packages/docker/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin } from '@nx/devkit/internal'; import { type Tree, type GeneratorCallback, @@ -9,7 +10,6 @@ import { logger, updateNxJson, } from '@nx/devkit'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { InitGeneratorSchema } from './schema'; import { createNodesV2 } from '../../plugins/plugin'; import { nxVersion } from '../../utils/versions'; diff --git a/packages/docker/src/plugins/plugin.ts b/packages/docker/src/plugins/plugin.ts index 9824363a113..fb33b9db7dc 100644 --- a/packages/docker/src/plugins/plugin.ts +++ b/packages/docker/src/plugins/plugin.ts @@ -1,3 +1,7 @@ +import { + calculateHashesForCreateNodes, + getNamedInputs, +} from '@nx/devkit/internal'; import { type CreateNodesV2, type ProjectConfiguration, @@ -8,12 +12,10 @@ import { CreateNodesContextV2, workspaceRoot, } from '@nx/devkit'; -import { calculateHashesForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; import { hashObject } from 'nx/src/hasher/file-hasher'; import { workspaceDataDirectory } from 'nx/src/utils/cache-directory'; import { existsSync } from 'fs'; import { dirname, join } from 'path'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import { getLatestCommitSha } from 'nx/src/utils/git-utils'; import { interpolateObject } from '../utils/interpolate-pattern'; diff --git a/packages/esbuild/src/executors/esbuild/esbuild.impl.ts b/packages/esbuild/src/executors/esbuild/esbuild.impl.ts index f92c181e70d..26c486d4b7e 100644 --- a/packages/esbuild/src/executors/esbuild/esbuild.impl.ts +++ b/packages/esbuild/src/executors/esbuild/esbuild.impl.ts @@ -1,5 +1,6 @@ import * as pc from 'picocolors'; import type { ExecutorContext } from '@nx/devkit'; +import { createAsyncIterable } from '@nx/devkit/internal'; import { cacheDir, joinPathFragments, @@ -22,7 +23,6 @@ import { EsBuildExecutorOptions, NormalizedEsBuildExecutorOptions, } from './schema'; -import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable'; import { buildEsbuildOptions, getOutExtension, diff --git a/packages/esbuild/src/generators/configuration/configuration.ts b/packages/esbuild/src/generators/configuration/configuration.ts index 5d4402ca941..a4e008141d0 100644 --- a/packages/esbuild/src/generators/configuration/configuration.ts +++ b/packages/esbuild/src/generators/configuration/configuration.ts @@ -1,3 +1,4 @@ +import { addBuildTargetDefaults } from '@nx/devkit/internal'; import { formatFiles, joinPathFragments, @@ -8,7 +9,6 @@ import { updateProjectConfiguration, writeJson, } from '@nx/devkit'; -import { addBuildTargetDefaults } from '@nx/devkit/src/generators/target-defaults-utils'; import { getOutputDir, getUpdatedPackageJsonContent } from '@nx/js'; import { getImportPath } from '@nx/js/src/utils/get-import-path'; import { diff --git a/packages/eslint-plugin/src/resolve-workspace-rules.ts b/packages/eslint-plugin/src/resolve-workspace-rules.ts index 19a195ee5b9..cc98f825254 100644 --- a/packages/eslint-plugin/src/resolve-workspace-rules.ts +++ b/packages/eslint-plugin/src/resolve-workspace-rules.ts @@ -1,5 +1,5 @@ import { workspaceRoot } from '@nx/devkit'; -import { loadConfigFile } from '@nx/devkit/src/utils/config-utils'; +import { loadConfigFile } from '@nx/devkit/internal'; import { registerTsProject } from '@nx/js/src/internal'; import type { TSESLint } from '@typescript-eslint/utils'; import { existsSync } from 'fs'; diff --git a/packages/eslint-plugin/src/rules/dependency-checks.ts b/packages/eslint-plugin/src/rules/dependency-checks.ts index f2047ac36fd..7d703c1a259 100644 --- a/packages/eslint-plugin/src/rules/dependency-checks.ts +++ b/packages/eslint-plugin/src/rules/dependency-checks.ts @@ -1,5 +1,5 @@ import { NX_VERSION, normalizePath, workspaceRoot } from '@nx/devkit'; -import { getCatalogManager } from '@nx/devkit/src/utils/catalog'; +import { getCatalogManager } from '@nx/devkit/internal'; import { findNpmDependencies } from '@nx/js/src/utils/find-npm-dependencies'; import { ESLintUtils } from '@typescript-eslint/utils'; import { AST } from 'jsonc-eslint-parser'; diff --git a/packages/eslint/src/generators/convert-to-inferred/convert-to-inferred.ts b/packages/eslint/src/generators/convert-to-inferred/convert-to-inferred.ts index c0250c33928..4658bb39c0e 100644 --- a/packages/eslint/src/generators/convert-to-inferred/convert-to-inferred.ts +++ b/packages/eslint/src/generators/convert-to-inferred/convert-to-inferred.ts @@ -1,3 +1,8 @@ +import { + migrateProjectExecutorsToPlugin, + NoTargetsToMigrateError, + processTargetOutputs, +} from '@nx/devkit/internal'; import { createProjectGraphAsync, formatFiles, @@ -5,11 +10,6 @@ import { type TargetConfiguration, type Tree, } from '@nx/devkit'; -import { - migrateProjectExecutorsToPlugin, - NoTargetsToMigrateError, -} from '@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator'; -import { processTargetOutputs } from '@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils'; import { basename, dirname, relative } from 'node:path/posix'; import { interpolate } from 'nx/src/tasks-runner/utils'; import { createNodesV2, type EslintPluginOptions } from '../../plugins/plugin'; diff --git a/packages/eslint/src/generators/init/init.ts b/packages/eslint/src/generators/init/init.ts index b75b98b3139..49f0363cd5b 100644 --- a/packages/eslint/src/generators/init/init.ts +++ b/packages/eslint/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, createProjectGraphAsync, @@ -9,7 +10,6 @@ import { updateJson, updateNxJson, } from '@nx/devkit'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { eslintVersion, nxVersion } from '../../utils/versions'; import { determineEslintConfigFormat, diff --git a/packages/eslint/src/generators/utils/eslint-targets.ts b/packages/eslint/src/generators/utils/eslint-targets.ts index bfe9ba4aa36..57826bad2fc 100644 --- a/packages/eslint/src/generators/utils/eslint-targets.ts +++ b/packages/eslint/src/generators/utils/eslint-targets.ts @@ -1,5 +1,5 @@ import { Tree } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; +import { forEachExecutorOptions } from '@nx/devkit/internal'; export function getEslintTargets(tree: Tree) { const eslintTargetNames = new Set(); diff --git a/packages/eslint/src/generators/workspace-rule/workspace-rule.ts b/packages/eslint/src/generators/workspace-rule/workspace-rule.ts index 18c0fa42bd3..1f8be02cf45 100644 --- a/packages/eslint/src/generators/workspace-rule/workspace-rule.ts +++ b/packages/eslint/src/generators/workspace-rule/workspace-rule.ts @@ -1,3 +1,4 @@ +import { camelize } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, applyChangesToString, @@ -11,7 +12,6 @@ import { runTasksInSerial, Tree, } from '@nx/devkit'; -import { camelize } from '@nx/devkit/src/utils/string-utils'; import { join } from 'path'; import * as ts from 'typescript'; import { workspaceLintPluginDir } from '../../utils/workspace-lint-rules'; diff --git a/packages/eslint/src/plugins/plugin.ts b/packages/eslint/src/plugins/plugin.ts index 9088baf5f2f..308a2f9a291 100644 --- a/packages/eslint/src/plugins/plugin.ts +++ b/packages/eslint/src/plugins/plugin.ts @@ -1,3 +1,4 @@ +import { calculateHashesForCreateNodes } from '@nx/devkit/internal'; import { CreateNodesContextV2, createNodesFromFiles, @@ -9,7 +10,6 @@ import { TargetConfiguration, writeJsonFile, } from '@nx/devkit'; -import { calculateHashesForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; import { getLockFileName, getRootTsConfigFileName } from '@nx/js'; import { walkTsconfigExtendsChain, diff --git a/packages/eslint/src/utils/version-utils.ts b/packages/eslint/src/utils/version-utils.ts index 5077746d65e..e7a6989f6ef 100644 --- a/packages/eslint/src/utils/version-utils.ts +++ b/packages/eslint/src/utils/version-utils.ts @@ -1,5 +1,5 @@ import { getDependencyVersionFromPackageJson, type Tree } from '@nx/devkit'; -import { checkAndCleanWithSemver } from '@nx/devkit/src/utils/semver'; +import { checkAndCleanWithSemver } from '@nx/devkit/internal'; import { readModulePackageJson } from 'nx/src/devkit-internals'; import { lt } from 'semver'; import { diff --git a/packages/expo/plugins/plugin.ts b/packages/expo/plugins/plugin.ts index a686baac40d..d46c81bad01 100644 --- a/packages/expo/plugins/plugin.ts +++ b/packages/expo/plugins/plugin.ts @@ -1,3 +1,8 @@ +import { + getNamedInputs, + calculateHashForCreateNodes, + loadConfigFile, +} from '@nx/devkit/internal'; import { CreateNodesContextV2, createNodesFromFiles, @@ -12,12 +17,9 @@ import { } from '@nx/devkit'; import { dirname, join } from 'path'; import { getLockFileName } from '@nx/js'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import { existsSync, readdirSync } from 'fs'; -import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; import { workspaceDataDirectory } from 'nx/src/utils/cache-directory'; import { hashObject } from 'nx/src/devkit-internals'; -import { loadConfigFile } from '@nx/devkit/src/utils/config-utils'; import { addBuildAndWatchDepsTargets } from '@nx/js/src/plugins/typescript/util'; export interface ExpoPluginOptions { diff --git a/packages/expo/src/generators/application/application.ts b/packages/expo/src/generators/application/application.ts index ac82313781c..e91c741202d 100644 --- a/packages/expo/src/generators/application/application.ts +++ b/packages/expo/src/generators/application/application.ts @@ -1,3 +1,4 @@ +import { logShowProjectCommand } from '@nx/devkit/internal'; import { formatFiles, GeneratorCallback, @@ -24,7 +25,6 @@ import { addE2e } from './lib/add-e2e'; import { Schema } from './schema'; import { ensureDependencies } from '../../utils/ensure-dependencies'; import { initRootBabelConfig } from '../../utils/init-root-babel-config'; -import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-command'; import { sortPackageJsonFields } from '@nx/js/src/utils/package-json/sort-fields'; export async function expoApplicationGenerator( diff --git a/packages/expo/src/generators/application/lib/add-e2e.ts b/packages/expo/src/generators/application/lib/add-e2e.ts index 93fed79f180..3eccf44ebb4 100644 --- a/packages/expo/src/generators/application/lib/add-e2e.ts +++ b/packages/expo/src/generators/application/lib/add-e2e.ts @@ -1,3 +1,4 @@ +import { getE2EWebServerInfo } from '@nx/devkit/internal'; import { addProjectConfiguration, ensurePackage, @@ -7,7 +8,6 @@ import { Tree, writeJson, } from '@nx/devkit'; -import { getE2EWebServerInfo } from '@nx/devkit/src/generators/e2e-web-server-info-utils'; import type { PackageJson } from 'nx/src/utils/package-json'; import { hasExpoPlugin } from '../../../utils/has-expo-plugin'; import { nxVersion } from '../../../utils/versions'; diff --git a/packages/expo/src/generators/application/lib/add-project.ts b/packages/expo/src/generators/application/lib/add-project.ts index 70a0a492bb2..727976411de 100644 --- a/packages/expo/src/generators/application/lib/add-project.ts +++ b/packages/expo/src/generators/application/lib/add-project.ts @@ -1,3 +1,4 @@ +import { addBuildTargetDefaults } from '@nx/devkit/internal'; import { addProjectConfiguration, joinPathFragments, @@ -7,7 +8,6 @@ import { Tree, writeJson, } from '@nx/devkit'; -import { addBuildTargetDefaults } from '@nx/devkit/src/generators/target-defaults-utils'; import type { PackageJson } from 'nx/src/utils/package-json'; import { hasExpoPlugin } from '../../../utils/has-expo-plugin'; import { NormalizedSchema } from './normalize-options'; diff --git a/packages/expo/src/generators/application/lib/normalize-options.ts b/packages/expo/src/generators/application/lib/normalize-options.ts index 02bb0a11700..4be6d5426ea 100644 --- a/packages/expo/src/generators/application/lib/normalize-options.ts +++ b/packages/expo/src/generators/application/lib/normalize-options.ts @@ -2,7 +2,7 @@ import { names, readNxJson, Tree } from '@nx/devkit'; import { determineProjectNameAndRootOptions, ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; +} from '@nx/devkit/internal'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { Schema } from '../schema'; diff --git a/packages/expo/src/generators/component/lib/normalize-options.ts b/packages/expo/src/generators/component/lib/normalize-options.ts index 9096860226e..799d202b793 100644 --- a/packages/expo/src/generators/component/lib/normalize-options.ts +++ b/packages/expo/src/generators/component/lib/normalize-options.ts @@ -2,7 +2,7 @@ import { getProjects, logger, names, Tree } from '@nx/devkit'; import { determineArtifactNameAndDirectoryOptions, type FileExtensionType, -} from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; +} from '@nx/devkit/internal'; import { Schema } from '../schema'; import { getProjectType } from '@nx/js/src/utils/typescript/ts-solution-setup'; diff --git a/packages/expo/src/generators/convert-to-inferred/convert-to-inferred.ts b/packages/expo/src/generators/convert-to-inferred/convert-to-inferred.ts index 7eaf6f0a65d..15c6b9f29c5 100644 --- a/packages/expo/src/generators/convert-to-inferred/convert-to-inferred.ts +++ b/packages/expo/src/generators/convert-to-inferred/convert-to-inferred.ts @@ -1,14 +1,14 @@ +import { + AggregatedLog, + migrateProjectExecutorsToPlugin, + NoTargetsToMigrateError, +} from '@nx/devkit/internal'; import { createProjectGraphAsync, formatFiles, getProjects, type Tree, } from '@nx/devkit'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; -import { - migrateProjectExecutorsToPlugin, - NoTargetsToMigrateError, -} from '@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator'; import { createNodesV2 } from '../../../plugins/plugin'; import { processBuildOptions } from './lib/process-build-options'; import { postTargetTransformer } from './lib/post-target-transformer'; diff --git a/packages/expo/src/generators/convert-to-inferred/lib/post-target-transformer.ts b/packages/expo/src/generators/convert-to-inferred/lib/post-target-transformer.ts index 988a0561c89..1778addb311 100644 --- a/packages/expo/src/generators/convert-to-inferred/lib/post-target-transformer.ts +++ b/packages/expo/src/generators/convert-to-inferred/lib/post-target-transformer.ts @@ -1,6 +1,5 @@ import type { TargetConfiguration, Tree } from '@nx/devkit'; -import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; -import { processTargetOutputs } from '@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils'; +import { processTargetOutputs, type AggregatedLog } from '@nx/devkit/internal'; export function postTargetTransformer( migrationLogs: AggregatedLog, diff --git a/packages/expo/src/generators/convert-to-inferred/lib/process-build-options.ts b/packages/expo/src/generators/convert-to-inferred/lib/process-build-options.ts index feaab845e97..5645d328085 100644 --- a/packages/expo/src/generators/convert-to-inferred/lib/process-build-options.ts +++ b/packages/expo/src/generators/convert-to-inferred/lib/process-build-options.ts @@ -1,5 +1,5 @@ import type { Tree } from '@nx/devkit'; -import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; +import type { AggregatedLog } from '@nx/devkit/internal'; import { processGenericOptions } from './process-generic-options'; export function processBuildOptions( diff --git a/packages/expo/src/generators/convert-to-inferred/lib/process-export-options.ts b/packages/expo/src/generators/convert-to-inferred/lib/process-export-options.ts index a8893347317..8d3407babbb 100644 --- a/packages/expo/src/generators/convert-to-inferred/lib/process-export-options.ts +++ b/packages/expo/src/generators/convert-to-inferred/lib/process-export-options.ts @@ -1,6 +1,6 @@ import type { Tree } from '@nx/devkit'; import { joinPathFragments, offsetFromRoot } from '@nx/devkit'; -import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; +import type { AggregatedLog } from '@nx/devkit/internal'; import { processGenericOptions } from './process-generic-options'; export function processExportOptions( diff --git a/packages/expo/src/generators/convert-to-inferred/lib/process-generic-options.ts b/packages/expo/src/generators/convert-to-inferred/lib/process-generic-options.ts index 55761d33a8c..7a26b307c66 100644 --- a/packages/expo/src/generators/convert-to-inferred/lib/process-generic-options.ts +++ b/packages/expo/src/generators/convert-to-inferred/lib/process-generic-options.ts @@ -1,6 +1,6 @@ import { names } from '@nx/devkit'; import type { Tree } from '@nx/devkit'; -import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; +import type { AggregatedLog } from '@nx/devkit/internal'; export function processGenericOptions( _tree: Tree, diff --git a/packages/expo/src/generators/convert-to-inferred/lib/process-install-options.ts b/packages/expo/src/generators/convert-to-inferred/lib/process-install-options.ts index 2d8fac55dbf..7c5d1f1d700 100644 --- a/packages/expo/src/generators/convert-to-inferred/lib/process-install-options.ts +++ b/packages/expo/src/generators/convert-to-inferred/lib/process-install-options.ts @@ -1,5 +1,5 @@ import type { Tree } from '@nx/devkit'; -import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; +import type { AggregatedLog } from '@nx/devkit/internal'; import { processGenericOptions } from './process-generic-options'; export function processInstallOptions( diff --git a/packages/expo/src/generators/convert-to-inferred/lib/process-prebuild-options.ts b/packages/expo/src/generators/convert-to-inferred/lib/process-prebuild-options.ts index eaf69fdcc60..5906af8dc10 100644 --- a/packages/expo/src/generators/convert-to-inferred/lib/process-prebuild-options.ts +++ b/packages/expo/src/generators/convert-to-inferred/lib/process-prebuild-options.ts @@ -1,5 +1,5 @@ import type { Tree } from '@nx/devkit'; -import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; +import type { AggregatedLog } from '@nx/devkit/internal'; import { processGenericOptions } from './process-generic-options'; export function processPrebuildOptions( diff --git a/packages/expo/src/generators/convert-to-inferred/lib/process-run-options.ts b/packages/expo/src/generators/convert-to-inferred/lib/process-run-options.ts index 20127957cc7..4c864167774 100644 --- a/packages/expo/src/generators/convert-to-inferred/lib/process-run-options.ts +++ b/packages/expo/src/generators/convert-to-inferred/lib/process-run-options.ts @@ -1,6 +1,6 @@ import { names } from '@nx/devkit'; import type { Tree } from '@nx/devkit'; -import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; +import type { AggregatedLog } from '@nx/devkit/internal'; export function processRunOptions( _tree: Tree, diff --git a/packages/expo/src/generators/convert-to-inferred/lib/process-serve-options.ts b/packages/expo/src/generators/convert-to-inferred/lib/process-serve-options.ts index 498367199e4..824d4d62a48 100644 --- a/packages/expo/src/generators/convert-to-inferred/lib/process-serve-options.ts +++ b/packages/expo/src/generators/convert-to-inferred/lib/process-serve-options.ts @@ -1,5 +1,5 @@ import type { Tree } from '@nx/devkit'; -import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; +import type { AggregatedLog } from '@nx/devkit/internal'; import { processGenericOptions } from './process-generic-options'; export function processServeOptions( diff --git a/packages/expo/src/generators/convert-to-inferred/lib/process-start-options.ts b/packages/expo/src/generators/convert-to-inferred/lib/process-start-options.ts index dd890b00065..83619c85f37 100644 --- a/packages/expo/src/generators/convert-to-inferred/lib/process-start-options.ts +++ b/packages/expo/src/generators/convert-to-inferred/lib/process-start-options.ts @@ -1,5 +1,5 @@ import type { Tree } from '@nx/devkit'; -import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; +import type { AggregatedLog } from '@nx/devkit/internal'; import { processGenericOptions } from './process-generic-options'; export function processStartOptions( diff --git a/packages/expo/src/generators/convert-to-inferred/lib/process-submit-options.ts b/packages/expo/src/generators/convert-to-inferred/lib/process-submit-options.ts index e722aeb4802..f3f3179833c 100644 --- a/packages/expo/src/generators/convert-to-inferred/lib/process-submit-options.ts +++ b/packages/expo/src/generators/convert-to-inferred/lib/process-submit-options.ts @@ -1,5 +1,5 @@ import type { Tree } from '@nx/devkit'; -import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; +import type { AggregatedLog } from '@nx/devkit/internal'; import { processGenericOptions } from './process-generic-options'; export function processSubmitOptions( diff --git a/packages/expo/src/generators/init/init.ts b/packages/expo/src/generators/init/init.ts index 96f378e71a6..46c0dfecf2d 100644 --- a/packages/expo/src/generators/init/init.ts +++ b/packages/expo/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, createProjectGraphAsync, @@ -8,7 +9,6 @@ import { runTasksInSerial, Tree, } from '@nx/devkit'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { createNodesV2 } from '../../../plugins/plugin'; import { nxVersion } from '../../utils/versions'; import { getExpoDependenciesVersionsToInstall } from '../../utils/version-utils'; diff --git a/packages/expo/src/generators/library/lib/normalize-options.ts b/packages/expo/src/generators/library/lib/normalize-options.ts index f8a8247f69e..bd49662ae01 100644 --- a/packages/expo/src/generators/library/lib/normalize-options.ts +++ b/packages/expo/src/generators/library/lib/normalize-options.ts @@ -2,7 +2,7 @@ import { readNxJson, Tree } from '@nx/devkit'; import { determineProjectNameAndRootOptions, ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; +} from '@nx/devkit/internal'; import { Schema } from '../schema'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; diff --git a/packages/expo/src/generators/library/library.ts b/packages/expo/src/generators/library/library.ts index 01fdb5df891..6444973dc77 100644 --- a/packages/expo/src/generators/library/library.ts +++ b/packages/expo/src/generators/library/library.ts @@ -1,3 +1,4 @@ +import { logShowProjectCommand, getRelativeCwd } from '@nx/devkit/internal'; import { addProjectConfiguration, formatFiles, @@ -26,7 +27,6 @@ import { NormalizedSchema, normalizeOptions } from './lib/normalize-options'; import { Schema } from './schema'; import { ensureDependencies } from '../../utils/ensure-dependencies'; import { initRootBabelConfig } from '../../utils/init-root-babel-config'; -import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-command'; import { addProjectToTsSolutionWorkspace, shouldConfigureTsSolutionSetup, @@ -35,7 +35,6 @@ import { import { sortPackageJsonFields } from '@nx/js/src/utils/package-json/sort-fields'; import { PackageJson } from 'nx/src/utils/package-json'; import { addRollupBuildTarget } from '@nx/react/src/generators/library/lib/add-rollup-build-target'; -import { getRelativeCwd } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; import { expoComponentGenerator } from '../component/component'; import { relative, join } from 'path'; import { getExpoDependenciesVersionsToInstall } from '../../utils/version-utils'; diff --git a/packages/expo/src/utils/expo-project-detection.ts b/packages/expo/src/utils/expo-project-detection.ts index bc74843c5d6..22f3daece7b 100644 --- a/packages/expo/src/utils/expo-project-detection.ts +++ b/packages/expo/src/utils/expo-project-detection.ts @@ -1,5 +1,5 @@ import { Tree, joinPathFragments } from '@nx/devkit'; -import { loadConfigFile } from '@nx/devkit/src/utils/config-utils'; +import { loadConfigFile } from '@nx/devkit/internal'; export interface ExpoProjectDetectionResult { isExpo: boolean; diff --git a/packages/express/src/generators/application/application.ts b/packages/express/src/generators/application/application.ts index cbaa8d38f07..24afbf81fb9 100644 --- a/packages/express/src/generators/application/application.ts +++ b/packages/express/src/generators/application/application.ts @@ -1,4 +1,8 @@ import type { GeneratorCallback, Tree } from '@nx/devkit'; +import { + determineProjectNameAndRootOptions, + ensureRootProjectName, +} from '@nx/devkit/internal'; import { addDependenciesToPackageJson, formatFiles, @@ -7,10 +11,6 @@ import { toJS, updateJson, } from '@nx/devkit'; -import { - determineProjectNameAndRootOptions, - ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { applicationGenerator as nodeApplicationGenerator } from '@nx/node'; import { tslibVersion } from '@nx/node/src/utils/versions'; diff --git a/packages/gradle/src/plugin-v1/nodes.ts b/packages/gradle/src/plugin-v1/nodes.ts index dbf6c6a2647..8a26fe3ff48 100644 --- a/packages/gradle/src/plugin-v1/nodes.ts +++ b/packages/gradle/src/plugin-v1/nodes.ts @@ -1,3 +1,4 @@ +import { calculateHashForCreateNodes } from '@nx/devkit/internal'; import { CreateNodesV2, CreateNodesContextV2, @@ -5,7 +6,6 @@ import { TargetConfiguration, createNodesFromFiles, } from '@nx/devkit'; -import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; import { basename, dirname, join } from 'node:path'; import { workspaceDataDirectory } from 'nx/src/utils/cache-directory'; import { PluginCache } from 'nx/src/utils/plugin-cache-utils'; diff --git a/packages/gradle/src/plugin/nodes.ts b/packages/gradle/src/plugin/nodes.ts index da86061f8ce..4ac3c1803a3 100644 --- a/packages/gradle/src/plugin/nodes.ts +++ b/packages/gradle/src/plugin/nodes.ts @@ -1,3 +1,4 @@ +import { calculateHashForCreateNodes } from '@nx/devkit/internal'; import { CreateNodesV2, CreateNodesContextV2, @@ -6,7 +7,6 @@ import { ProjectGraphExternalNode, normalizePath, } from '@nx/devkit'; -import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; import { dirname, join } from 'node:path'; import { workspaceDataDirectory } from 'nx/src/utils/cache-directory'; import { PluginCache } from 'nx/src/utils/plugin-cache-utils'; diff --git a/packages/jest/src/generators/convert-to-inferred/convert-to-inferred.ts b/packages/jest/src/generators/convert-to-inferred/convert-to-inferred.ts index 7749a14217a..fd78c832aa1 100644 --- a/packages/jest/src/generators/convert-to-inferred/convert-to-inferred.ts +++ b/packages/jest/src/generators/convert-to-inferred/convert-to-inferred.ts @@ -1,3 +1,9 @@ +import { + migrateProjectExecutorsToPlugin, + NoTargetsToMigrateError, + processTargetOutputs, + toProjectRelativePath, +} from '@nx/devkit/internal'; import type { Config } from '@jest/types'; import { createProjectGraphAsync, @@ -5,14 +11,6 @@ import { type TargetConfiguration, type Tree, } from '@nx/devkit'; -import { - migrateProjectExecutorsToPlugin, - NoTargetsToMigrateError, -} from '@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator'; -import { - processTargetOutputs, - toProjectRelativePath, -} from '@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils'; import { readConfig } from 'jest-config'; import { join, normalize, posix } from 'node:path'; import { createNodesV2, type JestPluginOptions } from '../../plugins/plugin'; diff --git a/packages/jest/src/generators/init/init.ts b/packages/jest/src/generators/init/init.ts index 2c60e05b546..1644d4a8b9b 100644 --- a/packages/jest/src/generators/init/init.ts +++ b/packages/jest/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, createProjectGraphAsync, @@ -9,7 +10,6 @@ import { type GeneratorCallback, type Tree, } from '@nx/devkit'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { createNodesV2 } from '../../plugins/plugin'; import { getPresetExt, diff --git a/packages/jest/src/migrations/update-21-0-0/remove-tsconfig-option-from-jest-executor.ts b/packages/jest/src/migrations/update-21-0-0/remove-tsconfig-option-from-jest-executor.ts index dbe20d46e54..c3ce07c4629 100644 --- a/packages/jest/src/migrations/update-21-0-0/remove-tsconfig-option-from-jest-executor.ts +++ b/packages/jest/src/migrations/update-21-0-0/remove-tsconfig-option-from-jest-executor.ts @@ -1,3 +1,4 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { formatFiles, readNxJson, @@ -7,7 +8,6 @@ import { updateNxJson, updateProjectConfiguration, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; const EXECUTOR_TO_MIGRATE = '@nx/jest:jest'; diff --git a/packages/jest/src/migrations/update-21-3-0/rename-test-path-pattern.ts b/packages/jest/src/migrations/update-21-3-0/rename-test-path-pattern.ts index fe8dd4c88a3..4ad439fbdaf 100644 --- a/packages/jest/src/migrations/update-21-3-0/rename-test-path-pattern.ts +++ b/packages/jest/src/migrations/update-21-3-0/rename-test-path-pattern.ts @@ -1,3 +1,4 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { formatFiles, readNxJson, @@ -6,7 +7,6 @@ import { updateProjectConfiguration, type Tree, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; import type { JestExecutorOptions } from '../../executors/jest/schema'; // migration for https://github.com/jestjs/jest/commit/41133b526d2c17bc9758f90d6026b25301cf0552 diff --git a/packages/jest/src/plugins/plugin.ts b/packages/jest/src/plugins/plugin.ts index 9cb36e45696..e2f239248b8 100644 --- a/packages/jest/src/plugins/plugin.ts +++ b/packages/jest/src/plugins/plugin.ts @@ -1,3 +1,9 @@ +import { + calculateHashesForCreateNodes, + clearRequireCache, + loadConfigFile, + getNamedInputs, +} from '@nx/devkit/internal'; import { CreateNodesContextV2, createNodesFromFiles, @@ -12,12 +18,6 @@ import { TargetConfiguration, writeJsonFile, } from '@nx/devkit'; -import { calculateHashesForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; -import { - clearRequireCache, - loadConfigFile, -} from '@nx/devkit/src/utils/config-utils'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import { minimatch } from 'minimatch'; import { existsSync, readdirSync, readFileSync } from 'node:fs'; import { diff --git a/packages/js/src/executors/node/node.impl.ts b/packages/js/src/executors/node/node.impl.ts index f651be052fa..7146a582cfb 100644 --- a/packages/js/src/executors/node/node.impl.ts +++ b/packages/js/src/executors/node/node.impl.ts @@ -1,3 +1,4 @@ +import { createAsyncIterable } from '@nx/devkit/internal'; import chalk from 'chalk'; import { ChildProcess, fork } from 'child_process'; import { @@ -10,7 +11,6 @@ import { readTargetOptions, runExecutor, } from '@nx/devkit'; -import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable'; import { daemonClient } from 'nx/src/daemon/client/client'; import { randomUUID } from 'crypto'; import * as path from 'path'; diff --git a/packages/js/src/executors/tsc/lib/typescript-compilation.ts b/packages/js/src/executors/tsc/lib/typescript-compilation.ts index 69fa39320fc..1022337ceee 100644 --- a/packages/js/src/executors/tsc/lib/typescript-compilation.ts +++ b/packages/js/src/executors/tsc/lib/typescript-compilation.ts @@ -1,4 +1,4 @@ -import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable'; +import { createAsyncIterable } from '@nx/devkit/internal'; import * as ts from 'typescript'; import type { TransformerEntry } from '../../../utils/typescript/types'; import { getCustomTrasformersFactory } from './get-custom-transformers-factory'; diff --git a/packages/js/src/generators/init/init.ts b/packages/js/src/generators/init/init.ts index ec8760b29d3..7cfde837b86 100644 --- a/packages/js/src/generators/init/init.ts +++ b/packages/js/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin, checkAndCleanWithSemver } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, createProjectGraphAsync, @@ -11,8 +12,6 @@ import { runTasksInSerial, Tree, } from '@nx/devkit'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; -import { checkAndCleanWithSemver } from '@nx/devkit/src/utils/semver'; import { readModulePackageJson } from 'nx/src/utils/package-json'; import { join } from 'path'; import { satisfies, valid } from 'semver'; diff --git a/packages/js/src/generators/library/library.ts b/packages/js/src/generators/library/library.ts index a2dd0fa20bf..79c5a065183 100644 --- a/packages/js/src/generators/library/library.ts +++ b/packages/js/src/generators/library/library.ts @@ -1,3 +1,10 @@ +import { + determineProjectNameAndRootOptions, + ensureRootProjectName, + promptWhenInteractive, + addBuildTargetDefaults, + logShowProjectCommand, +} from '@nx/devkit/internal'; import { addDependenciesToPackageJson, addProjectConfiguration, @@ -21,13 +28,6 @@ import { updateProjectConfiguration, writeJson, } from '@nx/devkit'; -import { - determineProjectNameAndRootOptions, - ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; -import { promptWhenInteractive } from '@nx/devkit/src/generators/prompt'; -import { addBuildTargetDefaults } from '@nx/devkit/src/generators/target-defaults-utils'; -import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-command'; import { type PackageJson } from 'nx/src/utils/package-json'; import { join } from 'path'; import type { CompilerOptions } from 'typescript'; diff --git a/packages/js/src/generators/library/schema.d.ts b/packages/js/src/generators/library/schema.d.ts index cab502ad334..76cd8ab3728 100644 --- a/packages/js/src/generators/library/schema.d.ts +++ b/packages/js/src/generators/library/schema.d.ts @@ -1,4 +1,4 @@ -import type { ProjectNameAndRootOptions } from '@nx/devkit/src/generators/project-name-and-root-utils'; +import type { ProjectNameAndRootOptions } from '@nx/devkit/internal'; // nx-ignore-next-line const { Linter, LinterType } = require('@nx/eslint'); // use require to import to avoid circular dependency import type { ProjectPackageManagerWorkspaceState } from '../../utils/package-manager-workspaces'; diff --git a/packages/js/src/generators/setup-build/generator.ts b/packages/js/src/generators/setup-build/generator.ts index 03ee9c1e396..490294f5902 100644 --- a/packages/js/src/generators/setup-build/generator.ts +++ b/packages/js/src/generators/setup-build/generator.ts @@ -1,3 +1,4 @@ +import { addBuildTargetDefaults } from '@nx/devkit/internal'; import { ensurePackage, formatFiles, @@ -13,7 +14,6 @@ import { type ProjectConfiguration, type Tree, } from '@nx/devkit'; -import { addBuildTargetDefaults } from '@nx/devkit/src/generators/target-defaults-utils'; import { basename, dirname, join } from 'node:path/posix'; import { mergeTargetConfigurations } from 'nx/src/devkit-internals'; import type { PackageJson } from 'nx/src/utils/package-json'; diff --git a/packages/js/src/migrations/update-22-0-0/remove-external-options-from-js-executors.ts b/packages/js/src/migrations/update-22-0-0/remove-external-options-from-js-executors.ts index 3623fe9ba6c..c0ade2ffe95 100644 --- a/packages/js/src/migrations/update-22-0-0/remove-external-options-from-js-executors.ts +++ b/packages/js/src/migrations/update-22-0-0/remove-external-options-from-js-executors.ts @@ -1,3 +1,4 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { formatFiles, readNxJson, @@ -6,7 +7,6 @@ import { updateProjectConfiguration, type Tree, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; export const executors = ['@nx/js:swc', '@nx/js:tsc']; diff --git a/packages/js/src/plugins/typescript/plugin.ts b/packages/js/src/plugins/typescript/plugin.ts index 447f2b0f6a5..98f3eb265e1 100644 --- a/packages/js/src/plugins/typescript/plugin.ts +++ b/packages/js/src/plugins/typescript/plugin.ts @@ -1,3 +1,4 @@ +import { getNamedInputs } from '@nx/devkit/internal'; import { createNodesFromFiles, detectPackageManager, @@ -13,7 +14,6 @@ import { type ProjectConfiguration, type TargetConfiguration, } from '@nx/devkit'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import { existsSync, readdirSync, diff --git a/packages/js/src/release/version-actions.ts b/packages/js/src/release/version-actions.ts index 4434101b51d..96a333021cc 100644 --- a/packages/js/src/release/version-actions.ts +++ b/packages/js/src/release/version-actions.ts @@ -1,3 +1,4 @@ +import { getCatalogManager } from '@nx/devkit/internal'; import { detectPackageManager, PackageManager, @@ -7,7 +8,6 @@ import { updateJson, workspaceRoot, } from '@nx/devkit'; -import { getCatalogManager } from '@nx/devkit/src/utils/catalog'; import { exec } from 'node:child_process'; import { join } from 'node:path'; import { AfterAllProjectsVersioned, VersionActions } from 'nx/release'; diff --git a/packages/js/src/utils/generator-prompts.ts b/packages/js/src/utils/generator-prompts.ts index 10dbb122c8e..dd81d1f37e2 100644 --- a/packages/js/src/utils/generator-prompts.ts +++ b/packages/js/src/utils/generator-prompts.ts @@ -1,5 +1,5 @@ import type { Tree } from '@nx/devkit'; -import { promptWhenInteractive } from '@nx/devkit/src/generators/prompt'; +import { promptWhenInteractive } from '@nx/devkit/internal'; import { isUsingTsSolutionSetup } from './typescript/ts-solution-setup'; export async function normalizeLinterOption( diff --git a/packages/js/src/utils/swc/compile-swc.ts b/packages/js/src/utils/swc/compile-swc.ts index 7e53873d5c7..d3384996e59 100644 --- a/packages/js/src/utils/swc/compile-swc.ts +++ b/packages/js/src/utils/swc/compile-swc.ts @@ -1,8 +1,8 @@ import { cacheDir, ExecutorContext, logger } from '@nx/devkit'; +import { createAsyncIterable } from '@nx/devkit/internal'; import { exec, execSync } from 'node:child_process'; import { existsSync, rmSync } from 'node:fs'; import { join } from 'node:path'; -import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable'; import { NormalizedSwcExecutorOptions } from '../schema'; import { printDiagnostics } from '../typescript/print-diagnostics'; import { runTypeCheck, TypeCheckOptions } from '../typescript/run-type-check'; diff --git a/packages/js/src/utils/typescript/compile-typescript-files.ts b/packages/js/src/utils/typescript/compile-typescript-files.ts index bfe4b65073e..16fd4a7dc10 100644 --- a/packages/js/src/utils/typescript/compile-typescript-files.ts +++ b/packages/js/src/utils/typescript/compile-typescript-files.ts @@ -1,10 +1,10 @@ +import { createAsyncIterable } from '@nx/devkit/internal'; import { compileTypeScript, compileTypeScriptWatcher, TypeScriptCompilationOptions, } from '@nx/workspace/src/utilities/typescript/compilation'; import type { Diagnostic } from 'typescript'; -import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable'; import { NormalizedExecutorOptions } from '../schema'; const TYPESCRIPT_FOUND_N_ERRORS_WATCHING_FOR_FILE_CHANGES = 6194; diff --git a/packages/maven/src/plugins/nodes.ts b/packages/maven/src/plugins/nodes.ts index 8dd20a28c75..b8bd2772fda 100644 --- a/packages/maven/src/plugins/nodes.ts +++ b/packages/maven/src/plugins/nodes.ts @@ -1,4 +1,5 @@ import { CreateNodesResultV2, CreateNodesV2, hashArray } from '@nx/devkit'; +import { calculateHashesForCreateNodes } from '@nx/devkit/internal'; import { dirname, relative } from 'path'; import { DEFAULT_OPTIONS, MavenPluginOptions } from './types'; import { runMavenAnalysis } from './maven-analyzer'; @@ -8,7 +9,6 @@ import { setCurrentMavenData, writeMavenCache, } from './maven-data-cache'; -import { calculateHashesForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; import { hashObject } from 'nx/src/devkit-internals'; /** diff --git a/packages/nest/src/generators/application/lib/normalize-options.ts b/packages/nest/src/generators/application/lib/normalize-options.ts index 9fab6236d63..9304e7fb32d 100644 --- a/packages/nest/src/generators/application/lib/normalize-options.ts +++ b/packages/nest/src/generators/application/lib/normalize-options.ts @@ -2,7 +2,7 @@ import { Tree, readNxJson } from '@nx/devkit'; import { determineProjectNameAndRootOptions, ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; +} from '@nx/devkit/internal'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; import type { Schema as NodeApplicationGeneratorOptions } from '@nx/node/src/generators/application/schema'; import type { ApplicationGeneratorOptions, NormalizedOptions } from '../schema'; diff --git a/packages/nest/src/generators/library/lib/normalize-options.ts b/packages/nest/src/generators/library/lib/normalize-options.ts index ad132947de2..5fd1d82e276 100644 --- a/packages/nest/src/generators/library/lib/normalize-options.ts +++ b/packages/nest/src/generators/library/lib/normalize-options.ts @@ -2,7 +2,7 @@ import { Tree, readNxJson } from '@nx/devkit'; import { determineProjectNameAndRootOptions, ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; +} from '@nx/devkit/internal'; import { getNpmScope } from '@nx/js/src/utils/package-json/get-npm-scope'; import type { LibraryGeneratorSchema as JsLibraryGeneratorSchema } from '@nx/js/src/generators/library/schema'; import type { LibraryGeneratorOptions, NormalizedOptions } from '../schema'; diff --git a/packages/nest/src/generators/library/library.ts b/packages/nest/src/generators/library/library.ts index e7769ec6570..f2410b31105 100644 --- a/packages/nest/src/generators/library/library.ts +++ b/packages/nest/src/generators/library/library.ts @@ -1,4 +1,5 @@ import type { GeneratorCallback, Tree } from '@nx/devkit'; +import { logShowProjectCommand } from '@nx/devkit/internal'; import { formatFiles, joinPathFragments, @@ -7,7 +8,6 @@ import { runTasksInSerial, writeJson, } from '@nx/devkit'; -import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-command'; import { libraryGenerator as jsLibraryGenerator } from '@nx/js'; import { ensureDependencies } from '../../utils/ensure-dependencies'; import initGenerator from '../init/init'; diff --git a/packages/nest/src/generators/utils/normalize-options.ts b/packages/nest/src/generators/utils/normalize-options.ts index c9012b59728..a0be8df143c 100644 --- a/packages/nest/src/generators/utils/normalize-options.ts +++ b/packages/nest/src/generators/utils/normalize-options.ts @@ -1,5 +1,5 @@ import type { Tree } from '@nx/devkit'; -import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; +import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/internal'; import type { Language, NestGeneratorWithLanguageOption, diff --git a/packages/next/src/executors/build/build.impl.ts b/packages/next/src/executors/build/build.impl.ts index a681999575b..df83f8173b9 100644 --- a/packages/next/src/executors/build/build.impl.ts +++ b/packages/next/src/executors/build/build.impl.ts @@ -11,7 +11,6 @@ import { join, resolve as pathResolve } from 'path'; import { cpSync, existsSync, writeFileSync } from 'node:fs'; import { mkdir } from 'node:fs/promises'; import { gte } from 'semver'; -import { checkAndCleanWithSemver } from '@nx/devkit/src/utils/semver'; import { updatePackageJson } from './lib/update-package-json'; import { createNextConfigFile } from './lib/create-next-config-file'; @@ -19,7 +18,7 @@ import { checkPublicDirectory } from './lib/check-project'; import { NextBuildBuilderOptions } from '../../utils/types'; import { ChildProcess, fork } from 'child_process'; import { createCliOptions } from '../../utils/create-cli-options'; -import { signalToCode } from '@nx/devkit/internal'; +import { signalToCode, checkAndCleanWithSemver } from '@nx/devkit/internal'; import { getInstalledNextVersionRuntime } from '../../utils/runtime-version-utils'; let childProcess: ChildProcess; diff --git a/packages/next/src/executors/server/server.impl.ts b/packages/next/src/executors/server/server.impl.ts index 452629fe8e3..05b71d92eb4 100644 --- a/packages/next/src/executors/server/server.impl.ts +++ b/packages/next/src/executors/server/server.impl.ts @@ -1,3 +1,4 @@ +import { createAsyncIterable } from '@nx/devkit/internal'; import { ExecutorContext, parseTargetString, @@ -13,7 +14,6 @@ import { import { fork } from 'child_process'; import customServer from './custom-server.impl'; import { createCliOptions } from '../../utils/create-cli-options'; -import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable'; import { waitForPortOpen } from '@nx/web/src/utils/wait-for-port-open'; import { getInstalledNextVersionRuntime } from '../../utils/runtime-version-utils'; diff --git a/packages/next/src/generators/application/application.ts b/packages/next/src/generators/application/application.ts index 9450c4447dc..a3bc2ea5dac 100644 --- a/packages/next/src/generators/application/application.ts +++ b/packages/next/src/generators/application/application.ts @@ -1,3 +1,4 @@ +import { logShowProjectCommand } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, formatFiles, @@ -26,7 +27,6 @@ import { addLinting } from './lib/add-linting'; import { customServerGenerator } from '../custom-server/custom-server'; import { updateCypressTsConfig } from './lib/update-cypress-tsconfig'; import { tsLibVersion } from '../../utils/versions'; -import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-command'; import { addProjectToTsSolutionWorkspace, shouldConfigureTsSolutionSetup, diff --git a/packages/next/src/generators/application/lib/add-e2e.ts b/packages/next/src/generators/application/lib/add-e2e.ts index 96b798ab4d8..275a19f810a 100644 --- a/packages/next/src/generators/application/lib/add-e2e.ts +++ b/packages/next/src/generators/application/lib/add-e2e.ts @@ -1,3 +1,4 @@ +import { getE2EWebServerInfo } from '@nx/devkit/internal'; import { addProjectConfiguration, ensurePackage, @@ -7,7 +8,6 @@ import { GeneratorCallback, writeJson, } from '@nx/devkit'; -import { getE2EWebServerInfo } from '@nx/devkit/src/generators/e2e-web-server-info-utils'; import { webStaticServeGenerator } from '@nx/web'; import type { PackageJson } from 'nx/src/utils/package-json'; import { nxVersion } from '../../../utils/versions'; diff --git a/packages/next/src/generators/application/lib/add-project.ts b/packages/next/src/generators/application/lib/add-project.ts index fb01b8a900b..8c57537236e 100644 --- a/packages/next/src/generators/application/lib/add-project.ts +++ b/packages/next/src/generators/application/lib/add-project.ts @@ -1,3 +1,4 @@ +import { addBuildTargetDefaults } from '@nx/devkit/internal'; import { NormalizedSchema } from './normalize-options'; import { addProjectConfiguration, @@ -7,7 +8,6 @@ import { Tree, writeJson, } from '@nx/devkit'; -import { addBuildTargetDefaults } from '@nx/devkit/src/generators/target-defaults-utils'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { nextVersion } from '../../../utils/versions'; import { reactDomVersion, reactVersion } from '@nx/react'; diff --git a/packages/next/src/generators/application/lib/normalize-options.ts b/packages/next/src/generators/application/lib/normalize-options.ts index f56afa48335..57c77e47e0d 100644 --- a/packages/next/src/generators/application/lib/normalize-options.ts +++ b/packages/next/src/generators/application/lib/normalize-options.ts @@ -2,7 +2,7 @@ import { joinPathFragments, readNxJson, Tree } from '@nx/devkit'; import { determineProjectNameAndRootOptions, ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; +} from '@nx/devkit/internal'; import { assertValidStyle } from '@nx/react/src/utils/assertion'; import { Schema } from '../schema'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; diff --git a/packages/next/src/generators/component/component.ts b/packages/next/src/generators/component/component.ts index f5cc5a03ba8..4c49d347fd2 100644 --- a/packages/next/src/generators/component/component.ts +++ b/packages/next/src/generators/component/component.ts @@ -1,3 +1,4 @@ +import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/internal'; import { formatFiles, joinPathFragments, @@ -5,7 +6,6 @@ import { runTasksInSerial, Tree, } from '@nx/devkit'; -import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; import type { SupportedStyles } from '@nx/react'; import { componentGenerator as reactComponentGenerator } from '@nx/react'; import { addStyleDependencies } from '../../utils/styles'; diff --git a/packages/next/src/generators/convert-to-inferred/convert-to-inferred.ts b/packages/next/src/generators/convert-to-inferred/convert-to-inferred.ts index f8834f799d5..b60d99c7ddb 100644 --- a/packages/next/src/generators/convert-to-inferred/convert-to-inferred.ts +++ b/packages/next/src/generators/convert-to-inferred/convert-to-inferred.ts @@ -1,9 +1,9 @@ import { createProjectGraphAsync, formatFiles, Tree } from '@nx/devkit'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; import { + AggregatedLog, migrateProjectExecutorsToPlugin, NoTargetsToMigrateError, -} from '@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator'; +} from '@nx/devkit/internal'; import { createNodesV2 } from '../../plugins/plugin'; import { buildPostTargetTransformer } from './lib/build-post-target-transformer'; import { servePosTargetTransformer } from './lib/serve-post-target-tranformer'; diff --git a/packages/next/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts b/packages/next/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts index c209c4c3c17..7e268791dad 100644 --- a/packages/next/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts +++ b/packages/next/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts @@ -1,9 +1,9 @@ import { TargetConfiguration, Tree } from '@nx/devkit'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; import { + AggregatedLog, processTargetOutputs, toProjectRelativePath, -} from '@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils'; +} from '@nx/devkit/internal'; import { NextBuildBuilderOptions } from '../../../utils/types'; import { updateNextConfig } from './update-next-config'; diff --git a/packages/next/src/generators/convert-to-inferred/lib/serve-post-target-tranformer.ts b/packages/next/src/generators/convert-to-inferred/lib/serve-post-target-tranformer.ts index 7d2a885109f..7692421ee01 100644 --- a/packages/next/src/generators/convert-to-inferred/lib/serve-post-target-tranformer.ts +++ b/packages/next/src/generators/convert-to-inferred/lib/serve-post-target-tranformer.ts @@ -1,7 +1,9 @@ import { TargetConfiguration, Tree } from '@nx/devkit'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; +import { + AggregatedLog, + type InferredTargetConfiguration, +} from '@nx/devkit/internal'; import type { NextServeBuilderOptions } from '../../../utils/types'; -import type { InferredTargetConfiguration } from '@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator'; export function servePosTargetTransformer(migrationLogs: AggregatedLog) { return ( diff --git a/packages/next/src/generators/convert-to-inferred/lib/update-next-config.ts b/packages/next/src/generators/convert-to-inferred/lib/update-next-config.ts index c85f3369a5b..12ed87d0029 100644 --- a/packages/next/src/generators/convert-to-inferred/lib/update-next-config.ts +++ b/packages/next/src/generators/convert-to-inferred/lib/update-next-config.ts @@ -1,8 +1,8 @@ import { Tree } from '@nx/devkit'; +import { AggregatedLog } from '@nx/devkit/internal'; import { findNextConfigPath } from './utils'; import { ast, query } from '@phenomnomnominal/tsquery'; import * as ts from 'typescript'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; export function updateNextConfig( tree: Tree, diff --git a/packages/next/src/generators/init/init.ts b/packages/next/src/generators/init/init.ts index 7ea4872677a..b56700859ed 100644 --- a/packages/next/src/generators/init/init.ts +++ b/packages/next/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, removeDependenciesFromPackageJson, @@ -7,7 +8,6 @@ import { readNxJson, createProjectGraphAsync, } from '@nx/devkit'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { getReactDependenciesVersionsToInstall, isReact18, diff --git a/packages/next/src/generators/library/lib/normalize-options.ts b/packages/next/src/generators/library/lib/normalize-options.ts index 5c775ffbc2e..29807a52993 100644 --- a/packages/next/src/generators/library/lib/normalize-options.ts +++ b/packages/next/src/generators/library/lib/normalize-options.ts @@ -2,7 +2,7 @@ import { readNxJson, Tree } from '@nx/devkit'; import { determineProjectNameAndRootOptions, ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; +} from '@nx/devkit/internal'; import { Schema } from '../schema'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; diff --git a/packages/next/src/generators/page/page.ts b/packages/next/src/generators/page/page.ts index 7c193c7b2ef..fe80ee059b4 100644 --- a/packages/next/src/generators/page/page.ts +++ b/packages/next/src/generators/page/page.ts @@ -1,3 +1,7 @@ +import { + determineArtifactNameAndDirectoryOptions, + getRelativeCwd, +} from '@nx/devkit/internal'; import { componentGenerator as reactComponentGenerator } from '@nx/react'; import { formatFiles, @@ -9,10 +13,6 @@ import { import { addStyleDependencies } from '../../utils/styles'; import { Schema } from './schema'; -import { - determineArtifactNameAndDirectoryOptions, - getRelativeCwd, -} from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; /* * This schematic is basically the React component one, but for Next we need diff --git a/packages/next/src/migrations/update-22-0-0/add-svgr-to-next-config.ts b/packages/next/src/migrations/update-22-0-0/add-svgr-to-next-config.ts index 69127e2cff9..dd0c6da396e 100644 --- a/packages/next/src/migrations/update-22-0-0/add-svgr-to-next-config.ts +++ b/packages/next/src/migrations/update-22-0-0/add-svgr-to-next-config.ts @@ -1,3 +1,4 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { type Tree, formatFiles, @@ -6,7 +7,6 @@ import { ChangeType, type StringChange, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; import { ast, query } from '@phenomnomnominal/tsquery'; import * as ts from 'typescript'; diff --git a/packages/next/src/plugins/plugin.ts b/packages/next/src/plugins/plugin.ts index 30d59b83e65..277dc1c3bba 100644 --- a/packages/next/src/plugins/plugin.ts +++ b/packages/next/src/plugins/plugin.ts @@ -1,3 +1,8 @@ +import { + calculateHashForCreateNodes, + loadConfigFile, + getNamedInputs, +} from '@nx/devkit/internal'; import { CreateDependencies, CreateNodesContextV2, @@ -10,9 +15,6 @@ import { TargetConfiguration, writeJsonFile, } from '@nx/devkit'; -import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; -import { loadConfigFile } from '@nx/devkit/src/utils/config-utils'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import { getLockFileName } from '@nx/js'; import { addBuildAndWatchDepsTargets } from '@nx/js/src/plugins/typescript/util'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; diff --git a/packages/node/src/generators/application/application.ts b/packages/node/src/generators/application/application.ts index b8a8b8e324a..01b6f56c1d0 100644 --- a/packages/node/src/generators/application/application.ts +++ b/packages/node/src/generators/application/application.ts @@ -1,3 +1,4 @@ +import { logShowProjectCommand } from '@nx/devkit/internal'; import { ensurePackage, formatFiles, @@ -18,7 +19,6 @@ import { updateTsconfigFiles, } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { sortPackageJsonFields } from '@nx/js/src/utils/package-json/sort-fields'; -import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-command'; import { nxVersion } from '../../utils/versions'; import { e2eProjectGenerator } from '../e2e-project/e2e-project'; import { initGenerator } from '../init/init'; diff --git a/packages/node/src/generators/application/lib/create-project.ts b/packages/node/src/generators/application/lib/create-project.ts index 34546d83f62..da9281de692 100644 --- a/packages/node/src/generators/application/lib/create-project.ts +++ b/packages/node/src/generators/application/lib/create-project.ts @@ -1,3 +1,4 @@ +import { addBuildTargetDefaults } from '@nx/devkit/internal'; import { addProjectConfiguration, joinPathFragments, @@ -5,7 +6,6 @@ import { Tree, writeJson, } from '@nx/devkit'; -import { addBuildTargetDefaults } from '@nx/devkit/src/generators/target-defaults-utils'; import { TS_SOLUTION_SETUP_TSCONFIG_INPUT } from '@nx/js/src/utils/typescript/ts-solution-setup'; import type { PackageJson } from 'nx/src/utils/package-json'; import { hasWebpackPlugin } from '../../../utils/has-webpack-plugin'; diff --git a/packages/node/src/generators/application/lib/normalize-options.ts b/packages/node/src/generators/application/lib/normalize-options.ts index de8c43b1275..c5bb35abe77 100644 --- a/packages/node/src/generators/application/lib/normalize-options.ts +++ b/packages/node/src/generators/application/lib/normalize-options.ts @@ -2,7 +2,7 @@ import { joinPathFragments, names, readNxJson, Tree } from '@nx/devkit'; import { determineProjectNameAndRootOptions, ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; +} from '@nx/devkit/internal'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { Schema } from '../schema'; import { NormalizedSchema } from './normalized-schema'; diff --git a/packages/node/src/generators/e2e-project/e2e-project.ts b/packages/node/src/generators/e2e-project/e2e-project.ts index aa43d536b82..3cc203f5b8f 100644 --- a/packages/node/src/generators/e2e-project/e2e-project.ts +++ b/packages/node/src/generators/e2e-project/e2e-project.ts @@ -1,3 +1,7 @@ +import { + determineProjectNameAndRootOptions, + logShowProjectCommand, +} from '@nx/devkit/internal'; import { addDependenciesToPackageJson, addProjectConfiguration, @@ -14,7 +18,6 @@ import { updateJson, writeJson, } from '@nx/devkit'; -import { determineProjectNameAndRootOptions } from '@nx/devkit/src/generators/project-name-and-root-utils'; import { lintProjectGenerator } from '@nx/eslint'; import { javaScriptOverride, @@ -28,7 +31,6 @@ import { isEslintConfigSupported, replaceOverridesInLintConfig, } from '@nx/eslint/src/generators/utils/eslint-file'; -import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-command'; import { findRootJestPreset } from '@nx/jest/src/utils/config/config-file'; import { getInstalledJestMajorVersion } from '@nx/jest/src/utils/versions'; import { diff --git a/packages/node/src/generators/library/library.ts b/packages/node/src/generators/library/library.ts index 94e5445be10..2ae098febaa 100644 --- a/packages/node/src/generators/library/library.ts +++ b/packages/node/src/generators/library/library.ts @@ -1,3 +1,8 @@ +import { + determineProjectNameAndRootOptions, + ensureRootProjectName, + addBuildTargetDefaults, +} from '@nx/devkit/internal'; import { addDependenciesToPackageJson, formatFiles, @@ -17,10 +22,6 @@ import { updateTsConfigsToJs, writeJson, } from '@nx/devkit'; -import { - determineProjectNameAndRootOptions, - ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; import { libraryGenerator as jsLibraryGenerator } from '@nx/js'; import { addSwcConfig } from '@nx/js/src/utils/swc/add-swc-config'; import { addSwcDependencies } from '@nx/js/src/utils/swc/add-swc-dependencies'; @@ -28,7 +29,6 @@ import { join } from 'path'; import { tslibVersion, typesNodeVersion } from '../../utils/versions'; import { initGenerator } from '../init/init'; import { Schema } from './schema'; -import { addBuildTargetDefaults } from '@nx/devkit/src/generators/target-defaults-utils'; import { addProjectToTsSolutionWorkspace, isUsingTsSolutionSetup, diff --git a/packages/nuxt/src/generators/application/application.ts b/packages/nuxt/src/generators/application/application.ts index cc159b46ce5..67871300685 100644 --- a/packages/nuxt/src/generators/application/application.ts +++ b/packages/nuxt/src/generators/application/application.ts @@ -1,3 +1,4 @@ +import { logShowProjectCommand } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, addProjectConfiguration, @@ -25,7 +26,6 @@ import { addLinting } from '../../utils/add-linting'; import { addVitest } from './lib/add-vitest'; import { vueTestUtilsVersion, vitePluginVueVersion } from '@nx/vue'; import { ensureDependencies } from './lib/ensure-dependencies'; -import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-command'; import { execSync } from 'node:child_process'; import { join } from 'node:path'; import { diff --git a/packages/nuxt/src/generators/application/lib/add-e2e.ts b/packages/nuxt/src/generators/application/lib/add-e2e.ts index 0361a58ada5..9b40edd1750 100644 --- a/packages/nuxt/src/generators/application/lib/add-e2e.ts +++ b/packages/nuxt/src/generators/application/lib/add-e2e.ts @@ -1,3 +1,4 @@ +import { getE2EWebServerInfo } from '@nx/devkit/internal'; import { addProjectConfiguration, ensurePackage, @@ -7,7 +8,6 @@ import { Tree, writeJson, } from '@nx/devkit'; -import { getE2EWebServerInfo } from '@nx/devkit/src/generators/e2e-web-server-info-utils'; import { nxVersion } from '../../../utils/versions'; import { NormalizedSchema } from '../schema'; import type { PackageJson } from 'nx/src/utils/package-json'; diff --git a/packages/nuxt/src/generators/application/lib/normalize-options.ts b/packages/nuxt/src/generators/application/lib/normalize-options.ts index 0a83b2480a4..078b591a144 100644 --- a/packages/nuxt/src/generators/application/lib/normalize-options.ts +++ b/packages/nuxt/src/generators/application/lib/normalize-options.ts @@ -2,7 +2,7 @@ import { names, Tree } from '@nx/devkit'; import { determineProjectNameAndRootOptions, ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; +} from '@nx/devkit/internal'; import { NormalizedSchema, Schema } from '../schema'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { getNuxtDependenciesVersionsToInstall } from '../../../utils/version-utils'; diff --git a/packages/nuxt/src/generators/init/init.ts b/packages/nuxt/src/generators/init/init.ts index c9599e03dd4..d1889c59584 100644 --- a/packages/nuxt/src/generators/init/init.ts +++ b/packages/nuxt/src/generators/init/init.ts @@ -1,5 +1,5 @@ import { createProjectGraphAsync, GeneratorCallback, Tree } from '@nx/devkit'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; +import { addPlugin } from '@nx/devkit/internal'; import { createNodesV2 } from '../../plugins/plugin'; import { InitSchema } from './schema'; diff --git a/packages/nuxt/src/plugins/plugin.ts b/packages/nuxt/src/plugins/plugin.ts index f25b4bcda34..152e9e0b314 100644 --- a/packages/nuxt/src/plugins/plugin.ts +++ b/packages/nuxt/src/plugins/plugin.ts @@ -1,3 +1,8 @@ +import { + loadConfigFile, + getNamedInputs, + calculateHashForCreateNodes, +} from '@nx/devkit/internal'; import type { NuxtOptions } from '@nuxt/schema'; import { CreateDependencies, @@ -12,9 +17,6 @@ import { workspaceRoot, writeJsonFile, } from '@nx/devkit'; -import { loadConfigFile } from '@nx/devkit/src/utils/config-utils'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; -import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; import { workspaceDataDirectory } from 'nx/src/utils/cache-directory'; import { getLockFileName } from '@nx/js'; import { dirname, isAbsolute, join, relative } from 'path'; diff --git a/packages/playwright/src/executors/merge-reports/merge-reports.impl.ts b/packages/playwright/src/executors/merge-reports/merge-reports.impl.ts index 12ccfe8a33b..7bade4caca1 100644 --- a/packages/playwright/src/executors/merge-reports/merge-reports.impl.ts +++ b/packages/playwright/src/executors/merge-reports/merge-reports.impl.ts @@ -1,9 +1,9 @@ +import { loadConfigFile } from '@nx/devkit/internal'; import { getPackageManagerCommand, output, type ExecutorContext, } from '@nx/devkit'; -import { loadConfigFile } from '@nx/devkit/src/utils/config-utils'; import type { PlaywrightTestConfig } from '@playwright/test'; import { spawnSync } from 'node:child_process'; import { existsSync, readdirSync } from 'node:fs'; diff --git a/packages/playwright/src/generators/configuration/configuration.ts b/packages/playwright/src/generators/configuration/configuration.ts index a79f5e99f63..05f0eabbe58 100644 --- a/packages/playwright/src/generators/configuration/configuration.ts +++ b/packages/playwright/src/generators/configuration/configuration.ts @@ -1,3 +1,4 @@ +import { resolveImportPath, promptWhenInteractive } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, formatFiles, @@ -19,8 +20,6 @@ import { workspaceRoot, writeJson, } from '@nx/devkit'; -import { resolveImportPath } from '@nx/devkit/src/generators/project-name-and-root-utils'; -import { promptWhenInteractive } from '@nx/devkit/src/generators/prompt'; import { getRelativePathToRootTsConfig } from '@nx/js'; import { normalizeLinterOption } from '@nx/js/src/utils/generator-prompts'; import { diff --git a/packages/playwright/src/generators/convert-to-inferred/convert-to-inferred.ts b/packages/playwright/src/generators/convert-to-inferred/convert-to-inferred.ts index 3d446a4e8f0..2c3cca7f36c 100644 --- a/packages/playwright/src/generators/convert-to-inferred/convert-to-inferred.ts +++ b/packages/playwright/src/generators/convert-to-inferred/convert-to-inferred.ts @@ -1,3 +1,7 @@ +import { + migrateProjectExecutorsToPlugin, + NoTargetsToMigrateError, +} from '@nx/devkit/internal'; import { createProjectGraphAsync, formatFiles, @@ -6,10 +10,6 @@ import { type Tree, } from '@nx/devkit'; import { createNodesV2, PlaywrightPluginOptions } from '../../plugins/plugin'; -import { - migrateProjectExecutorsToPlugin, - NoTargetsToMigrateError, -} from '@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator'; interface Schema { project?: string; diff --git a/packages/playwright/src/generators/init/init.ts b/packages/playwright/src/generators/init/init.ts index 493b4295e2b..64cc5b25dd2 100644 --- a/packages/playwright/src/generators/init/init.ts +++ b/packages/playwright/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, createProjectGraphAsync, @@ -7,7 +8,6 @@ import { runTasksInSerial, Tree, } from '@nx/devkit'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { createNodesV2 } from '../../plugins/plugin'; import { nxVersion, playwrightVersion } from '../../utils/versions'; import { InitGeneratorSchema } from './schema'; diff --git a/packages/playwright/src/plugins/plugin.ts b/packages/playwright/src/plugins/plugin.ts index cbf5797b7be..b31a7b0a12e 100644 --- a/packages/playwright/src/plugins/plugin.ts +++ b/packages/playwright/src/plugins/plugin.ts @@ -1,3 +1,8 @@ +import { + calculateHashForCreateNodes, + loadConfigFile, + getNamedInputs, +} from '@nx/devkit/internal'; import { createNodesFromFiles, type CreateNodesContextV2, @@ -10,9 +15,6 @@ import { type TargetConfiguration, type TargetDependencyConfig, } from '@nx/devkit'; -import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; -import { loadConfigFile } from '@nx/devkit/src/utils/config-utils'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import { getLockFileName, getRootTsConfigFileName } from '@nx/js'; import { walkTsconfigExtendsChain } from '@nx/js/src/internal'; import type { PlaywrightTestConfig } from '@playwright/test'; diff --git a/packages/plugin/src/generators/create-package/utils/normalize-schema.ts b/packages/plugin/src/generators/create-package/utils/normalize-schema.ts index 4505e75c6d0..504a0fcd9a8 100644 --- a/packages/plugin/src/generators/create-package/utils/normalize-schema.ts +++ b/packages/plugin/src/generators/create-package/utils/normalize-schema.ts @@ -1,5 +1,5 @@ import { readNxJson, Tree } from '@nx/devkit'; -import { determineProjectNameAndRootOptions } from '@nx/devkit/src/generators/project-name-and-root-utils'; +import { determineProjectNameAndRootOptions } from '@nx/devkit/internal'; import type { LinterType } from '@nx/eslint'; import { normalizeLinterOption, diff --git a/packages/plugin/src/generators/e2e-project/e2e.ts b/packages/plugin/src/generators/e2e-project/e2e.ts index 6b64161ada0..cbf58ce43ba 100644 --- a/packages/plugin/src/generators/e2e-project/e2e.ts +++ b/packages/plugin/src/generators/e2e-project/e2e.ts @@ -1,3 +1,4 @@ +import { determineProjectNameAndRootOptions } from '@nx/devkit/internal'; import { addProjectConfiguration, formatFiles, @@ -17,7 +18,6 @@ import { type ProjectConfiguration, type Tree, } from '@nx/devkit'; -import { determineProjectNameAndRootOptions } from '@nx/devkit/src/generators/project-name-and-root-utils'; import { LinterType, lintProjectGenerator } from '@nx/eslint'; import { addPropertyToJestConfig, diff --git a/packages/plugin/src/generators/executor/executor.ts b/packages/plugin/src/generators/executor/executor.ts index b39664a1a3f..737761f038b 100644 --- a/packages/plugin/src/generators/executor/executor.ts +++ b/packages/plugin/src/generators/executor/executor.ts @@ -1,3 +1,4 @@ +import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/internal'; import { formatFiles, generateFiles, @@ -10,7 +11,6 @@ import { type ExecutorsJson, type Tree, } from '@nx/devkit'; -import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { PackageJson } from 'nx/src/utils/package-json'; import { join } from 'path'; diff --git a/packages/plugin/src/generators/generator/generator.ts b/packages/plugin/src/generators/generator/generator.ts index 05ecda20b1a..43474acc30f 100644 --- a/packages/plugin/src/generators/generator/generator.ts +++ b/packages/plugin/src/generators/generator/generator.ts @@ -1,3 +1,4 @@ +import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/internal'; import { formatFiles, generateFiles, @@ -10,7 +11,6 @@ import { updateJson, writeJson, } from '@nx/devkit'; -import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { join } from 'node:path'; import { PackageJson } from 'nx/src/utils/package-json'; diff --git a/packages/plugin/src/generators/migration/migration.ts b/packages/plugin/src/generators/migration/migration.ts index 93cefce283a..6c8810932e0 100644 --- a/packages/plugin/src/generators/migration/migration.ts +++ b/packages/plugin/src/generators/migration/migration.ts @@ -1,3 +1,4 @@ +import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/internal'; import { formatFiles, generateFiles, @@ -9,7 +10,6 @@ import { writeJson, type Tree, } from '@nx/devkit'; -import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { join } from 'node:path'; import { PackageJson, readNxMigrateConfig } from 'nx/src/utils/package-json'; diff --git a/packages/plugin/src/generators/plugin/utils/normalize-schema.ts b/packages/plugin/src/generators/plugin/utils/normalize-schema.ts index 28483aa7a67..6d5a8f81eff 100644 --- a/packages/plugin/src/generators/plugin/utils/normalize-schema.ts +++ b/packages/plugin/src/generators/plugin/utils/normalize-schema.ts @@ -2,7 +2,7 @@ import { readNxJson, type Tree } from '@nx/devkit'; import { determineProjectNameAndRootOptions, ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; +} from '@nx/devkit/internal'; import type { LinterType } from '@nx/eslint'; import { normalizeLinterOption, diff --git a/packages/react-native/plugins/plugin.ts b/packages/react-native/plugins/plugin.ts index 31b3ac97539..5ae2c376b92 100644 --- a/packages/react-native/plugins/plugin.ts +++ b/packages/react-native/plugins/plugin.ts @@ -1,3 +1,8 @@ +import { + getNamedInputs, + calculateHashForCreateNodes, + loadConfigFile, +} from '@nx/devkit/internal'; import { CreateNodesContextV2, createNodesFromFiles, @@ -12,11 +17,8 @@ import { } from '@nx/devkit'; import { dirname, join } from 'path'; import { getLockFileName } from '@nx/js'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import { existsSync, readdirSync } from 'fs'; -import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; import { workspaceDataDirectory } from 'nx/src/utils/cache-directory'; -import { loadConfigFile } from '@nx/devkit/src/utils/config-utils'; import { hashObject } from 'nx/src/devkit-internals'; export interface ReactNativePluginOptions { diff --git a/packages/react-native/src/generators/application/application.ts b/packages/react-native/src/generators/application/application.ts index 315e1e9fb36..0d74ff2e1da 100644 --- a/packages/react-native/src/generators/application/application.ts +++ b/packages/react-native/src/generators/application/application.ts @@ -1,3 +1,4 @@ +import { logShowProjectCommand } from '@nx/devkit/internal'; import { formatFiles, GeneratorCallback, @@ -8,7 +9,6 @@ import { Tree, } from '@nx/devkit'; import { initGenerator as jsInitGenerator } from '@nx/js'; -import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-command'; import { addLinting } from '../../utils/add-linting'; import { addJest } from '../../utils/add-jest'; diff --git a/packages/react-native/src/generators/application/lib/normalize-options.ts b/packages/react-native/src/generators/application/lib/normalize-options.ts index ed4ee9a9440..d3325292901 100644 --- a/packages/react-native/src/generators/application/lib/normalize-options.ts +++ b/packages/react-native/src/generators/application/lib/normalize-options.ts @@ -2,7 +2,7 @@ import { joinPathFragments, names, readNxJson, Tree } from '@nx/devkit'; import { determineProjectNameAndRootOptions, ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; +} from '@nx/devkit/internal'; import { Schema } from '../schema'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; diff --git a/packages/react-native/src/generators/component/lib/normalize-options.ts b/packages/react-native/src/generators/component/lib/normalize-options.ts index 027aed3f82d..222ae449cdb 100644 --- a/packages/react-native/src/generators/component/lib/normalize-options.ts +++ b/packages/react-native/src/generators/component/lib/normalize-options.ts @@ -2,7 +2,7 @@ import { getProjects, logger, names, Tree } from '@nx/devkit'; import { determineArtifactNameAndDirectoryOptions, type FileExtensionType, -} from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; +} from '@nx/devkit/internal'; import { Schema } from '../schema'; import { getProjectType } from '@nx/js/src/utils/typescript/ts-solution-setup'; diff --git a/packages/react-native/src/generators/convert-to-inferred/convert-to-inferred.ts b/packages/react-native/src/generators/convert-to-inferred/convert-to-inferred.ts index 1e355cfc9fa..5be79c7113f 100644 --- a/packages/react-native/src/generators/convert-to-inferred/convert-to-inferred.ts +++ b/packages/react-native/src/generators/convert-to-inferred/convert-to-inferred.ts @@ -1,9 +1,9 @@ import { createProjectGraphAsync, formatFiles, type Tree } from '@nx/devkit'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; import { + AggregatedLog, migrateProjectExecutorsToPlugin, NoTargetsToMigrateError, -} from '@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator'; +} from '@nx/devkit/internal'; import { createNodesV2 } from '../../../plugins/plugin'; import { postTargetTransformer } from './lib/post-target-transformer'; import { processStartOptions } from './lib/process-start-options'; diff --git a/packages/react-native/src/generators/convert-to-inferred/lib/create-process-options.ts b/packages/react-native/src/generators/convert-to-inferred/lib/create-process-options.ts index 77ed64a3375..c7842c8ed02 100644 --- a/packages/react-native/src/generators/convert-to-inferred/lib/create-process-options.ts +++ b/packages/react-native/src/generators/convert-to-inferred/lib/create-process-options.ts @@ -1,5 +1,5 @@ import { names } from '@nx/devkit'; -import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; +import type { AggregatedLog } from '@nx/devkit/internal'; /** * Logic copied from `packages/react-native/src/utils/get-cli-options.ts`, diff --git a/packages/react-native/src/generators/convert-to-inferred/lib/post-target-transformer.ts b/packages/react-native/src/generators/convert-to-inferred/lib/post-target-transformer.ts index 0639ade3576..baf7c590e27 100644 --- a/packages/react-native/src/generators/convert-to-inferred/lib/post-target-transformer.ts +++ b/packages/react-native/src/generators/convert-to-inferred/lib/post-target-transformer.ts @@ -1,6 +1,5 @@ import type { TargetConfiguration, Tree } from '@nx/devkit'; -import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; -import { processTargetOutputs } from '@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils'; +import { processTargetOutputs, type AggregatedLog } from '@nx/devkit/internal'; export function postTargetTransformer( migrationLogs: AggregatedLog, diff --git a/packages/react-native/src/generators/convert-to-inferred/lib/process-start-options.ts b/packages/react-native/src/generators/convert-to-inferred/lib/process-start-options.ts index 3068f98659a..4b8802ea395 100644 --- a/packages/react-native/src/generators/convert-to-inferred/lib/process-start-options.ts +++ b/packages/react-native/src/generators/convert-to-inferred/lib/process-start-options.ts @@ -1,4 +1,4 @@ -import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; +import type { AggregatedLog } from '@nx/devkit/internal'; export function processStartOptions( _projectName: string, diff --git a/packages/react-native/src/generators/init/init.ts b/packages/react-native/src/generators/init/init.ts index 28b7e0ed0ad..36b5009f6b7 100644 --- a/packages/react-native/src/generators/init/init.ts +++ b/packages/react-native/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, createProjectGraphAsync, @@ -8,7 +9,6 @@ import { runTasksInSerial, Tree, } from '@nx/devkit'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { createNodesV2 } from '../../../plugins/plugin'; import { metroVersion, diff --git a/packages/react-native/src/generators/library/lib/normalize-options.ts b/packages/react-native/src/generators/library/lib/normalize-options.ts index 9ea146aa481..3168ee043db 100644 --- a/packages/react-native/src/generators/library/lib/normalize-options.ts +++ b/packages/react-native/src/generators/library/lib/normalize-options.ts @@ -2,7 +2,7 @@ import { readNxJson, Tree } from '@nx/devkit'; import { determineProjectNameAndRootOptions, ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; +} from '@nx/devkit/internal'; import { Schema } from '../schema'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; diff --git a/packages/react-native/src/generators/library/library.ts b/packages/react-native/src/generators/library/library.ts index aa0b982fdb1..110ce970eb0 100644 --- a/packages/react-native/src/generators/library/library.ts +++ b/packages/react-native/src/generators/library/library.ts @@ -1,3 +1,4 @@ +import { logShowProjectCommand, getRelativeCwd } from '@nx/devkit/internal'; import { addProjectConfiguration, formatFiles, @@ -29,7 +30,6 @@ import componentGenerator from '../component/component'; import { NormalizedSchema, normalizeOptions } from './lib/normalize-options'; import { Schema } from './schema'; import { ensureDependencies } from '../../utils/ensure-dependencies'; -import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-command'; import { addProjectToTsSolutionWorkspace, shouldConfigureTsSolutionSetup, @@ -38,7 +38,6 @@ import { import { sortPackageJsonFields } from '@nx/js/src/utils/package-json/sort-fields'; import { PackageJson } from 'nx/src/utils/package-json'; import { addRollupBuildTarget } from '@nx/react/src/generators/library/lib/add-rollup-build-target'; -import { getRelativeCwd } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; import { relative } from 'path'; import { reactNativeVersion, reactVersion } from '../../utils/versions'; import { diff --git a/packages/react-native/src/utils/react-native-project-detection.ts b/packages/react-native/src/utils/react-native-project-detection.ts index d45ea985e33..acdaa0671ac 100644 --- a/packages/react-native/src/utils/react-native-project-detection.ts +++ b/packages/react-native/src/utils/react-native-project-detection.ts @@ -1,5 +1,5 @@ import { Tree, joinPathFragments } from '@nx/devkit'; -import { loadConfigFile } from '@nx/devkit/src/utils/config-utils'; +import { loadConfigFile } from '@nx/devkit/internal'; export interface ReactNativeProjectDetectionResult { isReactNative: boolean; diff --git a/packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts b/packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts index 07e95ad93bf..96aeebd6b1a 100644 --- a/packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts +++ b/packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts @@ -2,7 +2,7 @@ import { ExecutorContext, logger } from '@nx/devkit'; import { combineAsyncIterables, createAsyncIterable, -} from '@nx/devkit/src/utils/async-iterable'; +} from '@nx/devkit/internal'; import { getProjectSourceRoot } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { startRemoteIterators } from '@nx/module-federation/src/executors/utils'; import fileServerExecutor from '@nx/web/src/executors/file-server/file-server.impl'; diff --git a/packages/react/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts b/packages/react/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts index fd6f8f3c914..0b8e60794e8 100644 --- a/packages/react/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts +++ b/packages/react/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts @@ -2,7 +2,7 @@ import { ExecutorContext, logger } from '@nx/devkit'; import { combineAsyncIterables, createAsyncIterable, -} from '@nx/devkit/src/utils/async-iterable'; +} from '@nx/devkit/internal'; import { getProjectSourceRoot } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { startRemoteIterators } from '@nx/module-federation/src/executors/utils'; import { waitForPortOpen } from '@nx/web/src/utils/wait-for-port-open'; diff --git a/packages/react/src/executors/module-federation-static-server/module-federation-static-server.impl.ts b/packages/react/src/executors/module-federation-static-server/module-federation-static-server.impl.ts index 84b36f42d44..d1b71485842 100644 --- a/packages/react/src/executors/module-federation-static-server/module-federation-static-server.impl.ts +++ b/packages/react/src/executors/module-federation-static-server/module-federation-static-server.impl.ts @@ -1,3 +1,7 @@ +import { + combineAsyncIterables, + createAsyncIterable, +} from '@nx/devkit/internal'; import { logger, parseTargetString, @@ -5,10 +9,6 @@ import { Target, workspaceRoot, } from '@nx/devkit'; -import { - combineAsyncIterables, - createAsyncIterable, -} from '@nx/devkit/src/utils/async-iterable'; import { getProjectSourceRoot } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { buildStaticRemotes } from '@nx/module-federation/src/executors/utils'; import { diff --git a/packages/react/src/generators/application/application.ts b/packages/react/src/generators/application/application.ts index 21ce6251b8c..fe687d799a2 100644 --- a/packages/react/src/generators/application/application.ts +++ b/packages/react/src/generators/application/application.ts @@ -1,3 +1,7 @@ +import { + logShowProjectCommand, + promptWhenInteractive, +} from '@nx/devkit/internal'; import { formatFiles, GeneratorCallback, @@ -9,7 +13,6 @@ import { updateNxJson, } from '@nx/devkit'; import { initGenerator as jsInitGenerator } from '@nx/js'; -import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-command'; import { addProjectToTsSolutionWorkspace, shouldConfigureTsSolutionSetup, @@ -39,7 +42,6 @@ import { } from './lib/bundlers/add-vite'; import { Schema } from './schema'; import { sortPackageJsonFields } from '@nx/js/src/utils/package-json/sort-fields'; -import { promptWhenInteractive } from '@nx/devkit/src/generators/prompt'; export async function applicationGenerator( tree: Tree, diff --git a/packages/react/src/generators/application/lib/add-e2e.ts b/packages/react/src/generators/application/lib/add-e2e.ts index bff327292c1..1320e62f814 100644 --- a/packages/react/src/generators/application/lib/add-e2e.ts +++ b/packages/react/src/generators/application/lib/add-e2e.ts @@ -1,3 +1,4 @@ +import { E2EWebServerDetails } from '@nx/devkit/internal'; import { addProjectConfiguration, ensurePackage, @@ -15,7 +16,6 @@ import { hasVitePlugin } from '../../../utils/has-vite-plugin'; import { hasRspackPlugin } from '../../../utils/has-rspack-plugin'; import { hasRsbuildPlugin } from '../../../utils/has-rsbuild-plugin'; import { NormalizedSchema } from '../schema'; -import { E2EWebServerDetails } from '@nx/devkit/src/generators/e2e-web-server-info-utils'; import type { PackageJson } from 'nx/src/utils/package-json'; export async function addE2e( diff --git a/packages/react/src/generators/application/lib/normalize-options.ts b/packages/react/src/generators/application/lib/normalize-options.ts index f7bb25dd4f5..b66dab99c99 100644 --- a/packages/react/src/generators/application/lib/normalize-options.ts +++ b/packages/react/src/generators/application/lib/normalize-options.ts @@ -2,7 +2,7 @@ import { Tree, names, readNxJson } from '@nx/devkit'; import { determineProjectNameAndRootOptions, ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; +} from '@nx/devkit/internal'; import { assertValidReactRouter, assertValidStyle, diff --git a/packages/react/src/generators/component/lib/normalize-options.ts b/packages/react/src/generators/component/lib/normalize-options.ts index eabde25cf29..ccff16fb6da 100644 --- a/packages/react/src/generators/component/lib/normalize-options.ts +++ b/packages/react/src/generators/component/lib/normalize-options.ts @@ -1,6 +1,5 @@ import { logger, names, readProjectConfiguration, Tree } from '@nx/devkit'; - -import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; +import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/internal'; import { assertValidStyle } from '../../../utils/assertion'; import { NormalizedSchema, Schema } from '../schema'; diff --git a/packages/react/src/generators/component/schema.d.ts b/packages/react/src/generators/component/schema.d.ts index 89230308cf2..f2eda4f1c48 100644 --- a/packages/react/src/generators/component/schema.d.ts +++ b/packages/react/src/generators/component/schema.d.ts @@ -1,4 +1,4 @@ -import type { FileExtensionType } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; +import type { FileExtensionType } from '@nx/devkit/internal'; import { SupportedStyles } from '../../../typings/style'; export interface Schema { diff --git a/packages/react/src/generators/federate-module/federate-module.ts b/packages/react/src/generators/federate-module/federate-module.ts index f4e6cfd89c2..5648dede0a7 100644 --- a/packages/react/src/generators/federate-module/federate-module.ts +++ b/packages/react/src/generators/federate-module/federate-module.ts @@ -1,3 +1,4 @@ +import { determineProjectNameAndRootOptions } from '@nx/devkit/internal'; import { GeneratorCallback, Tree, @@ -13,7 +14,6 @@ import { Schema } from './schema'; import { remoteGenerator } from '../remote/remote'; import { addPathToExposes, checkRemoteExists } from './lib/utils'; -import { determineProjectNameAndRootOptions } from '@nx/devkit/src/generators/project-name-and-root-utils'; import { addTsConfigPath, getRootTsConfigPathInTree } from '@nx/js'; export async function federateModuleGenerator(tree: Tree, schema: Schema) { diff --git a/packages/react/src/generators/hook/hook.ts b/packages/react/src/generators/hook/hook.ts index 100175f81e2..454b816787e 100644 --- a/packages/react/src/generators/hook/hook.ts +++ b/packages/react/src/generators/hook/hook.ts @@ -1,3 +1,7 @@ +import { + determineArtifactNameAndDirectoryOptions, + type FileExtensionType, +} from '@nx/devkit/internal'; // TODO(jack): Remove inline renderHook function when RTL releases with its own version import { applyChangesToString, @@ -9,10 +13,6 @@ import { names, Tree, } from '@nx/devkit'; -import { - determineArtifactNameAndDirectoryOptions, - type FileExtensionType, -} from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; import { ensureTypescript } from '@nx/js/src/utils/typescript/ensure-typescript'; import { join } from 'path'; import { addImport } from '../../utils/ast-utils'; diff --git a/packages/react/src/generators/host/host.ts b/packages/react/src/generators/host/host.ts index c544f9d98b4..521ac884c91 100644 --- a/packages/react/src/generators/host/host.ts +++ b/packages/react/src/generators/host/host.ts @@ -1,3 +1,4 @@ +import { ensureRootProjectName } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, detectPackageManager, @@ -31,7 +32,6 @@ import { moduleFederationEnhancedVersion, nxVersion, } from '../../utils/versions'; -import { ensureRootProjectName } from '@nx/devkit/src/generators/project-name-and-root-utils'; import { updateModuleFederationTsconfig } from './lib/update-module-federation-tsconfig'; import { normalizeHostName } from './lib/normalize-host-name'; diff --git a/packages/react/src/generators/host/lib/normalize-host-name.ts b/packages/react/src/generators/host/lib/normalize-host-name.ts index 833898f534c..e5d16638c02 100644 --- a/packages/react/src/generators/host/lib/normalize-host-name.ts +++ b/packages/react/src/generators/host/lib/normalize-host-name.ts @@ -1,5 +1,5 @@ import { Tree } from '@nx/devkit'; -import { determineProjectNameAndRootOptions } from '@nx/devkit/src/generators/project-name-and-root-utils'; +import { determineProjectNameAndRootOptions } from '@nx/devkit/internal'; export async function normalizeHostName( tree: Tree, diff --git a/packages/react/src/generators/init/init.ts b/packages/react/src/generators/init/init.ts index c66627ffadf..ffb5671e6f6 100755 --- a/packages/react/src/generators/init/init.ts +++ b/packages/react/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, createProjectGraphAsync, @@ -11,7 +12,6 @@ import { import { nxVersion } from '../../utils/versions'; import { InitSchema } from './schema'; import { getReactDependenciesVersionsToInstall } from '../../utils/version-utils'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { createNodesV2 } from '../../plugins/router-plugin'; export async function reactInitGenerator(tree: Tree, schema: InitSchema) { diff --git a/packages/react/src/generators/library/lib/normalize-options.ts b/packages/react/src/generators/library/lib/normalize-options.ts index a829bc0c9e9..28960e5bd05 100644 --- a/packages/react/src/generators/library/lib/normalize-options.ts +++ b/packages/react/src/generators/library/lib/normalize-options.ts @@ -1,3 +1,7 @@ +import { + determineProjectNameAndRootOptions, + ensureRootProjectName, +} from '@nx/devkit/internal'; import { getProjects, joinPathFragments, @@ -6,10 +10,6 @@ import { readNxJson, Tree, } from '@nx/devkit'; -import { - determineProjectNameAndRootOptions, - ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; import { assertValidStyle } from '../../../utils/assertion'; import { NormalizedSchema, Schema } from '../schema'; import { diff --git a/packages/react/src/generators/library/library.ts b/packages/react/src/generators/library/library.ts index 9469fa657f6..a0a6f866b81 100644 --- a/packages/react/src/generators/library/library.ts +++ b/packages/react/src/generators/library/library.ts @@ -1,3 +1,4 @@ +import { getRelativeCwd, logShowProjectCommand } from '@nx/devkit/internal'; import { addProjectConfiguration, ensurePackage, @@ -13,8 +14,6 @@ import { updateProjectConfiguration, writeJson, } from '@nx/devkit'; -import { getRelativeCwd } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; -import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-command'; import { addTsConfigPath, initGenerator as jsInitGenerator } from '@nx/js'; import { relative } from 'path'; diff --git a/packages/react/src/generators/redux/redux.ts b/packages/react/src/generators/redux/redux.ts index bb813d9ee74..08601c8df56 100644 --- a/packages/react/src/generators/redux/redux.ts +++ b/packages/react/src/generators/redux/redux.ts @@ -1,3 +1,4 @@ +import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, applyChangesToString, @@ -9,7 +10,6 @@ import { readJson, Tree, } from '@nx/devkit'; -import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; import { getRootTsConfigPathInTree } from '@nx/js'; import { ensureTypescript } from '@nx/js/src/utils/typescript/ensure-typescript'; import { diff --git a/packages/react/src/generators/redux/schema.d.ts b/packages/react/src/generators/redux/schema.d.ts index 52ea87b81e7..9ddbdd6c111 100644 --- a/packages/react/src/generators/redux/schema.d.ts +++ b/packages/react/src/generators/redux/schema.d.ts @@ -1,4 +1,4 @@ -import type { FileExtensionType } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; +import type { FileExtensionType } from '@nx/devkit/internal'; export interface Schema { path: string; diff --git a/packages/react/src/generators/remote/remote.ts b/packages/react/src/generators/remote/remote.ts index f39f4277e40..b959dbeaf79 100644 --- a/packages/react/src/generators/remote/remote.ts +++ b/packages/react/src/generators/remote/remote.ts @@ -1,3 +1,4 @@ +import { ensureRootProjectName } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, formatFiles, @@ -15,7 +16,6 @@ import { } from '@nx/devkit'; import { join } from 'path'; -import { ensureRootProjectName } from '@nx/devkit/src/generators/project-name-and-root-utils'; import { isValidVariable } from '@nx/js'; import { getProjectSourceRoot, diff --git a/packages/react/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts b/packages/react/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts index e8a9951474c..b3e481b0441 100644 --- a/packages/react/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts +++ b/packages/react/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts @@ -1,3 +1,4 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { type Tree, formatFiles, @@ -5,7 +6,6 @@ import { visitNotIgnoredFiles, addDependenciesToPackageJson, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; import { ast, query } from '@phenomnomnominal/tsquery'; import { nxVersion } from '../../utils/versions'; diff --git a/packages/react/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts b/packages/react/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts index 4366f54cebe..297032601ae 100644 --- a/packages/react/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts +++ b/packages/react/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts @@ -1,9 +1,9 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { type Tree, readProjectConfiguration, addDependenciesToPackageJson, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; import { nxVersion } from '../../utils/versions'; export default async function ensureMfPackage(tree: Tree) { diff --git a/packages/react/src/migrations/update-22-0-0/add-svgr-to-webpack-config.ts b/packages/react/src/migrations/update-22-0-0/add-svgr-to-webpack-config.ts index 3c445093963..63c41d9bb91 100644 --- a/packages/react/src/migrations/update-22-0-0/add-svgr-to-webpack-config.ts +++ b/packages/react/src/migrations/update-22-0-0/add-svgr-to-webpack-config.ts @@ -1,3 +1,4 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { type Tree, formatFiles, @@ -5,7 +6,6 @@ import { ChangeType, type StringChange, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; import { ast, query } from '@phenomnomnominal/tsquery'; import * as ts from 'typescript'; diff --git a/packages/react/src/plugins/router-plugin.ts b/packages/react/src/plugins/router-plugin.ts index 7d0436d810a..c8d5b246730 100644 --- a/packages/react/src/plugins/router-plugin.ts +++ b/packages/react/src/plugins/router-plugin.ts @@ -1,3 +1,9 @@ +import { + getNamedInputs, + calculateHashesForCreateNodes, + clearRequireCache, + loadConfigFile, +} from '@nx/devkit/internal'; import { type CreateNodesV2, type CreateNodesContextV2, @@ -13,17 +19,11 @@ import { import { dirname, join } from 'path'; import { existsSync, readdirSync } from 'fs'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import { workspaceDataDirectory } from 'nx/src/utils/cache-directory'; -import { calculateHashesForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; import { getLockFileName } from '@nx/js'; import { hashObject } from 'nx/src/devkit-internals'; import { addBuildAndWatchDepsTargets } from '@nx/js/src/plugins/typescript/util'; import { isUsingTsSolutionSetup as _isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; -import { - clearRequireCache, - loadConfigFile, -} from '@nx/devkit/src/utils/config-utils'; export interface ReactRouterPluginOptions { buildTargetName?: string; diff --git a/packages/react/src/utils/normalize-remote.ts b/packages/react/src/utils/normalize-remote.ts index 99e39878920..da912c9ced3 100644 --- a/packages/react/src/utils/normalize-remote.ts +++ b/packages/react/src/utils/normalize-remote.ts @@ -1,5 +1,5 @@ import { joinPathFragments, Tree } from '@nx/devkit'; -import { determineProjectNameAndRootOptions } from '@nx/devkit/src/generators/project-name-and-root-utils'; +import { determineProjectNameAndRootOptions } from '@nx/devkit/internal'; export async function normalizeRemoteName( tree: Tree, diff --git a/packages/remix/src/executors/serve/serve.impl.ts b/packages/remix/src/executors/serve/serve.impl.ts index 044e7b7a079..70add485bbd 100644 --- a/packages/remix/src/executors/serve/serve.impl.ts +++ b/packages/remix/src/executors/serve/serve.impl.ts @@ -1,5 +1,5 @@ import { workspaceRoot, type ExecutorContext } from '@nx/devkit'; -import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable'; +import { createAsyncIterable } from '@nx/devkit/internal'; import { waitForPortOpen } from '@nx/web/src/utils/wait-for-port-open'; import { fork } from 'node:child_process'; import { join } from 'node:path'; diff --git a/packages/remix/src/generators/application/application.impl.ts b/packages/remix/src/generators/application/application.impl.ts index 97d914360d4..32ad28ca31d 100644 --- a/packages/remix/src/generators/application/application.impl.ts +++ b/packages/remix/src/generators/application/application.impl.ts @@ -1,3 +1,4 @@ +import { logShowProjectCommand } from '@nx/devkit/internal'; import { addProjectConfiguration, ensurePackage, @@ -13,7 +14,6 @@ import { updateJson, updateProjectConfiguration, } from '@nx/devkit'; -import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-command'; import { initGenerator as jsInitGenerator } from '@nx/js'; import { extractTsConfigBase } from '@nx/js/src/utils/typescript/create-ts-config'; import { diff --git a/packages/remix/src/generators/application/lib/add-e2e.ts b/packages/remix/src/generators/application/lib/add-e2e.ts index 3456d813906..e6700f5b9c4 100644 --- a/packages/remix/src/generators/application/lib/add-e2e.ts +++ b/packages/remix/src/generators/application/lib/add-e2e.ts @@ -1,3 +1,4 @@ +import { getE2EWebServerInfo } from '@nx/devkit/internal'; import { type Tree, addProjectConfiguration, @@ -9,7 +10,6 @@ import { } from '@nx/devkit'; import { type NormalizedSchema } from './normalize-options'; import { nxVersion } from '../../../utils/versions'; -import { getE2EWebServerInfo } from '@nx/devkit/src/generators/e2e-web-server-info-utils'; import type { PackageJson } from 'nx/src/utils/package-json'; export async function addE2E( diff --git a/packages/remix/src/generators/application/lib/normalize-options.ts b/packages/remix/src/generators/application/lib/normalize-options.ts index 978326d359a..d7d0e08cca6 100644 --- a/packages/remix/src/generators/application/lib/normalize-options.ts +++ b/packages/remix/src/generators/application/lib/normalize-options.ts @@ -2,7 +2,7 @@ import { readNxJson, type Tree } from '@nx/devkit'; import { determineProjectNameAndRootOptions, ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; +} from '@nx/devkit/internal'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { type NxRemixGeneratorSchema } from '../schema'; diff --git a/packages/remix/src/generators/convert-to-inferred/convert-to-inferred.ts b/packages/remix/src/generators/convert-to-inferred/convert-to-inferred.ts index cb42ddfe4c4..e83715e2d0f 100644 --- a/packages/remix/src/generators/convert-to-inferred/convert-to-inferred.ts +++ b/packages/remix/src/generators/convert-to-inferred/convert-to-inferred.ts @@ -1,9 +1,9 @@ import { createProjectGraphAsync, formatFiles, type Tree } from '@nx/devkit'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; import { + AggregatedLog, migrateProjectExecutorsToPlugin, NoTargetsToMigrateError, -} from '@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator'; +} from '@nx/devkit/internal'; import { createNodesV2 } from '../../plugins/plugin'; import { buildPostTargetTransformer } from './lib/build-post-target-transformer'; import { servePostTargetTransformer } from './lib/serve-post-target-transformer'; diff --git a/packages/remix/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts b/packages/remix/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts index e44c781f127..afa2d5c38ac 100644 --- a/packages/remix/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts +++ b/packages/remix/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts @@ -1,7 +1,6 @@ import { type Tree, type TargetConfiguration } from '@nx/devkit'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; +import { AggregatedLog, processTargetOutputs } from '@nx/devkit/internal'; import { getConfigFilePath } from './utils'; -import { processTargetOutputs } from '@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils'; export function buildPostTargetTransformer(migrationLogs: AggregatedLog) { return ( diff --git a/packages/remix/src/generators/convert-to-inferred/lib/serve-post-target-transformer.ts b/packages/remix/src/generators/convert-to-inferred/lib/serve-post-target-transformer.ts index 7594b0ca180..6bf9774713c 100644 --- a/packages/remix/src/generators/convert-to-inferred/lib/serve-post-target-transformer.ts +++ b/packages/remix/src/generators/convert-to-inferred/lib/serve-post-target-transformer.ts @@ -1,5 +1,5 @@ import { type Tree, type TargetConfiguration } from '@nx/devkit'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; +import { AggregatedLog } from '@nx/devkit/internal'; import { REMIX_PROPERTY_MAPPINGS } from './utils'; export function servePostTargetTransformer(migrationLogs: AggregatedLog) { diff --git a/packages/remix/src/generators/init/init.ts b/packages/remix/src/generators/init/init.ts index f7bfde983e1..8e7aac8d7f8 100644 --- a/packages/remix/src/generators/init/init.ts +++ b/packages/remix/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, createProjectGraphAsync, @@ -7,7 +8,6 @@ import { runTasksInSerial, type Tree, } from '@nx/devkit'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { createNodesV2 } from '../../plugins/plugin'; import { nxVersion, remixVersion } from '../../utils/versions'; import { type Schema } from './schema'; diff --git a/packages/remix/src/generators/library/lib/normalize-options.ts b/packages/remix/src/generators/library/lib/normalize-options.ts index f71a7daf8e5..6fdad944ffa 100644 --- a/packages/remix/src/generators/library/lib/normalize-options.ts +++ b/packages/remix/src/generators/library/lib/normalize-options.ts @@ -2,7 +2,7 @@ import { readNxJson, type Tree } from '@nx/devkit'; import { determineProjectNameAndRootOptions, ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; +} from '@nx/devkit/internal'; import type { NxRemixGeneratorSchema } from '../schema'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; diff --git a/packages/remix/src/generators/resource-route/resource-route.impl.ts b/packages/remix/src/generators/resource-route/resource-route.impl.ts index 557d6a87fd7..881c29554c4 100644 --- a/packages/remix/src/generators/resource-route/resource-route.impl.ts +++ b/packages/remix/src/generators/resource-route/resource-route.impl.ts @@ -1,5 +1,5 @@ import { formatFiles, Tree } from '@nx/devkit'; -import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; +import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/internal'; import { checkRoutePathForErrors } from '../../utils/remix-route-utils'; import actionGenerator from '../action/action.impl'; import loaderGenerator from '../loader/loader.impl'; diff --git a/packages/remix/src/generators/route/route.impl.ts b/packages/remix/src/generators/route/route.impl.ts index 2a59a31a102..b894e28b040 100644 --- a/packages/remix/src/generators/route/route.impl.ts +++ b/packages/remix/src/generators/route/route.impl.ts @@ -1,5 +1,5 @@ import { formatFiles, names, stripIndents, Tree } from '@nx/devkit'; -import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; +import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/internal'; import { basename, dirname } from 'path'; import { checkRoutePathForErrors } from '../../utils/remix-route-utils'; import ActionGenerator from '../action/action.impl'; @@ -33,7 +33,6 @@ export default async function (tree: Tree, options: RemixRouteSchema) { routeFilePath, stripIndents` - export default function ${componentName}() { ${ options.loader diff --git a/packages/remix/src/generators/style/style.impl.ts b/packages/remix/src/generators/style/style.impl.ts index 7fcb6381d50..99cf9b5056f 100644 --- a/packages/remix/src/generators/style/style.impl.ts +++ b/packages/remix/src/generators/style/style.impl.ts @@ -1,3 +1,4 @@ +import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/internal'; import { formatFiles, joinPathFragments, @@ -7,7 +8,6 @@ import { } from '@nx/devkit'; import { RemixStyleSchema } from './schema'; -import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; import { dirname, relative } from 'path'; import { insertImport } from '../../utils/insert-import'; import { insertStatementAfterImports } from '../../utils/insert-statement-after-imports'; diff --git a/packages/remix/src/plugins/plugin.ts b/packages/remix/src/plugins/plugin.ts index e45f48d7f12..fd809ce46d1 100644 --- a/packages/remix/src/plugins/plugin.ts +++ b/packages/remix/src/plugins/plugin.ts @@ -1,3 +1,8 @@ +import { + calculateHashForCreateNodes, + getNamedInputs, + loadConfigFile, +} from '@nx/devkit/internal'; import { workspaceDataDirectory } from 'nx/src/utils/cache-directory'; import { hashObject } from 'nx/src/hasher/file-hasher'; import { @@ -13,9 +18,6 @@ import { type TargetConfiguration, writeJsonFile, } from '@nx/devkit'; -import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; -import { loadConfigFile } from '@nx/devkit/src/utils/config-utils'; import { getLockFileName } from '@nx/js'; import { type AppConfig } from '@remix-run/dev'; import { dirname, join } from 'path'; diff --git a/packages/rollup/src/executors/rollup/rollup.impl.ts b/packages/rollup/src/executors/rollup/rollup.impl.ts index 5c87a62a9fa..5917274c4eb 100644 --- a/packages/rollup/src/executors/rollup/rollup.impl.ts +++ b/packages/rollup/src/executors/rollup/rollup.impl.ts @@ -1,14 +1,13 @@ import * as rollup from 'rollup'; import { parse, resolve } from 'path'; import { type ExecutorContext, logger } from '@nx/devkit'; +import { loadConfigFile, createAsyncIterable } from '@nx/devkit/internal'; import { RollupExecutorOptions } from './schema'; import { NormalizedRollupExecutorOptions, normalizeRollupExecutorOptions, } from './lib/normalize'; -import { loadConfigFile } from '@nx/devkit/src/utils/config-utils'; -import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable'; import { withNx } from '../../plugins/with-nx/with-nx'; import { pluginName as generatePackageJsonPluginName } from '../../plugins/package-json/generate-package-json'; import { calculateProjectBuildableDependencies } from '@nx/js/src/utils/buildable-libs-utils'; diff --git a/packages/rollup/src/generators/configuration/configuration.ts b/packages/rollup/src/generators/configuration/configuration.ts index 6467ed646cf..bb3dd461a5b 100644 --- a/packages/rollup/src/generators/configuration/configuration.ts +++ b/packages/rollup/src/generators/configuration/configuration.ts @@ -1,3 +1,4 @@ +import { addBuildTargetDefaults } from '@nx/devkit/internal'; import { formatFiles, GeneratorCallback, @@ -12,7 +13,6 @@ import { updateProjectConfiguration, writeJson, } from '@nx/devkit'; -import { addBuildTargetDefaults } from '@nx/devkit/src/generators/target-defaults-utils'; import { getUpdatedPackageJsonContent, readTsConfig } from '@nx/js'; import { getImportPath } from '@nx/js/src/utils/get-import-path'; import { ensureTypescript } from '@nx/js/src/utils/typescript/ensure-typescript'; diff --git a/packages/rollup/src/generators/convert-to-inferred/convert-to-inferred.ts b/packages/rollup/src/generators/convert-to-inferred/convert-to-inferred.ts index b5e87dcc3cb..fe35f0c1122 100644 --- a/packages/rollup/src/generators/convert-to-inferred/convert-to-inferred.ts +++ b/packages/rollup/src/generators/convert-to-inferred/convert-to-inferred.ts @@ -1,3 +1,7 @@ +import { + forEachExecutorOptions, + NoTargetsToMigrateError, +} from '@nx/devkit/internal'; import { formatFiles, getProjects, @@ -5,12 +9,10 @@ import { updateProjectConfiguration, type Tree, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; import type { RollupExecutorOptions } from '../../executors/rollup/schema'; import type { RollupPluginOptions } from '../../plugins/plugin'; import { extractRollupConfigFromExecutorOptions } from './lib/extract-rollup-config-from-executor-options'; import { addPluginRegistrations } from './lib/add-plugin-registrations'; -import { NoTargetsToMigrateError } from '@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator'; interface Schema { project?: string; diff --git a/packages/rollup/src/generators/init/init.ts b/packages/rollup/src/generators/init/init.ts index 6ed1301bce9..b8000d7f878 100644 --- a/packages/rollup/src/generators/init/init.ts +++ b/packages/rollup/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, createProjectGraphAsync, @@ -8,7 +9,6 @@ import { } from '@nx/devkit'; import { nxVersion, rollupVersion } from '../../utils/versions'; import { Schema } from './schema'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { createNodesV2 } from '../../plugins/plugin'; export async function rollupInitGenerator(tree: Tree, schema: Schema) { diff --git a/packages/rollup/src/plugins/plugin.ts b/packages/rollup/src/plugins/plugin.ts index d75c405b744..fe9f0fb8bde 100644 --- a/packages/rollup/src/plugins/plugin.ts +++ b/packages/rollup/src/plugins/plugin.ts @@ -1,3 +1,7 @@ +import { + calculateHashForCreateNodes, + getNamedInputs, +} from '@nx/devkit/internal'; import { workspaceDataDirectory } from 'nx/src/utils/cache-directory'; import { basename, dirname, join } from 'path'; import { readdirSync } from 'fs'; @@ -13,9 +17,7 @@ import { type TargetConfiguration, writeJsonFile, } from '@nx/devkit'; -import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; import { getLockFileName } from '@nx/js'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import { type RollupOptions } from 'rollup'; import { hashObject } from 'nx/src/hasher/file-hasher'; import { diff --git a/packages/rsbuild/src/generators/init/init.ts b/packages/rsbuild/src/generators/init/init.ts index 8bd251e1e41..8a3f7b8913a 100644 --- a/packages/rsbuild/src/generators/init/init.ts +++ b/packages/rsbuild/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin } from '@nx/devkit/internal'; import { type Tree, type GeneratorCallback, @@ -7,7 +8,6 @@ import { formatFiles, runTasksInSerial, } from '@nx/devkit'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { InitGeneratorSchema } from './schema'; import { createNodesV2 } from '../../plugins/plugin'; import { nxVersion, rsbuildVersion } from '../../utils/versions'; diff --git a/packages/rsbuild/src/plugins/plugin.ts b/packages/rsbuild/src/plugins/plugin.ts index 2957c4bb39b..94531e86dff 100644 --- a/packages/rsbuild/src/plugins/plugin.ts +++ b/packages/rsbuild/src/plugins/plugin.ts @@ -1,3 +1,7 @@ +import { + getNamedInputs, + calculateHashForCreateNodes, +} from '@nx/devkit/internal'; import { type ProjectConfiguration, type TargetConfiguration, @@ -10,11 +14,9 @@ import { getPackageManagerCommand, detectPackageManager, } from '@nx/devkit'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import { hashObject } from 'nx/src/hasher/file-hasher'; import { workspaceDataDirectory } from 'nx/src/utils/cache-directory'; import { isUsingTsSolutionSetup as _isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; -import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; import { getLockFileName } from '@nx/js'; import { existsSync, readdirSync } from 'fs'; import { join, dirname, isAbsolute, relative } from 'path'; diff --git a/packages/rsbuild/src/utils/e2e-web-server-info-utils.ts b/packages/rsbuild/src/utils/e2e-web-server-info-utils.ts index a69d847a510..eb91f9a5173 100644 --- a/packages/rsbuild/src/utils/e2e-web-server-info-utils.ts +++ b/packages/rsbuild/src/utils/e2e-web-server-info-utils.ts @@ -1,5 +1,5 @@ import { type Tree, readNxJson } from '@nx/devkit'; -import { getE2EWebServerInfo } from '@nx/devkit/src/generators/e2e-web-server-info-utils'; +import { getE2EWebServerInfo } from '@nx/devkit/internal'; export async function getRsbuildE2EWebServerInfo( tree: Tree, diff --git a/packages/rspack/src/executors/dev-server/dev-server.impl.ts b/packages/rspack/src/executors/dev-server/dev-server.impl.ts index 5ca761a0f9d..23c97532eb1 100644 --- a/packages/rspack/src/executors/dev-server/dev-server.impl.ts +++ b/packages/rspack/src/executors/dev-server/dev-server.impl.ts @@ -1,10 +1,10 @@ +import { createAsyncIterable } from '@nx/devkit/internal'; import { ExecutorContext, logger, parseTargetString, readTargetOptions, } from '@nx/devkit'; -import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable'; import { getProjectSourceRoot } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { Configuration } from '@rspack/core'; import { RspackDevServer } from '@rspack/dev-server'; diff --git a/packages/rspack/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts b/packages/rspack/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts index b7be155836c..83d13bd3763 100644 --- a/packages/rspack/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts +++ b/packages/rspack/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts @@ -2,7 +2,7 @@ import { ExecutorContext, logger } from '@nx/devkit'; import { combineAsyncIterables, createAsyncIterable, -} from '@nx/devkit/src/utils/async-iterable'; +} from '@nx/devkit/internal'; import { getProjectSourceRoot } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { startRemoteIterators } from '@nx/module-federation/src/executors/utils'; import fileServerExecutor from '@nx/web/src/executors/file-server/file-server.impl'; diff --git a/packages/rspack/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts b/packages/rspack/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts index f189d1e58fb..467b741a84a 100644 --- a/packages/rspack/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts +++ b/packages/rspack/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts @@ -2,7 +2,7 @@ import { ExecutorContext, logger } from '@nx/devkit'; import { combineAsyncIterables, createAsyncIterable, -} from '@nx/devkit/src/utils/async-iterable'; +} from '@nx/devkit/internal'; import { getProjectSourceRoot } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { startRemoteIterators } from '@nx/module-federation/src/executors/utils'; import { waitForPortOpen } from '@nx/web/src/utils/wait-for-port-open'; diff --git a/packages/rspack/src/executors/module-federation-static-server/module-federation-static-server.impl.ts b/packages/rspack/src/executors/module-federation-static-server/module-federation-static-server.impl.ts index c6739930cca..e7dd5bd7dda 100644 --- a/packages/rspack/src/executors/module-federation-static-server/module-federation-static-server.impl.ts +++ b/packages/rspack/src/executors/module-federation-static-server/module-federation-static-server.impl.ts @@ -1,3 +1,7 @@ +import { + combineAsyncIterables, + createAsyncIterable, +} from '@nx/devkit/internal'; import { logger, parseTargetString, @@ -5,10 +9,6 @@ import { Target, workspaceRoot, } from '@nx/devkit'; -import { - combineAsyncIterables, - createAsyncIterable, -} from '@nx/devkit/src/utils/async-iterable'; import { getProjectSourceRoot } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { buildStaticRemotes } from '@nx/module-federation/src/executors/utils'; import { diff --git a/packages/rspack/src/executors/rspack/rspack.impl.ts b/packages/rspack/src/executors/rspack/rspack.impl.ts index 52037a2e537..7e72eae6e5c 100644 --- a/packages/rspack/src/executors/rspack/rspack.impl.ts +++ b/packages/rspack/src/executors/rspack/rspack.impl.ts @@ -1,5 +1,5 @@ import { ExecutorContext, logger } from '@nx/devkit'; -import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable'; +import { createAsyncIterable } from '@nx/devkit/internal'; import { printDiagnostics, runTypeCheck } from '@nx/js'; import { getProjectSourceRoot } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { diff --git a/packages/rspack/src/executors/ssr-dev-server/ssr-dev-server.impl.ts b/packages/rspack/src/executors/ssr-dev-server/ssr-dev-server.impl.ts index 82510368cc3..1d38ad28024 100644 --- a/packages/rspack/src/executors/ssr-dev-server/ssr-dev-server.impl.ts +++ b/packages/rspack/src/executors/ssr-dev-server/ssr-dev-server.impl.ts @@ -1,10 +1,10 @@ +import { combineAsyncIterables } from '@nx/devkit/internal'; import { ExecutorContext, parseTargetString, readTargetOptions, runExecutor, } from '@nx/devkit'; -import { combineAsyncIterables } from '@nx/devkit/src/utils/async-iterable'; import * as pc from 'picocolors'; import { RspackExecutorSchema } from '../rspack/schema'; diff --git a/packages/rspack/src/generators/convert-config-to-rspack-plugin/convert-config-to-rspack-plugin.ts b/packages/rspack/src/generators/convert-config-to-rspack-plugin/convert-config-to-rspack-plugin.ts index ed64851a2c9..78a821a6e8f 100644 --- a/packages/rspack/src/generators/convert-config-to-rspack-plugin/convert-config-to-rspack-plugin.ts +++ b/packages/rspack/src/generators/convert-config-to-rspack-plugin/convert-config-to-rspack-plugin.ts @@ -1,3 +1,4 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { formatFiles, getProjects, @@ -7,7 +8,6 @@ import { updateProjectConfiguration, ProjectConfiguration, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; import { RspackExecutorSchema } from '../../executors/rspack/schema'; import { extractRspackOptions } from './lib/extract-rspack-options'; import { normalizePathOptions } from './lib/normalize-path-options'; diff --git a/packages/rspack/src/generators/convert-to-inferred/convert-to-inferred.ts b/packages/rspack/src/generators/convert-to-inferred/convert-to-inferred.ts index 82f3b6509d1..f8d48f40577 100644 --- a/packages/rspack/src/generators/convert-to-inferred/convert-to-inferred.ts +++ b/packages/rspack/src/generators/convert-to-inferred/convert-to-inferred.ts @@ -1,3 +1,8 @@ +import { + AggregatedLog, + migrateProjectExecutorsToPlugin, + NoTargetsToMigrateError, +} from '@nx/devkit/internal'; import { addDependenciesToPackageJson, createProjectGraphAsync, @@ -6,11 +11,6 @@ import { type ProjectConfiguration, type Tree, } from '@nx/devkit'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; -import { - migrateProjectExecutorsToPlugin, - NoTargetsToMigrateError, -} from '@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator'; import { ast, query } from '@phenomnomnominal/tsquery'; import * as ts from 'typescript'; import { createNodesV2, type RspackPluginOptions } from '../../plugins/plugin'; diff --git a/packages/rspack/src/generators/convert-to-inferred/utils/build-post-target-transformer.ts b/packages/rspack/src/generators/convert-to-inferred/utils/build-post-target-transformer.ts index 57a05bd2128..9a11503f694 100644 --- a/packages/rspack/src/generators/convert-to-inferred/utils/build-post-target-transformer.ts +++ b/packages/rspack/src/generators/convert-to-inferred/utils/build-post-target-transformer.ts @@ -2,7 +2,7 @@ import type { TargetConfiguration, Tree } from '@nx/devkit'; import { processTargetOutputs, toProjectRelativePath, -} from '@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils'; +} from '@nx/devkit/internal'; import { ast, query } from '@phenomnomnominal/tsquery'; import * as ts from 'typescript'; import type { RspackExecutorSchema } from '../../../executors/rspack/schema'; diff --git a/packages/rspack/src/generators/convert-to-inferred/utils/serve-post-target-transformer.ts b/packages/rspack/src/generators/convert-to-inferred/utils/serve-post-target-transformer.ts index 0377602d39a..8cc5928f012 100644 --- a/packages/rspack/src/generators/convert-to-inferred/utils/serve-post-target-transformer.ts +++ b/packages/rspack/src/generators/convert-to-inferred/utils/serve-post-target-transformer.ts @@ -1,3 +1,7 @@ +import { + processTargetOutputs, + toProjectRelativePath, +} from '@nx/devkit/internal'; import { parseTargetString, readJson, @@ -7,10 +11,6 @@ import { type TargetConfiguration, type Tree, } from '@nx/devkit'; -import { - processTargetOutputs, - toProjectRelativePath, -} from '@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils'; import { ast, query } from '@phenomnomnominal/tsquery'; import { basename, resolve } from 'path'; import * as ts from 'typescript'; diff --git a/packages/rspack/src/generators/convert-to-inferred/utils/types.ts b/packages/rspack/src/generators/convert-to-inferred/utils/types.ts index 85b5c1646f0..2e7960b55d9 100644 --- a/packages/rspack/src/generators/convert-to-inferred/utils/types.ts +++ b/packages/rspack/src/generators/convert-to-inferred/utils/types.ts @@ -1,5 +1,5 @@ import type { ProjectGraph } from '@nx/devkit'; -import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; +import type { AggregatedLog } from '@nx/devkit/internal'; export type MigrationContext = { logger: AggregatedLog; diff --git a/packages/rspack/src/generators/init/init.ts b/packages/rspack/src/generators/init/init.ts index 2b68c640cf6..638f45a181d 100644 --- a/packages/rspack/src/generators/init/init.ts +++ b/packages/rspack/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, convertNxGenerator, @@ -7,7 +8,6 @@ import { runTasksInSerial, Tree, } from '@nx/devkit'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { initGenerator } from '@nx/js'; import { createNodesV2 } from '../../../plugin'; import { diff --git a/packages/rspack/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts b/packages/rspack/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts index edbec14eed6..da1948fd538 100644 --- a/packages/rspack/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts +++ b/packages/rspack/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts @@ -1,3 +1,4 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { type Tree, formatFiles, @@ -5,7 +6,6 @@ import { visitNotIgnoredFiles, addDependenciesToPackageJson, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; import { ast, query } from '@phenomnomnominal/tsquery'; import { nxVersion } from '../../utils/versions'; diff --git a/packages/rspack/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts b/packages/rspack/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts index 91cc0c4614b..dfc0c783fbb 100644 --- a/packages/rspack/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts +++ b/packages/rspack/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts @@ -1,9 +1,9 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { type Tree, readProjectConfiguration, addDependenciesToPackageJson, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; import { nxVersion } from '../../utils/versions'; export default async function ensureMfPackage(tree: Tree) { diff --git a/packages/rspack/src/migrations/update-22-0-0/remove-deprecated-options.ts b/packages/rspack/src/migrations/update-22-0-0/remove-deprecated-options.ts index 5db73f3f896..a55b026791a 100644 --- a/packages/rspack/src/migrations/update-22-0-0/remove-deprecated-options.ts +++ b/packages/rspack/src/migrations/update-22-0-0/remove-deprecated-options.ts @@ -1,3 +1,4 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { type Tree, formatFiles, @@ -5,7 +6,6 @@ import { visitNotIgnoredFiles, readProjectConfiguration, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; export default async function removeDeprecatedOptions(tree: Tree) { const projects = new Set(); diff --git a/packages/rspack/src/plugins/plugin.ts b/packages/rspack/src/plugins/plugin.ts index e73d1572338..f263c06af8f 100644 --- a/packages/rspack/src/plugins/plugin.ts +++ b/packages/rspack/src/plugins/plugin.ts @@ -1,3 +1,4 @@ +import { getNamedInputs } from '@nx/devkit/internal'; import { CreateDependencies, CreateNodesContextV2, @@ -9,7 +10,6 @@ import { workspaceRoot, writeJsonFile, } from '@nx/devkit'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import { getLockFileName, getRootTsConfigPath } from '@nx/js'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { existsSync, readdirSync } from 'fs'; diff --git a/packages/rspack/src/utils/e2e-web-server-info-utils.ts b/packages/rspack/src/utils/e2e-web-server-info-utils.ts index de4406e00a3..8bd977e5342 100644 --- a/packages/rspack/src/utils/e2e-web-server-info-utils.ts +++ b/packages/rspack/src/utils/e2e-web-server-info-utils.ts @@ -1,5 +1,5 @@ import { type Tree, readNxJson } from '@nx/devkit'; -import { getE2EWebServerInfo } from '@nx/devkit/src/generators/e2e-web-server-info-utils'; +import { getE2EWebServerInfo } from '@nx/devkit/internal'; export async function getRspackE2EWebServerInfo( tree: Tree, diff --git a/packages/rspack/src/utils/resolve-user-defined-rspack-config.ts b/packages/rspack/src/utils/resolve-user-defined-rspack-config.ts index 41cfef45417..35965884399 100644 --- a/packages/rspack/src/utils/resolve-user-defined-rspack-config.ts +++ b/packages/rspack/src/utils/resolve-user-defined-rspack-config.ts @@ -1,4 +1,4 @@ -import { loadConfigFile } from '@nx/devkit/src/utils/config-utils'; +import { loadConfigFile } from '@nx/devkit/internal'; export async function resolveUserDefinedRspackConfig( path: string, diff --git a/packages/storybook/src/generators/convert-to-inferred/convert-to-inferred.ts b/packages/storybook/src/generators/convert-to-inferred/convert-to-inferred.ts index e0dda2a19e6..c0177c7e071 100644 --- a/packages/storybook/src/generators/convert-to-inferred/convert-to-inferred.ts +++ b/packages/storybook/src/generators/convert-to-inferred/convert-to-inferred.ts @@ -1,3 +1,8 @@ +import { + AggregatedLog, + migrateProjectExecutorsToPlugin, + NoTargetsToMigrateError, +} from '@nx/devkit/internal'; import { addDependenciesToPackageJson, createProjectGraphAsync, @@ -5,11 +10,6 @@ import { runTasksInSerial, type Tree, } from '@nx/devkit'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; -import { - migrateProjectExecutorsToPlugin, - NoTargetsToMigrateError, -} from '@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator'; import { buildPostTargetTransformer } from './lib/build-post-target-transformer'; import { servePostTargetTransformer } from './lib/serve-post-target-transformer'; import { createNodesV2 } from '../../plugins/plugin'; diff --git a/packages/storybook/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts b/packages/storybook/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts index 934ec5798d4..a66fa550e7a 100644 --- a/packages/storybook/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts +++ b/packages/storybook/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts @@ -2,9 +2,9 @@ import { joinPathFragments, TargetConfiguration, Tree } from '@nx/devkit'; import { processTargetOutputs, toProjectRelativePath, -} from '@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils'; + AggregatedLog, +} from '@nx/devkit/internal'; import { ast, query } from '@phenomnomnominal/tsquery'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; import { addConfigValuesToConfigFile, ensureViteConfigPathIsRelative, diff --git a/packages/storybook/src/generators/convert-to-inferred/lib/serve-post-target-transformer.ts b/packages/storybook/src/generators/convert-to-inferred/lib/serve-post-target-transformer.ts index 45bca2f55d5..e1a9e4d30bc 100644 --- a/packages/storybook/src/generators/convert-to-inferred/lib/serve-post-target-transformer.ts +++ b/packages/storybook/src/generators/convert-to-inferred/lib/serve-post-target-transformer.ts @@ -1,6 +1,5 @@ import { joinPathFragments, TargetConfiguration, Tree } from '@nx/devkit'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; -import { toProjectRelativePath } from '@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils'; +import { AggregatedLog, toProjectRelativePath } from '@nx/devkit/internal'; import { ensureViteConfigPathIsRelative, getConfigFilePath, diff --git a/packages/storybook/src/generators/convert-to-inferred/lib/utils.ts b/packages/storybook/src/generators/convert-to-inferred/lib/utils.ts index fa6b9fa4189..e6490105239 100644 --- a/packages/storybook/src/generators/convert-to-inferred/lib/utils.ts +++ b/packages/storybook/src/generators/convert-to-inferred/lib/utils.ts @@ -4,8 +4,7 @@ import { joinPathFragments, type Tree, } from '@nx/devkit'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; -import { toProjectRelativePath } from '@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils'; +import { AggregatedLog, toProjectRelativePath } from '@nx/devkit/internal'; import { dirname } from 'path/posix'; import { coerce, major } from 'semver'; diff --git a/packages/storybook/src/generators/init/init.ts b/packages/storybook/src/generators/init/init.ts index 4b0b77204cd..ec9f859440f 100644 --- a/packages/storybook/src/generators/init/init.ts +++ b/packages/storybook/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, createProjectGraphAsync, @@ -10,7 +11,6 @@ import { updateJson, updateNxJson, } from '@nx/devkit'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { gte } from 'semver'; import { createNodesV2 } from '../../plugins/plugin'; import { diff --git a/packages/storybook/src/plugins/plugin.ts b/packages/storybook/src/plugins/plugin.ts index 30397578e4b..2b98252fd75 100644 --- a/packages/storybook/src/plugins/plugin.ts +++ b/packages/storybook/src/plugins/plugin.ts @@ -1,3 +1,8 @@ +import { + getNamedInputs, + calculateHashForCreateNodes, + loadConfigFile, +} from '@nx/devkit/internal'; import { CreateDependencies, CreateNodesContextV2, @@ -12,12 +17,9 @@ import { writeJsonFile, } from '@nx/devkit'; import { dirname, join } from 'path'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import { existsSync, readdirSync, readFileSync } from 'fs'; -import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; import { workspaceDataDirectory } from 'nx/src/utils/cache-directory'; import { getLockFileName } from '@nx/js'; -import { loadConfigFile } from '@nx/devkit/src/utils/config-utils'; import type { StorybookConfig } from 'storybook/internal/types'; import { hashObject } from 'nx/src/hasher/file-hasher'; import { query } from '@phenomnomnominal/tsquery'; diff --git a/packages/vite/src/executors/build/build.impl.ts b/packages/vite/src/executors/build/build.impl.ts index 12f623e392f..a92b0e5ad27 100644 --- a/packages/vite/src/executors/build/build.impl.ts +++ b/packages/vite/src/executors/build/build.impl.ts @@ -1,3 +1,7 @@ +import { + combineAsyncIterables, + createAsyncIterable, +} from '@nx/devkit/internal'; import { detectPackageManager, ExecutorContext, @@ -20,10 +24,6 @@ import { } from '@nx/js'; import { existsSync, writeFileSync } from 'fs'; import { relative, resolve } from 'path'; -import { - combineAsyncIterables, - createAsyncIterable, -} from '@nx/devkit/src/utils/async-iterable'; import { createBuildableTsConfig, loadViteDynamicImport, diff --git a/packages/vite/src/generators/convert-to-inferred/convert-to-inferred.ts b/packages/vite/src/generators/convert-to-inferred/convert-to-inferred.ts index f99d299abc6..ba3560b499f 100644 --- a/packages/vite/src/generators/convert-to-inferred/convert-to-inferred.ts +++ b/packages/vite/src/generators/convert-to-inferred/convert-to-inferred.ts @@ -2,13 +2,13 @@ import { createProjectGraphAsync, formatFiles, type Tree } from '@nx/devkit'; import { migrateProjectExecutorsToPlugin, NoTargetsToMigrateError, -} from '@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator'; + AggregatedLog, +} from '@nx/devkit/internal'; import { createNodesV2, VitePluginOptions } from '../../plugins/plugin'; import { buildPostTargetTransformer } from './lib/build-post-target-transformer'; import { servePostTargetTransformer } from './lib/serve-post-target-transformer'; import { previewPostTargetTransformer } from './lib/preview-post-target-transformer'; import { testPostTargetTransformer } from './lib/test-post-target-transformer'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; interface Schema { project?: string; diff --git a/packages/vite/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts b/packages/vite/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts index 9dac0bb9f45..9df5b9cf5d7 100644 --- a/packages/vite/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts +++ b/packages/vite/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts @@ -1,3 +1,4 @@ +import { processTargetOutputs } from '@nx/devkit/internal'; import { joinPathFragments, type TargetConfiguration, @@ -10,7 +11,6 @@ import { getViteConfigPath, toProjectRelativePath, } from './utils'; -import { processTargetOutputs } from '@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils'; export function buildPostTargetTransformer( target: TargetConfiguration, diff --git a/packages/vite/src/generators/convert-to-inferred/lib/preview-post-target-transformer.ts b/packages/vite/src/generators/convert-to-inferred/lib/preview-post-target-transformer.ts index 017ff890915..784a03adf60 100644 --- a/packages/vite/src/generators/convert-to-inferred/lib/preview-post-target-transformer.ts +++ b/packages/vite/src/generators/convert-to-inferred/lib/preview-post-target-transformer.ts @@ -1,6 +1,6 @@ import { type TargetConfiguration, type Tree } from '@nx/devkit'; +import { AggregatedLog } from '@nx/devkit/internal'; import { getViteConfigPath } from './utils'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; export function previewPostTargetTransformer(migrationLogs: AggregatedLog) { return ( diff --git a/packages/vite/src/generators/convert-to-inferred/lib/serve-post-target-transformer.ts b/packages/vite/src/generators/convert-to-inferred/lib/serve-post-target-transformer.ts index 61db1f753a9..b8d4b88124b 100644 --- a/packages/vite/src/generators/convert-to-inferred/lib/serve-post-target-transformer.ts +++ b/packages/vite/src/generators/convert-to-inferred/lib/serve-post-target-transformer.ts @@ -1,6 +1,6 @@ import { type TargetConfiguration, type Tree } from '@nx/devkit'; +import { AggregatedLog } from '@nx/devkit/internal'; import { getViteConfigPath } from './utils'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; export function servePostTargetTransformer(migrationLogs: AggregatedLog) { return ( diff --git a/packages/vite/src/generators/convert-to-inferred/lib/test-post-target-transformer.ts b/packages/vite/src/generators/convert-to-inferred/lib/test-post-target-transformer.ts index 8e85aba0ecb..a36dcbbe1da 100644 --- a/packages/vite/src/generators/convert-to-inferred/lib/test-post-target-transformer.ts +++ b/packages/vite/src/generators/convert-to-inferred/lib/test-post-target-transformer.ts @@ -1,6 +1,6 @@ import { type TargetConfiguration, type Tree } from '@nx/devkit'; +import { processTargetOutputs } from '@nx/devkit/internal'; import { toProjectRelativePath } from './utils'; -import { processTargetOutputs } from '@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils'; export function testPostTargetTransformer( target: TargetConfiguration, diff --git a/packages/vite/src/generators/init/init.ts b/packages/vite/src/generators/init/init.ts index 939dd83dbdc..4c6925ff153 100644 --- a/packages/vite/src/generators/init/init.ts +++ b/packages/vite/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin } from '@nx/devkit/internal'; import { createProjectGraphAsync, formatFiles, @@ -7,7 +8,6 @@ import { Tree, updateNxJson, } from '@nx/devkit'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { setupPathsPlugin } from '../setup-paths-plugin/setup-paths-plugin'; import { createNodesV2 } from '../../plugins/plugin'; diff --git a/packages/vite/src/migrations/update-22-2-0/migrate-vitest-to-vitest-package.ts b/packages/vite/src/migrations/update-22-2-0/migrate-vitest-to-vitest-package.ts index dd093452fde..48df4a15bc4 100644 --- a/packages/vite/src/migrations/update-22-2-0/migrate-vitest-to-vitest-package.ts +++ b/packages/vite/src/migrations/update-22-2-0/migrate-vitest-to-vitest-package.ts @@ -1,3 +1,4 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, formatFiles, @@ -9,7 +10,6 @@ import { updateNxJson, updateProjectConfiguration, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; import { nxVersion } from '../../utils/versions'; interface ViteTestExecutorOptions { diff --git a/packages/vite/src/plugins/plugin.ts b/packages/vite/src/plugins/plugin.ts index 8a816af60f6..2f05e4b5625 100644 --- a/packages/vite/src/plugins/plugin.ts +++ b/packages/vite/src/plugins/plugin.ts @@ -1,3 +1,7 @@ +import { + calculateHashesForCreateNodes, + getNamedInputs, +} from '@nx/devkit/internal'; import { CreateDependencies, CreateNodesContextV2, @@ -12,8 +16,6 @@ import { TargetConfiguration, writeJsonFile, } from '@nx/devkit'; -import { calculateHashesForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import { getLockFileName, getRootTsConfigFileName } from '@nx/js'; import { walkTsconfigExtendsChain, diff --git a/packages/vite/src/utils/e2e-web-server-info-utils.ts b/packages/vite/src/utils/e2e-web-server-info-utils.ts index 37f39f0127c..0b47a4a88ef 100644 --- a/packages/vite/src/utils/e2e-web-server-info-utils.ts +++ b/packages/vite/src/utils/e2e-web-server-info-utils.ts @@ -1,5 +1,5 @@ import { type Tree, readNxJson } from '@nx/devkit'; -import { getE2EWebServerInfo } from '@nx/devkit/src/generators/e2e-web-server-info-utils'; +import { getE2EWebServerInfo } from '@nx/devkit/internal'; export async function getViteE2EWebServerInfo( tree: Tree, diff --git a/packages/vite/src/utils/generator-utils.ts b/packages/vite/src/utils/generator-utils.ts index 9730e3bf1c3..338498d79d2 100644 --- a/packages/vite/src/utils/generator-utils.ts +++ b/packages/vite/src/utils/generator-utils.ts @@ -1,3 +1,4 @@ +import { addBuildTargetDefaults } from '@nx/devkit/internal'; import { joinPathFragments, logger, @@ -10,7 +11,6 @@ import { updateProjectConfiguration, writeJson, } from '@nx/devkit'; -import { addBuildTargetDefaults } from '@nx/devkit/src/generators/target-defaults-utils'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { ViteBuildExecutorOptions } from '../executors/build/schema'; import { VitePreviewServerExecutorOptions } from '../executors/preview-server/schema'; diff --git a/packages/vitest/src/generators/init/init.ts b/packages/vitest/src/generators/init/init.ts index d922693b7f1..044ca13f89e 100644 --- a/packages/vitest/src/generators/init/init.ts +++ b/packages/vitest/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin } from '@nx/devkit/internal'; import { type Tree, type GeneratorCallback, @@ -8,7 +9,6 @@ import { updateNxJson, createProjectGraphAsync, } from '@nx/devkit'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { InitGeneratorSchema } from './schema'; import { nxVersion, diff --git a/packages/vitest/src/migrations/update-22-6-0/prefix-reports-directory-with-project-root.ts b/packages/vitest/src/migrations/update-22-6-0/prefix-reports-directory-with-project-root.ts index a28fd086f21..34d46acc179 100644 --- a/packages/vitest/src/migrations/update-22-6-0/prefix-reports-directory-with-project-root.ts +++ b/packages/vitest/src/migrations/update-22-6-0/prefix-reports-directory-with-project-root.ts @@ -1,3 +1,4 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { readProjectConfiguration, type Tree, @@ -5,7 +6,6 @@ import { readNxJson, updateNxJson, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; import { isAbsolute } from 'path'; interface VitestExecutorOptions { diff --git a/packages/vitest/src/plugins/plugin.ts b/packages/vitest/src/plugins/plugin.ts index f28da0f4851..7601e6ecb1a 100644 --- a/packages/vitest/src/plugins/plugin.ts +++ b/packages/vitest/src/plugins/plugin.ts @@ -1,3 +1,7 @@ +import { + calculateHashesForCreateNodes, + getNamedInputs, +} from '@nx/devkit/internal'; import { CreateDependencies, CreateNodesContextV2, @@ -12,8 +16,6 @@ import { TargetConfiguration, writeJsonFile, } from '@nx/devkit'; -import { calculateHashesForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import { getLockFileName, getRootTsConfigFileName } from '@nx/js'; import { walkTsconfigExtendsChain, diff --git a/packages/vue/src/generators/application/application.ts b/packages/vue/src/generators/application/application.ts index ef249ea46bc..89ce2b48104 100644 --- a/packages/vue/src/generators/application/application.ts +++ b/packages/vue/src/generators/application/application.ts @@ -1,3 +1,4 @@ +import { logShowProjectCommand } from '@nx/devkit/internal'; import { addProjectConfiguration, formatFiles, @@ -20,7 +21,6 @@ import { addVite, addVitest } from './lib/add-vite'; import { addRsbuild } from './lib/add-rsbuild'; import { extractTsConfigBase } from '../../utils/create-ts-config'; import { ensureDependencies } from '../../utils/ensure-dependencies'; -import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-command'; import { addProjectToTsSolutionWorkspace, shouldConfigureTsSolutionSetup, diff --git a/packages/vue/src/generators/application/lib/add-e2e.ts b/packages/vue/src/generators/application/lib/add-e2e.ts index 77f3adaef28..78aca6dd177 100644 --- a/packages/vue/src/generators/application/lib/add-e2e.ts +++ b/packages/vue/src/generators/application/lib/add-e2e.ts @@ -1,4 +1,5 @@ import type { GeneratorCallback, Tree } from '@nx/devkit'; +import { E2EWebServerDetails } from '@nx/devkit/internal'; import { addProjectConfiguration, ensurePackage, @@ -11,7 +12,6 @@ import { webStaticServeGenerator } from '@nx/web'; import { nxVersion } from '../../../utils/versions'; import { hasRsbuildPlugin } from '../../../utils/has-rsbuild-plugin'; import { NormalizedSchema } from '../schema'; -import { E2EWebServerDetails } from '@nx/devkit/src/generators/e2e-web-server-info-utils'; import type { PackageJson } from 'nx/src/utils/package-json'; export async function addE2e( diff --git a/packages/vue/src/generators/application/lib/normalize-options.ts b/packages/vue/src/generators/application/lib/normalize-options.ts index da83bbfab46..f4969b0242b 100644 --- a/packages/vue/src/generators/application/lib/normalize-options.ts +++ b/packages/vue/src/generators/application/lib/normalize-options.ts @@ -2,7 +2,7 @@ import { Tree } from '@nx/devkit'; import { determineProjectNameAndRootOptions, ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; +} from '@nx/devkit/internal'; import { NormalizedSchema, Schema } from '../schema'; import { isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; diff --git a/packages/vue/src/generators/component/lib/utils.ts b/packages/vue/src/generators/component/lib/utils.ts index 5b8ec749209..c2333e73c3d 100644 --- a/packages/vue/src/generators/component/lib/utils.ts +++ b/packages/vue/src/generators/component/lib/utils.ts @@ -1,3 +1,4 @@ +import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/internal'; import { applyChangesToString, getProjects, @@ -8,7 +9,6 @@ import { } from '@nx/devkit'; import { parse, relative, dirname } from 'path'; import { ensureTypescript } from '@nx/js/src/utils/typescript/ensure-typescript'; -import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; import { NormalizedSchema, ComponentGeneratorSchema } from '../schema'; import { addImport } from '../../../utils/ast-utils'; diff --git a/packages/vue/src/generators/library/lib/normalize-options.ts b/packages/vue/src/generators/library/lib/normalize-options.ts index 68a66664cac..74ecc626271 100644 --- a/packages/vue/src/generators/library/lib/normalize-options.ts +++ b/packages/vue/src/generators/library/lib/normalize-options.ts @@ -1,3 +1,7 @@ +import { + determineProjectNameAndRootOptions, + ensureRootProjectName, +} from '@nx/devkit/internal'; import { getProjects, logger, @@ -5,10 +9,6 @@ import { readNxJson, Tree, } from '@nx/devkit'; -import { - determineProjectNameAndRootOptions, - ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; import { NormalizedSchema, Schema } from '../schema'; import { getProjectSourceRoot, diff --git a/packages/vue/src/generators/library/library.ts b/packages/vue/src/generators/library/library.ts index ce35c3342e4..0712058ccf4 100644 --- a/packages/vue/src/generators/library/library.ts +++ b/packages/vue/src/generators/library/library.ts @@ -1,3 +1,4 @@ +import { getRelativeCwd, logShowProjectCommand } from '@nx/devkit/internal'; import { addProjectConfiguration, formatFiles, @@ -12,8 +13,6 @@ import { updateProjectConfiguration, writeJson, } from '@nx/devkit'; -import { getRelativeCwd } from '@nx/devkit/src/generators/artifact-name-and-directory-utils'; -import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-command'; import { addTsConfigPath, initGenerator as jsInitGenerator } from '@nx/js'; import { addReleaseConfigForNonTsSolution, diff --git a/packages/web/src/generators/application/application.ts b/packages/web/src/generators/application/application.ts index 22431084282..a54fbe37df0 100644 --- a/packages/web/src/generators/application/application.ts +++ b/packages/web/src/generators/application/application.ts @@ -1,3 +1,10 @@ +import { + determineProjectNameAndRootOptions, + ensureRootProjectName, + addBuildTargetDefaults, + logShowProjectCommand, + E2EWebServerDetails, +} from '@nx/devkit/internal'; import { addDependenciesToPackageJson, addProjectConfiguration, @@ -19,10 +26,6 @@ import { updateProjectConfiguration, writeJson, } from '@nx/devkit'; -import { - determineProjectNameAndRootOptions, - ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; import { getRelativePathToRootTsConfig, initGenerator as jsInitGenerator, @@ -39,10 +42,7 @@ import { webInitGenerator } from '../init/init'; import { Schema } from './schema'; import { getNpmScope } from '@nx/js/src/utils/package-json/get-npm-scope'; import { hasWebpackPlugin } from '../../utils/has-webpack-plugin'; -import { addBuildTargetDefaults } from '@nx/devkit/src/generators/target-defaults-utils'; -import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-command'; import staticServeConfiguration from '../static-serve/static-serve-configuration'; -import { E2EWebServerDetails } from '@nx/devkit/src/generators/e2e-web-server-info-utils'; import { addProjectToTsSolutionWorkspace, isUsingTsSolutionSetup, diff --git a/packages/webpack/src/executors/dev-server/dev-server.impl.ts b/packages/webpack/src/executors/dev-server/dev-server.impl.ts index 64dd0c6e95d..45eca029c8a 100644 --- a/packages/webpack/src/executors/dev-server/dev-server.impl.ts +++ b/packages/webpack/src/executors/dev-server/dev-server.impl.ts @@ -1,3 +1,4 @@ +import { eachValueFrom } from '@nx/devkit/internal'; import webpack from 'webpack'; import { ExecutorContext, @@ -5,7 +6,6 @@ import { readTargetOptions, } from '@nx/devkit'; -import { eachValueFrom } from '@nx/devkit/src/utils/rxjs-for-await'; import { map, tap } from 'rxjs/operators'; import WebpackDevServer from 'webpack-dev-server'; diff --git a/packages/webpack/src/executors/ssr-dev-server/ssr-dev-server.impl.ts b/packages/webpack/src/executors/ssr-dev-server/ssr-dev-server.impl.ts index 2749f131fed..20b8f3f39bc 100644 --- a/packages/webpack/src/executors/ssr-dev-server/ssr-dev-server.impl.ts +++ b/packages/webpack/src/executors/ssr-dev-server/ssr-dev-server.impl.ts @@ -1,3 +1,4 @@ +import { combineAsyncIterables } from '@nx/devkit/internal'; import { ExecutorContext, parseTargetString, @@ -5,7 +6,6 @@ import { runExecutor, } from '@nx/devkit'; import * as pc from 'picocolors'; -import { combineAsyncIterables } from '@nx/devkit/src/utils/async-iterable'; import { WebpackExecutorOptions } from '../webpack/schema'; import { TargetOptions, WebSsrDevServerOptions } from './schema'; diff --git a/packages/webpack/src/executors/webpack/webpack.impl.ts b/packages/webpack/src/executors/webpack/webpack.impl.ts index 44e8cbb41c8..e958b10fe50 100644 --- a/packages/webpack/src/executors/webpack/webpack.impl.ts +++ b/packages/webpack/src/executors/webpack/webpack.impl.ts @@ -1,10 +1,10 @@ +import { eachValueFrom } from '@nx/devkit/internal'; import { ExecutorContext, logger, stripIndents, targetToTargetString, } from '@nx/devkit'; -import { eachValueFrom } from '@nx/devkit/src/utils/rxjs-for-await'; import { getRootTsConfigPath } from '@nx/js'; import { getProjectSourceRoot } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { resolve } from 'path'; diff --git a/packages/webpack/src/generators/configuration/configuration.ts b/packages/webpack/src/generators/configuration/configuration.ts index b72e2359403..1aa376fc487 100644 --- a/packages/webpack/src/generators/configuration/configuration.ts +++ b/packages/webpack/src/generators/configuration/configuration.ts @@ -1,3 +1,4 @@ +import { addBuildTargetDefaults } from '@nx/devkit/internal'; import { formatFiles, GeneratorCallback, @@ -15,7 +16,6 @@ import { webpackInitGenerator } from '../init/init'; import { ConfigurationGeneratorSchema } from './schema'; import { WebpackExecutorOptions } from '../../executors/webpack/schema'; import { hasPlugin } from '../../utils/has-plugin'; -import { addBuildTargetDefaults } from '@nx/devkit/src/generators/target-defaults-utils'; import { TS_SOLUTION_SETUP_TSCONFIG_INPUT } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { ensureDependencies } from '../../utils/ensure-dependencies'; diff --git a/packages/webpack/src/generators/convert-config-to-webpack-plugin/convert-config-to-webpack-plugin.ts b/packages/webpack/src/generators/convert-config-to-webpack-plugin/convert-config-to-webpack-plugin.ts index ff1f6680f74..6002c598ea6 100644 --- a/packages/webpack/src/generators/convert-config-to-webpack-plugin/convert-config-to-webpack-plugin.ts +++ b/packages/webpack/src/generators/convert-config-to-webpack-plugin/convert-config-to-webpack-plugin.ts @@ -1,3 +1,4 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { formatFiles, getProjects, @@ -7,7 +8,6 @@ import { updateProjectConfiguration, ProjectConfiguration, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; import { WebpackExecutorOptions } from '../../executors/webpack/schema'; import { extractWebpackOptions } from './lib/extract-webpack-options'; import { normalizePathOptions } from './lib/normalize-path-options'; diff --git a/packages/webpack/src/generators/convert-to-inferred/convert-to-inferred.ts b/packages/webpack/src/generators/convert-to-inferred/convert-to-inferred.ts index 29cce063f76..5777a79cb1b 100644 --- a/packages/webpack/src/generators/convert-to-inferred/convert-to-inferred.ts +++ b/packages/webpack/src/generators/convert-to-inferred/convert-to-inferred.ts @@ -1,3 +1,8 @@ +import { + AggregatedLog, + migrateProjectExecutorsToPlugin, + NoTargetsToMigrateError, +} from '@nx/devkit/internal'; import { addDependenciesToPackageJson, createProjectGraphAsync, @@ -6,11 +11,6 @@ import { type ProjectConfiguration, type Tree, } from '@nx/devkit'; -import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; -import { - migrateProjectExecutorsToPlugin, - NoTargetsToMigrateError, -} from '@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator'; import { ast, query } from '@phenomnomnominal/tsquery'; import * as ts from 'typescript'; import { createNodesV2, type WebpackPluginOptions } from '../../plugins/plugin'; diff --git a/packages/webpack/src/generators/convert-to-inferred/utils/build-post-target-transformer.ts b/packages/webpack/src/generators/convert-to-inferred/utils/build-post-target-transformer.ts index 104c7659c4d..14c9cbf6695 100644 --- a/packages/webpack/src/generators/convert-to-inferred/utils/build-post-target-transformer.ts +++ b/packages/webpack/src/generators/convert-to-inferred/utils/build-post-target-transformer.ts @@ -2,7 +2,7 @@ import type { TargetConfiguration, Tree } from '@nx/devkit'; import { processTargetOutputs, toProjectRelativePath, -} from '@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils'; +} from '@nx/devkit/internal'; import { ast, query } from '@phenomnomnominal/tsquery'; import * as ts from 'typescript'; import type { WebpackExecutorOptions } from '../../../executors/webpack/schema'; diff --git a/packages/webpack/src/generators/convert-to-inferred/utils/serve-post-target-transformer.ts b/packages/webpack/src/generators/convert-to-inferred/utils/serve-post-target-transformer.ts index d5c8e6a3e4d..fdb4b62723c 100644 --- a/packages/webpack/src/generators/convert-to-inferred/utils/serve-post-target-transformer.ts +++ b/packages/webpack/src/generators/convert-to-inferred/utils/serve-post-target-transformer.ts @@ -1,3 +1,7 @@ +import { + processTargetOutputs, + toProjectRelativePath, +} from '@nx/devkit/internal'; import { parseTargetString, readJson, @@ -7,10 +11,6 @@ import { type TargetConfiguration, type Tree, } from '@nx/devkit'; -import { - processTargetOutputs, - toProjectRelativePath, -} from '@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils'; import { ast, query } from '@phenomnomnominal/tsquery'; import { basename, resolve } from 'path'; import * as ts from 'typescript'; diff --git a/packages/webpack/src/generators/convert-to-inferred/utils/types.ts b/packages/webpack/src/generators/convert-to-inferred/utils/types.ts index 85b5c1646f0..2e7960b55d9 100644 --- a/packages/webpack/src/generators/convert-to-inferred/utils/types.ts +++ b/packages/webpack/src/generators/convert-to-inferred/utils/types.ts @@ -1,5 +1,5 @@ import type { ProjectGraph } from '@nx/devkit'; -import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util'; +import type { AggregatedLog } from '@nx/devkit/internal'; export type MigrationContext = { logger: AggregatedLog; diff --git a/packages/webpack/src/generators/init/init.ts b/packages/webpack/src/generators/init/init.ts index 7cccbc1f115..082b5da7454 100644 --- a/packages/webpack/src/generators/init/init.ts +++ b/packages/webpack/src/generators/init/init.ts @@ -1,3 +1,4 @@ +import { addPlugin } from '@nx/devkit/internal'; import { addDependenciesToPackageJson, createProjectGraphAsync, @@ -6,7 +7,6 @@ import { readNxJson, Tree, } from '@nx/devkit'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; import { createNodesV2 } from '../../plugins/plugin'; import { nxVersion, webpackCliVersion } from '../../utils/versions'; import { Schema } from './schema'; diff --git a/packages/webpack/src/migrations/update-21-0-0/remove-isolated-config.ts b/packages/webpack/src/migrations/update-21-0-0/remove-isolated-config.ts index 56ce104f5ad..18e3b8bd911 100644 --- a/packages/webpack/src/migrations/update-21-0-0/remove-isolated-config.ts +++ b/packages/webpack/src/migrations/update-21-0-0/remove-isolated-config.ts @@ -1,10 +1,10 @@ +import { forEachExecutorOptions } from '@nx/devkit/internal'; import { formatFiles, readProjectConfiguration, Tree, updateProjectConfiguration, } from '@nx/devkit'; -import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils'; import { WebpackExecutorOptions } from '../../executors/webpack/schema'; export default async function (tree: Tree) { diff --git a/packages/webpack/src/plugins/plugin.ts b/packages/webpack/src/plugins/plugin.ts index 60af0d22440..03ebf0f6abe 100644 --- a/packages/webpack/src/plugins/plugin.ts +++ b/packages/webpack/src/plugins/plugin.ts @@ -1,3 +1,7 @@ +import { + calculateHashForCreateNodes, + getNamedInputs, +} from '@nx/devkit/internal'; import { CreateDependencies, CreateNodesContextV2, @@ -13,8 +17,6 @@ import { workspaceRoot, writeJsonFile, } from '@nx/devkit'; -import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; -import { getNamedInputs } from '@nx/devkit/src/utils/get-named-inputs'; import { getLockFileName, getRootTsConfigPath } from '@nx/js'; import { isUsingTsSolutionSetup, diff --git a/packages/webpack/src/utils/e2e-web-server-info-utils.ts b/packages/webpack/src/utils/e2e-web-server-info-utils.ts index bd14479b889..12aa76c2cb7 100644 --- a/packages/webpack/src/utils/e2e-web-server-info-utils.ts +++ b/packages/webpack/src/utils/e2e-web-server-info-utils.ts @@ -1,5 +1,5 @@ import { type Tree, readNxJson } from '@nx/devkit'; -import { getE2EWebServerInfo } from '@nx/devkit/src/generators/e2e-web-server-info-utils'; +import { getE2EWebServerInfo } from '@nx/devkit/internal'; export async function getWebpackE2EWebServerInfo( tree: Tree, diff --git a/packages/webpack/src/utils/webpack/resolve-user-defined-webpack-config.ts b/packages/webpack/src/utils/webpack/resolve-user-defined-webpack-config.ts index 6696c43f2f2..64e2ffd0d56 100644 --- a/packages/webpack/src/utils/webpack/resolve-user-defined-webpack-config.ts +++ b/packages/webpack/src/utils/webpack/resolve-user-defined-webpack-config.ts @@ -1,5 +1,5 @@ +import { clearRequireCache } from '@nx/devkit/internal'; import { registerTsProject } from '@nx/js/src/internal'; -import { clearRequireCache } from '@nx/devkit/src/utils/config-utils'; export function resolveUserDefinedWebpackConfig( path: string, diff --git a/packages/workspace/src/generators/infer-targets/infer-targets.ts b/packages/workspace/src/generators/infer-targets/infer-targets.ts index d0300c02fd2..d4f5d7e6fe2 100644 --- a/packages/workspace/src/generators/infer-targets/infer-targets.ts +++ b/packages/workspace/src/generators/infer-targets/infer-targets.ts @@ -1,3 +1,4 @@ +import { NoTargetsToMigrateError } from '@nx/devkit/internal'; import { createProjectGraphAsync, formatFiles, @@ -8,7 +9,6 @@ import { Tree, workspaceRoot, } from '@nx/devkit'; -import { NoTargetsToMigrateError } from '@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator'; import { prompt } from 'enquirer'; import { GeneratorInformation, diff --git a/packages/workspace/src/generators/npm-package/npm-package.ts b/packages/workspace/src/generators/npm-package/npm-package.ts index 4c3a67b8135..d9823891e4f 100644 --- a/packages/workspace/src/generators/npm-package/npm-package.ts +++ b/packages/workspace/src/generators/npm-package/npm-package.ts @@ -1,3 +1,7 @@ +import { + determineProjectNameAndRootOptions, + ensureRootProjectName, +} from '@nx/devkit/internal'; import { addProjectConfiguration, formatFiles, @@ -5,10 +9,6 @@ import { Tree, writeJson, } from '@nx/devkit'; -import { - determineProjectNameAndRootOptions, - ensureRootProjectName, -} from '@nx/devkit/src/generators/project-name-and-root-utils'; import { join } from 'path'; export interface ProjectOptions { diff --git a/scripts/nx-release.ts b/scripts/nx-release.ts index 6f447d2c4f1..21a9c146fc5 100644 --- a/scripts/nx-release.ts +++ b/scripts/nx-release.ts @@ -499,7 +499,7 @@ function determineDistTag( function hackFixForDevkitPeerDependencies() { const { readFileSync, writeFileSync } = require('fs'); const devkitPackageJson = JSON.parse( - readFileSync('./dist/packages/devkit/package.json', 'utf-8') + readFileSync('./packages/devkit/package.json', 'utf-8') ); const beforeVersion = devkitPackageJson.peerDependencies['nx']; @@ -512,7 +512,7 @@ function hackFixForDevkitPeerDependencies() { majorVersion + 1 } || ^${majorVersion}.0.0-0`; writeFileSync( - './dist/packages/devkit/package.json', + './packages/devkit/package.json', JSON.stringify(devkitPackageJson, null, 2) ); } diff --git a/scripts/patched-jest-resolver.js b/scripts/patched-jest-resolver.js index d081c3905cd..ebb9216e96c 100644 --- a/scripts/patched-jest-resolver.js +++ b/scripts/patched-jest-resolver.js @@ -31,7 +31,7 @@ const isWorkspaceFile = (p) => { * - Without this resolver, Jest will fail to resolve these imports correctly */ const enhancedResolver = require('enhanced-resolve').create.sync({ - conditionNames: ['require', 'node', 'default'], + conditionNames: ['@nx/nx-source', 'require', 'node', 'default'], extensions: ['.js', '.json', '.node', '.ts', '.tsx'], });