@nx/expo 23.0.0-beta.12 → 23.0.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "23.0.0-beta.12",
+  "version": "23.0.0-beta.13",
   "private": false,
   "description": "The Expo Plugin for Nx contains executors and generators for managing and developing an expo application within your workspace. For example, you can directly build for different target platforms as well as generate projects and publish your code.",
   "keywords": [
@@ -29,10 +29,10 @@
   "type": "commonjs",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.12",
-    "@nx/eslint": "23.0.0-beta.12",
-    "@nx/js": "23.0.0-beta.12",
-    "@nx/react": "23.0.0-beta.12",
+    "@nx/devkit": "23.0.0-beta.13",
+    "@nx/eslint": "23.0.0-beta.13",
+    "@nx/js": "23.0.0-beta.13",
+    "@nx/react": "23.0.0-beta.13",
     "enhanced-resolve": "^5.8.3",
     "picocolors": "^1.1.0",
     "semver": "^7.6.3",
@@ -44,11 +44,11 @@
     "metro-resolver": ">= 0.82.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.12"
+    "nx": "23.0.0-beta.13"
   },
   "optionalDependencies": {
-    "@nx/detox": "23.0.0-beta.12",
-    "@nx/rollup": "23.0.0-beta.12"
+    "@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");
@@ -120,7 +120,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/plugins/plugin.js

@@ -8,7 +8,7 @@ const js_1 = require("@nx/js");
 const fs_1 = require("fs");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const devkit_internals_1 = require("nx/src/devkit-internals");
-const util_1 = require("@nx/js/src/plugins/typescript/util");
+const internal_2 = require("@nx/js/internal");
 exports.createNodes = [
     '**/app.{json,config.js,config.ts}',
     async (configFiles, options, context) => {
@@ -100,7 +100,7 @@ function buildExpoTargets(projectRoot, options, context, pmc) {
             options: { cwd: projectRoot },
         },
     };
-    (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
+    (0, internal_2.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
     return targets;
 }
 function getAppConfig(configFilePath, context) {

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

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/expo/src/generators/application/application.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,iBAAiB,EAGjB,IAAI,EACL,MAAM,YAAY,CAAC;AAiBpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAKlC,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAM5B;AAED,wBAAsB,gCAAgC,CACpD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAmF5B;AAED,eAAe,wBAAwB,CAAC"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/expo/src/generators/application/application.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,iBAAiB,EAGjB,IAAI,EACL,MAAM,YAAY,CAAC;AAiBpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAM5B;AAED,wBAAsB,gCAAgC,CACpD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAmF5B;AAED,eAAe,wBAAwB,CAAC"}

package/src/generators/application/application.js

@@ -6,7 +6,7 @@ const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const add_linting_1 = require("../../utils/add-linting");
 const add_jest_1 = require("../../utils/jest/add-jest");
 const normalize_options_1 = require("./lib/normalize-options");
@@ -17,7 +17,6 @@ const add_eas_scripts_1 = require("./lib/add-eas-scripts");
 const add_e2e_1 = require("./lib/add-e2e");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const init_root_babel_config_1 = require("../../utils/init-root-babel-config");
-const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function expoApplicationGenerator(host, schema) {
     return await expoApplicationGeneratorInternal(host, {
         addPlugin: false,
@@ -27,7 +26,7 @@ async function expoApplicationGenerator(host, schema) {
 }
 async function expoApplicationGeneratorInternal(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,
@@ -48,7 +47,7 @@ async function expoApplicationGeneratorInternal(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,
@@ -63,7 +62,7 @@ async function expoApplicationGeneratorInternal(host, schema) {
     const e2eTask = await (0, add_e2e_1.addE2e)(host, options);
     tasks.push(e2eTask);
     (0, add_eas_scripts_1.addEasScripts)(host);
-    (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',
@@ -71,7 +70,7 @@ async function expoApplicationGeneratorInternal(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/add-e2e.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/expo/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,iBAAiB,EAGjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,wBAAsB,MAAM,CAC1B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAiJ5B"}
+{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/expo/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,iBAAiB,EAGjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,wBAAsB,MAAM,CAC1B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAiJ5B"}

package/src/generators/application/lib/add-e2e.js

@@ -122,9 +122,9 @@ async function addE2e(tree, options) {
 async function getExpoE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     let e2ePort = isPluginBeingAdded ? 8081 : 4200;
-    if (nxJson.targetDefaults?.['serve'] &&
-        nxJson.targetDefaults?.['serve'].options?.port) {
-        e2ePort = nxJson.targetDefaults?.['serve'].options?.port;
+    const serveTargetOptions = (0, internal_1.readTargetDefaultsForTarget)('serve', nxJson.targetDefaults)?.options;
+    if (serveTargetOptions?.port) {
+        e2ePort = serveTargetOptions.port;
     }
     return (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
         plugin: '@nx/expo/plugin',

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, {
@@ -20,7 +20,7 @@ async function normalizeOptions(host, options) {
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     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 useProjectJson = options.useProjectJson ?? !isTsSolutionSetup;
     const e2eProjectName = rootProject ? 'e2e' : `${appProjectName}-e2e`;

package/src/generators/component/component.js

@@ -7,7 +7,7 @@ const devkit_1 = require("@nx/devkit");
 const normalize_options_1 = require("./lib/normalize-options");
 const add_import_1 = require("./lib/add-import");
 const path_1 = require("path");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 async function expoComponentGenerator(host, schema) {
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     createComponentFiles(host, options);
@@ -28,7 +28,7 @@ function createComponentFiles(host, options) {
 function addExportsToBarrel(host, options) {
     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/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, fileName, fileExtension, fileExtensionType, filePath, directory, project: projectName, } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(host, {
         name: options.name,
@@ -15,7 +15,7 @@ async function normalizeOptions(host, options) {
     const project = (0, devkit_1.getProjects)(host).get(projectName);
     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 useProjectJson = options.useProjectJson ?? !isUsingTsSolutionConfig;
     const normalized = {
         ...options,

package/src/generators/library/library.js

@@ -12,8 +12,7 @@ const add_jest_1 = require("../../utils/jest/add-jest");
 const normalize_options_1 = require("./lib/normalize-options");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const init_root_babel_config_1 = require("../../utils/init-root-babel-config");
-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 component_1 = require("../component/component");
 const path_1 = require("path");
@@ -27,7 +26,7 @@ async function expoLibraryGenerator(host, schema) {
 }
 async function expoLibraryGeneratorInternal(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,
@@ -39,7 +38,7 @@ async function expoLibraryGeneratorInternal(host, schema) {
         throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
     }
     if (options.isUsingTsSolutionConfig) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
+        await (0, internal_2.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
     }
     const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
     tasks.push(initTask);
@@ -74,7 +73,7 @@ async function expoLibraryGeneratorInternal(host, schema) {
             (0, devkit_1.joinPathFragments)(options.projectRoot, options.js ? './src/index.js' : './src/index.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',
@@ -86,7 +85,7 @@ async function expoLibraryGeneratorInternal(host, schema) {
         const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.projectRoot, options.js, options.skipPackageJson, options.addPlugin);
         tasks.push(jestTask);
     }
-    (0, sort_fields_1.sortPackageJsonFields)(host, options.projectRoot);
+    (0, internal_2.sortPackageJsonFields)(host, options.projectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }