@nx/react-native 23.0.0-beta.11 → 23.0.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "23.0.0-beta.11",
+  "version": "23.0.0-beta.13",
   "private": false,
   "description": "The Nx Plugin for React Native contains generators for managing React Native applications and libraries within an Nx workspace. It provides: \n\n-Integration with libraries such as Jest, Detox, and Storybook.\n-Scaffolding for creating buildable libraries that can be published to npm.\n-Utilities for automatic workspace refactoring.",
   "keywords": [
@@ -27,10 +27,10 @@
   "type": "commonjs",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.11",
-    "@nx/js": "23.0.0-beta.11",
-    "@nx/eslint": "23.0.0-beta.11",
-    "@nx/react": "23.0.0-beta.11",
+    "@nx/devkit": "23.0.0-beta.13",
+    "@nx/js": "23.0.0-beta.13",
+    "@nx/eslint": "23.0.0-beta.13",
+    "@nx/react": "23.0.0-beta.13",
     "ajv": "^8.0.0",
     "enhanced-resolve": "^5.8.3",
     "ignore": "^7.0.5",
@@ -44,11 +44,11 @@
     "metro-resolver": ">= 0.82.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.11"
+    "nx": "23.0.0-beta.13"
   },
   "optionalDependencies": {
-    "@nx/detox": "23.0.0-beta.11",
-    "@nx/rollup": "23.0.0-beta.11"
+    "@nx/detox": "23.0.0-beta.13",
+    "@nx/rollup": "23.0.0-beta.13"
   },
   "executors": "./executors.json",
   "ng-update": {

package/plugins/metro-resolver.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getResolveRequest = getResolveRequest;
 const tslib_1 = require("tslib");
 const tsconfig_paths_1 = require("tsconfig-paths");
-const ts_config_1 = require("@nx/js/src/utils/typescript/ts-config");
+const js_1 = require("@nx/js");
 const pc = tslib_1.__importStar(require("picocolors"));
 const enhanced_resolve_1 = require("enhanced-resolve");
 const path_1 = require("path");
@@ -115,7 +115,7 @@ function getMatcher(debug) {
     if (!matcher) {
         const result = (0, tsconfig_paths_1.loadConfig)();
         if (result.resultType === 'success') {
-            absoluteBaseUrl = (0, ts_config_1.resolvePathsBaseUrl)(result.configFileAbsolutePath);
+            absoluteBaseUrl = (0, js_1.resolvePathsBaseUrl)(result.configFileAbsolutePath);
             paths = result.paths;
             if (debug) {
                 console.log(pc.cyan(`[Nx] Located tsconfig at ${pc.bold(absoluteBaseUrl)}`));

package/src/generators/application/application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/application/application.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,iBAAiB,EAKjB,IAAI,EACL,MAAM,YAAY,CAAC;AAcpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAWlC,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAM5B;AAED,wBAAsB,uCAAuC,CAC3D,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAkG5B;AA4CD,eAAe,+BAA+B,CAAC"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/application/application.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,iBAAiB,EAKjB,IAAI,EACL,MAAM,YAAY,CAAC;AAcpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAUlC,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAM5B;AAED,wBAAsB,uCAAuC,CAC3D,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAkG5B;AA4CD,eAAe,+BAA+B,CAAC"}

package/src/generators/application/application.js

@@ -18,8 +18,7 @@ const create_application_files_1 = require("./lib/create-application-files");
 const add_e2e_1 = require("./lib/add-e2e");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const sync_deps_impl_1 = require("../../executors/sync-deps/sync-deps.impl");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
+const internal_2 = require("@nx/js/internal");
 async function reactNativeApplicationGenerator(host, schema) {
     return await reactNativeApplicationGeneratorInternal(host, {
         addPlugin: false,
@@ -29,7 +28,7 @@ async function reactNativeApplicationGenerator(host, schema) {
 }
 async function reactNativeApplicationGeneratorInternal(host, schema) {
     const tasks = [];
-    const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(host, schema.addPlugin, schema.useTsSolution);
+    const addTsPlugin = (0, internal_2.shouldConfigureTsSolutionSetup)(host, schema.addPlugin, schema.useTsSolution);
     const jsInitTask = await (0, js_1.initGenerator)(host, {
         ...schema,
         skipFormat: true,
@@ -49,7 +48,7 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
     // If we are using the new TS solution
     // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
     if (options.isTsSolutionSetup) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
+        await (0, internal_2.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
     }
     const lintTask = await (0, add_linting_1.addLinting)(host, {
         ...options,
@@ -73,7 +72,7 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
     tasks.push(chmodTaskGradlewTask);
     tasks.push(addSyncDepsTask(host, options));
     tasks.push(addPodInstallTask(host, options));
-    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.appProjectRoot, 'tsconfig.app.json', {
+    (0, internal_2.updateTsconfigFiles)(host, options.appProjectRoot, 'tsconfig.app.json', {
         jsx: 'react-jsx',
         module: 'esnext',
         moduleResolution: 'bundler',
@@ -82,7 +81,7 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined);
-    (0, sort_fields_1.sortPackageJsonFields)(host, options.appProjectRoot);
+    (0, internal_2.sortPackageJsonFields)(host, options.appProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/src/generators/application/lib/normalize-options.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 async function normalizeOptions(host, options) {
     await (0, internal_1.ensureRootProjectName)(options, 'application');
     const { projectName, names: projectNames, projectRoot: appProjectRoot, importPath, } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
@@ -19,7 +19,7 @@ async function normalizeOptions(host, options) {
     const iosProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'ios');
     const androidProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'android');
     const rootProject = appProjectRoot === '.';
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(host);
     const appProjectName = !isTsSolutionSetup || options.name ? projectName : importPath;
     const e2eProjectName = rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = rootProject ? 'e2e' : `${appProjectRoot}-e2e`;

package/src/generators/component/component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/component/component.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AAOpB,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,iBAUf;AAwED,eAAe,6BAA6B,CAAC"}
+{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/component/component.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AAKpB,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,iBAUf;AAwED,eAAe,6BAA6B,CAAC"}

package/src/generators/component/component.js

@@ -4,9 +4,8 @@ exports.reactNativeComponentGenerator = reactNativeComponentGenerator;
 const devkit_1 = require("@nx/devkit");
 const normalize_options_1 = require("./lib/normalize-options");
 const add_import_1 = require("./lib/add-import");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function reactNativeComponentGenerator(host, schema) {
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     createComponentFiles(host, options);
@@ -27,11 +26,11 @@ function createComponentFiles(host, options) {
 let tsModule;
 function addExportsToBarrel(host, options) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const workspace = (0, devkit_1.getProjects)(host);
     const proj = workspace.get(options.projectName);
-    const isApp = (0, ts_solution_setup_1.getProjectType)(host, proj.root, proj.projectType) === 'application';
+    const isApp = (0, internal_1.getProjectType)(host, proj.root, proj.projectType) === 'application';
     if (options.export && !isApp) {
         const indexFilePath = (0, devkit_1.joinPathFragments)(...(options.projectSourceRoot
             ? [options.projectSourceRoot]

package/src/generators/component/lib/add-import.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addImport = addImport;
 const js_1 = require("@nx/js");
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 let tsModule;
 function addImport(source, statement) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const allImports = (0, js_1.findNodes)(source, tsModule.SyntaxKind.ImportDeclaration);
     if (allImports.length > 0) {

package/src/generators/component/lib/normalize-options.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 async function normalizeOptions(host, options) {
     const { artifactName: name, directory, fileName, filePath, fileExtension, fileExtensionType, project: projectName, } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(host, {
         path: options.path,
@@ -15,7 +15,7 @@ async function normalizeOptions(host, options) {
     const { className } = (0, devkit_1.names)(name);
     const { root, sourceRoot: projectSourceRoot, projectType } = project;
     if (options.export &&
-        (0, ts_solution_setup_1.getProjectType)(host, root, projectType) === 'application') {
+        (0, internal_2.getProjectType)(host, root, projectType) === 'application') {
         devkit_1.logger.warn(`The "--export" option should not be used with applications and will do nothing.`);
     }
     options.classComponent = options.classComponent ?? false;

package/src/generators/library/lib/normalize-options.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 async function normalizeOptions(host, options) {
     await (0, internal_1.ensureRootProjectName)(options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
@@ -19,7 +19,7 @@ async function normalizeOptions(host, options) {
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(host);
     const normalized = {
         ...options,
         fileName: projectName,

package/src/generators/library/library.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/library/library.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,iBAAiB,EASjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAYpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAkBlC,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAM5B;AAED,wBAAsB,mCAAmC,CACvD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAkH5B;AAyKD,eAAe,2BAA2B,CAAC"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/library/library.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,iBAAiB,EASjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAYpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAelC,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAM5B;AAED,wBAAsB,mCAAmC,CACvD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAkH5B;AAyKD,eAAe,2BAA2B,CAAC"}

package/src/generators/library/library.js

@@ -12,12 +12,10 @@ const add_jest_1 = require("../../utils/add-jest");
 const component_1 = tslib_1.__importDefault(require("../component/component"));
 const normalize_options_1 = require("./lib/normalize-options");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
+const internal_2 = require("@nx/js/internal");
 const add_rollup_build_target_1 = require("@nx/react/src/generators/library/lib/add-rollup-build-target");
 const path_1 = require("path");
 const versions_1 = require("../../utils/versions");
-const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
 async function reactNativeLibraryGenerator(host, schema) {
     return await reactNativeLibraryGeneratorInternal(host, {
         addPlugin: false,
@@ -27,7 +25,7 @@ async function reactNativeLibraryGenerator(host, schema) {
 }
 async function reactNativeLibraryGeneratorInternal(host, schema) {
     const tasks = [];
-    const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(host, schema.addPlugin);
+    const addTsPlugin = (0, internal_2.shouldConfigureTsSolutionSetup)(host, schema.addPlugin);
     const jsInitTask = await (0, js_1.initGenerator)(host, {
         ...schema,
         addTsPlugin,
@@ -45,7 +43,7 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
     }
     createFiles(host, options);
     if (options.isUsingTsSolutionConfig) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
+        await (0, internal_2.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
     }
     const addProjectTask = await addProject(host, options);
     if (addProjectTask) {
@@ -71,21 +69,21 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
     });
     tasks.push(() => componentTask);
     if (options.publishable) {
-        tasks.push(await (0, add_release_config_1.releaseTasks)(host));
+        tasks.push(await (0, internal_2.releaseTasks)(host));
     }
     if (!options.skipTsConfig && !options.isUsingTsSolutionConfig) {
         (0, js_1.addTsConfigPath)(host, options.importPath, [
             (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
         ]);
     }
-    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.projectRoot, 'tsconfig.lib.json', {
+    (0, internal_2.updateTsconfigFiles)(host, options.projectRoot, 'tsconfig.lib.json', {
         jsx: 'react-jsx',
         module: 'esnext',
         moduleResolution: 'bundler',
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined);
-    (0, sort_fields_1.sortPackageJsonFields)(host, options.projectRoot);
+    (0, internal_2.sortPackageJsonFields)(host, options.projectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
@@ -133,7 +131,7 @@ async function addProject(host, options) {
     else {
         if (options.publishable) {
             const nxJson = (0, devkit_1.readJson)(host, 'nx.json');
-            await (0, add_release_config_1.addReleaseConfigForNonTsSolution)(host, options.name, project);
+            await (0, internal_2.addReleaseConfigForNonTsSolution)(host, options.name, project);
         }
         (0, devkit_1.addProjectConfiguration)(host, options.name, project);
     }
@@ -143,7 +141,7 @@ async function addProject(host, options) {
         options.buildable) {
         (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), packageJson);
         if (options.publishable) {
-            await (0, add_release_config_1.addReleaseConfigForTsSolution)(host, options.name, project);
+            await (0, internal_2.addReleaseConfigForTsSolution)(host, options.name, project);
             (0, devkit_1.updateProjectConfiguration)(host, options.name, project);
         }
     }