@nx/expo 0.0.0-pr-11-e92ae29 → 0.0.0-pr-29464-ce29f31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "0.0.0-pr-11-e92ae29",
+  "version": "0.0.0-pr-29464-ce29f31",
   "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": [
@@ -28,13 +28,13 @@
   "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "0.0.0-pr-11-e92ae29",
-    "@nx/eslint": "0.0.0-pr-11-e92ae29",
-    "@nx/jest": "0.0.0-pr-11-e92ae29",
-    "@nx/js": "0.0.0-pr-11-e92ae29",
-    "@nx/react": "0.0.0-pr-11-e92ae29",
-    "@nx/web": "0.0.0-pr-11-e92ae29",
-    "@nx/webpack": "0.0.0-pr-11-e92ae29",
+    "@nx/devkit": "0.0.0-pr-29464-ce29f31",
+    "@nx/eslint": "0.0.0-pr-29464-ce29f31",
+    "@nx/jest": "0.0.0-pr-29464-ce29f31",
+    "@nx/js": "0.0.0-pr-29464-ce29f31",
+    "@nx/react": "0.0.0-pr-29464-ce29f31",
+    "@nx/web": "0.0.0-pr-29464-ce29f31",
+    "@nx/webpack": "0.0.0-pr-29464-ce29f31",
     "enhanced-resolve": "^5.8.3",
     "metro-config": "~0.80.4",
     "metro-resolver": "~0.80.4",

package/src/generators/application/application.js

@@ -42,6 +42,11 @@ async function expoApplicationGeneratorInternal(host, schema) {
     (0, init_root_babel_config_1.initRootBabelConfig)(host);
     await (0, create_application_files_1.createApplicationFiles)(host, options);
     (0, add_project_1.addProject)(host, options);
+    // 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) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
+    }
     const lintTask = await (0, add_linting_1.addLinting)(host, {
         ...options,
         projectRoot: options.appProjectRoot,
@@ -63,11 +68,6 @@ async function expoApplicationGeneratorInternal(host, schema) {
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined);
-    // 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.useTsSolution) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
-    }
     (0, sort_fields_1.sortPackageJsonFields)(host, options.appProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);

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

@@ -27,8 +27,6 @@ async function addE2e(tree, options) {
                     version: '0.0.1',
                     private: true,
                     nx: {
-                        projectType: 'application',
-                        sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
                         implicitDependencies: [options.projectName],
                     },
                 });
@@ -84,8 +82,6 @@ async function addE2e(tree, options) {
                     version: '0.0.1',
                     private: true,
                     nx: {
-                        projectType: 'application',
-                        sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
                         implicitDependencies: [options.projectName],
                     },
                 });
@@ -135,7 +131,7 @@ async function addE2e(tree, options) {
                 e2eDirectory: options.e2eProjectRoot,
                 appProject: options.projectName,
                 appDisplayName: options.displayName,
-                appName: options.name,
+                appName: options.simpleName,
                 framework: 'expo',
                 setParserOptionsProject: options.setParserOptionsProject,
                 skipFormat: true,

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

@@ -5,9 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const has_expo_plugin_1 = require("../../../utils/has-expo-plugin");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 function addProject(host, options) {
-    const nxJson = (0, devkit_1.readNxJson)(host);
     const hasPlugin = (0, has_expo_plugin_1.hasExpoPlugin)(host);
     if (!hasPlugin) {
         (0, target_defaults_utils_1.addBuildTargetDefaults)(host, '@nx/expo:build');
@@ -20,19 +18,23 @@ function addProject(host, options) {
         tags: options.parsedTags,
     };
     if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
-        const packageName = (0, get_import_path_1.getImportPath)(host, options.name);
-        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
-            name: packageName,
+        const packageJson = {
+            name: options.importPath,
             version: '0.0.1',
             private: true,
-            nx: {
-                name: packageName === options.name ? undefined : options.name,
-                projectType: 'application',
-                sourceRoot: `${options.appProjectRoot}/src`,
-                targets: hasPlugin ? undefined : getTargets(options),
-                tags: options.parsedTags?.length ? options.parsedTags : undefined,
-            },
-        });
+        };
+        if (options.importPath !== options.projectName) {
+            packageJson.nx = { name: options.projectName };
+        }
+        if (!hasPlugin) {
+            packageJson.nx ??= {};
+            packageJson.nx.targets = getTargets(options);
+        }
+        if (options.parsedTags?.length) {
+            packageJson.nx ??= {};
+            packageJson.nx.tags = options.parsedTags;
+        }
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
     }
     else {
         (0, devkit_1.addProjectConfiguration)(host, options.projectName, projectConfiguration, options.standaloneConfig);

package/src/generators/application/lib/normalize-options.d.ts

@@ -1,9 +1,11 @@
 import { Tree } from '@nx/devkit';
 import { Schema } from '../schema';
-export interface NormalizedSchema extends Schema {
+export interface NormalizedSchema extends Omit<Schema, 'name' | 'useTsSolution'> {
     className: string;
+    simpleName: string;
     projectName: string;
     appProjectRoot: string;
+    importPath: string;
     lowerCaseName: string;
     parsedTags: string[];
     rootProject: boolean;

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

@@ -5,8 +5,8 @@ const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
-    const { projectName: appProjectName, names: projectNames, projectRoot: appProjectRoot, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
+    const { projectName, names: projectNames, projectRoot: appProjectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
@@ -15,27 +15,30 @@ async function normalizeOptions(host, options) {
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
-    const { className } = (0, devkit_1.names)(options.name);
+    const { className } = (0, devkit_1.names)(projectName);
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const rootProject = appProjectRoot === '.';
+    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const appProjectName = !isTsSolutionSetup || options.name ? projectName : importPath;
     const e2eProjectName = rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
     return {
         ...options,
         unitTestRunner: options.unitTestRunner || 'jest',
         e2eTestRunner: options.e2eTestRunner || 'none',
-        name: projectNames.projectSimpleName,
+        simpleName: projectNames.projectSimpleName,
         className,
         lowerCaseName: className.toLowerCase(),
         displayName: options.displayName || className,
         projectName: appProjectName,
         appProjectRoot,
+        importPath,
         parsedTags,
         rootProject,
         e2eProjectName,
         e2eProjectRoot,
-        isTsSolutionSetup: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
+        isTsSolutionSetup,
     };
 }

package/src/generators/component/component.js

@@ -29,7 +29,9 @@ function addExportsToBarrel(host, options) {
     const proj = workspace.get(options.projectName);
     const isApp = (0, ts_solution_setup_1.getProjectType)(host, proj.root, proj.projectType) === 'application';
     if (options.export && !isApp) {
-        const indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.fileExtensionType === 'js' ? 'index.js' : 'index.ts');
+        const indexFilePath = (0, devkit_1.joinPathFragments)(...(options.projectSourceRoot
+            ? [options.projectSourceRoot]
+            : [options.projectRoot, 'src']), options.fileExtensionType === 'js' ? 'index.js' : 'index.ts');
         if (!host.exists(indexFilePath)) {
             return;
         }

package/src/generators/component/lib/normalize-options.d.ts

@@ -10,5 +10,6 @@ export interface NormalizedSchema extends Omit<Schema, 'js'> {
     className: string;
     filePath: string;
     projectName: string;
+    projectRoot: string;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -31,5 +31,6 @@ async function normalizeOptions(host, options) {
         filePath,
         projectSourceRoot,
         projectName,
+        projectRoot: root,
     };
 }

package/src/generators/library/lib/normalize-options.d.ts

@@ -5,9 +5,9 @@ export interface NormalizedSchema extends Schema {
     fileName: string;
     projectName: string;
     projectRoot: string;
+    importPath: string;
     routePath: string;
     parsedTags: string[];
-    appMain: string;
     isUsingTsSolutionConfig: boolean;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -4,9 +4,8 @@ exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
@@ -20,20 +19,16 @@ async function normalizeOptions(host, options) {
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
-    const appMain = options.js ? 'src/index.js' : 'src/index.ts';
     const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     const normalized = {
         ...options,
         fileName: projectName,
         routePath: `/${projectNames.projectSimpleName}`,
         name: projectName,
-        projectName: isUsingTsSolutionConfig
-            ? (0, get_import_path_1.getImportPath)(host, projectName)
-            : projectName,
+        projectName: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
         projectRoot,
         parsedTags,
         importPath,
-        appMain,
         isUsingTsSolutionConfig,
     };
     return normalized;

package/src/generators/library/library.js

@@ -7,14 +7,17 @@ const js_1 = require("@nx/js");
 const init_1 = require("../init/init");
 const add_linting_1 = require("../../utils/add-linting");
 const add_jest_1 = require("../../utils/add-jest");
-const versions_1 = require("../../utils/versions");
 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 target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 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 add_rollup_build_target_1 = require("@nx/react/src/generators/library/lib/add-rollup-build-target");
+const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+const component_1 = require("../component/component");
+const path_1 = require("path");
+const versions_1 = require("../../utils/versions");
 async function expoLibraryGenerator(host, schema) {
     return await expoLibraryGeneratorInternal(host, {
         addPlugin: false,
@@ -56,12 +59,19 @@ async function expoLibraryGeneratorInternal(host, schema) {
     tasks.push(lintTask);
     const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.projectRoot, options.js, options.skipPackageJson, options.addPlugin);
     tasks.push(jestTask);
-    if (options.publishable || options.buildable) {
-        updateLibPackageNpmScope(host, options);
-    }
+    const relativeCwd = (0, artifact_name_and_directory_utils_1.getRelativeCwd)();
+    const path = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/lib', options.fileName);
+    const componentTask = await (0, component_1.expoComponentGenerator)(host, {
+        path: relativeCwd ? (0, path_1.relative)(relativeCwd, path) : path,
+        skipTests: options.unitTestRunner === 'none',
+        export: true,
+        skipFormat: true,
+        js: options.js,
+    });
+    tasks.push(() => componentTask);
     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, 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', {
@@ -93,71 +103,54 @@ async function addProject(host, options) {
         targets: {},
     };
     if (options.isUsingTsSolutionConfig) {
-        const sourceEntry = !options.buildable
-            ? options.js
-                ? './src/index.js'
-                : './src/index.ts'
-            : undefined;
-        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
+        const packageJson = {
             name: options.projectName,
             version: '0.0.1',
-            main: sourceEntry,
-            types: sourceEntry,
-            // For buildable libraries, the entries are configured by the bundler (i.e. Rollup).
-            exports: options.buildable
-                ? undefined
-                : {
-                    './package.json': './package.json',
-                    '.': options.js
-                        ? './src/index.js'
-                        : {
-                            types: './src/index.ts',
-                            import: './src/index.ts',
-                            default: './src/index.ts',
-                        },
-                },
-            nx: options.parsedTags?.length
-                ? {
-                    tags: options.parsedTags,
-                }
-                : undefined,
-        });
+            ...determineEntryFields(options),
+            files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
+            peerDependencies: {
+                react: versions_1.reactVersion,
+                'react-native': versions_1.reactNativeVersion,
+            },
+        };
+        if (options.projectName !== options.importPath) {
+            packageJson.nx = { name: options.projectName };
+        }
+        if (options.parsedTags?.length) {
+            packageJson.nx ??= {};
+            packageJson.nx.tags = options.parsedTags;
+        }
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), packageJson);
     }
     else {
         (0, devkit_1.addProjectConfiguration)(host, options.name, project);
     }
-    if (!options.publishable && !options.buildable) {
-        return () => { };
+    if (options.publishable || options.buildable) {
+        const external = new Set([
+            'react/jsx-runtime',
+            'react-native',
+            'react',
+            'react-dom',
+        ]);
+        const rollupTask = await (0, add_rollup_build_target_1.addRollupBuildTarget)(host, {
+            ...options,
+            name: options.projectName,
+            format: ['cjs', 'esm'],
+            style: 'none',
+            js: options.js,
+            skipFormat: true,
+        }, external);
+        (0, devkit_1.updateJson)(host, `${options.projectRoot}/package.json`, (json) => {
+            json.peerDependencies = {
+                ...json.peerDependencies,
+                react: versions_1.reactVersion,
+                'react-native': versions_1.reactNativeVersion,
+            };
+            return json;
+        });
+        return rollupTask;
     }
-    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
-    const rollupConfigTask = await configurationGenerator(host, {
-        ...options,
-        project: options.projectName,
-        skipFormat: true,
-    });
-    const external = ['react/jsx-runtime', 'react-native', 'react', 'react-dom'];
-    (0, target_defaults_utils_1.addBuildTargetDefaults)(host, '@nx/rollup:rollup');
-    project.targets.build = {
-        executor: '@nx/rollup:rollup',
-        outputs: ['{options.outputPath}'],
-        options: {
-            outputPath: `dist/${options.projectRoot}`,
-            tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
-            project: `${options.projectRoot}/package.json`,
-            entryFile: maybeJs(options, `${options.projectRoot}/src/index.ts`),
-            external,
-            rollupConfig: `@nx/react/plugins/bundle-rollup`,
-            assets: [
-                {
-                    glob: `${options.projectRoot}/README.md`,
-                    input: '.',
-                    output: '.',
-                },
-            ],
-        },
-    };
-    (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
-    return rollupConfigTask;
+    return () => { };
 }
 function updateTsConfig(tree, options) {
     (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json'), (json) => {
@@ -181,29 +174,25 @@ function createFiles(host, options) {
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
         rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot),
     });
-    if (!options.publishable &&
-        !options.buildable &&
-        !options.isUsingTsSolutionConfig) {
-        host.delete(`${options.projectRoot}/package.json`);
-    }
     if (options.js) {
         (0, devkit_1.toJS)(host);
     }
     updateTsConfig(host, options);
 }
-function updateLibPackageNpmScope(host, options) {
-    return (0, devkit_1.updateJson)(host, `${options.projectRoot}/package.json`, (json) => {
-        json.name = options.importPath;
-        json.peerDependencies = {
-            react: versions_1.reactVersion,
-            'react-native': versions_1.reactNativeVersion,
-        };
-        return json;
-    });
-}
-function maybeJs(options, path) {
-    return options.js && (path.endsWith('.ts') || path.endsWith('.tsx'))
-        ? path.replace(/\.tsx?$/, '.js')
-        : path;
+function determineEntryFields(options) {
+    return {
+        main: options.js ? './src/index.js' : './src/index.ts',
+        types: options.js ? './src/index.js' : './src/index.ts',
+        exports: {
+            '.': options.js
+                ? './src/index.js'
+                : {
+                    types: './src/index.ts',
+                    import: './src/index.ts',
+                    default: './src/index.ts',
+                },
+            './package.json': './package.json',
+        },
+    };
 }
 exports.default = expoLibraryGenerator;

package/src/generators/library/files/lib/package.json.template

@@ -1,5 +0,0 @@
-{
-  "name": "<%= projectName %>",
-  "version": "0.0.1",
-  "main": "<%= appMain %>"
-}