@nx/expo 17.3.0-beta.3 → 17.3.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "17.3.0-beta.3",
+  "version": "17.3.0-beta.4",
   "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": [
@@ -34,14 +34,14 @@
     "tslib": "^2.3.0",
     "tsconfig-paths": "^4.1.2",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
-    "@nx/detox": "17.3.0-beta.3",
-    "@nx/devkit": "17.3.0-beta.3",
-    "@nx/jest": "17.3.0-beta.3",
-    "@nx/js": "17.3.0-beta.3",
-    "@nx/eslint": "17.3.0-beta.3",
-    "@nx/react": "17.3.0-beta.3",
-    "@nx/webpack": "17.3.0-beta.3",
-    "@nrwl/expo": "17.3.0-beta.3"
+    "@nx/detox": "17.3.0-beta.4",
+    "@nx/devkit": "17.3.0-beta.4",
+    "@nx/jest": "17.3.0-beta.4",
+    "@nx/js": "17.3.0-beta.4",
+    "@nx/eslint": "17.3.0-beta.4",
+    "@nx/react": "17.3.0-beta.4",
+    "@nx/webpack": "17.3.0-beta.4",
+    "@nrwl/expo": "17.3.0-beta.4"
   },
   "peerDependencies": {
     "expo": ">= 49.0.0",

package/src/generators/application/application.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expoApplicationGeneratorInternal = exports.expoApplicationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
 const symlink_task_1 = require("../../utils/symlink-task");
 const add_linting_1 = require("../../utils/add-linting");
 const add_jest_1 = require("../../utils/add-jest");
@@ -11,6 +12,8 @@ const add_project_1 = require("./lib/add-project");
 const create_application_files_1 = require("./lib/create-application-files");
 const add_eas_scripts_1 = require("./lib/add-eas-scripts");
 const add_detox_1 = require("./lib/add-detox");
+const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
+const init_root_babel_config_1 = require("../../utils/init-root-babel-config");
 async function expoApplicationGenerator(host, schema) {
     return await expoApplicationGeneratorInternal(host, {
         projectNameAndRootFormat: 'derived',
@@ -20,7 +23,18 @@ async function expoApplicationGenerator(host, schema) {
 exports.expoApplicationGenerator = expoApplicationGenerator;
 async function expoApplicationGeneratorInternal(host, schema) {
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    const tasks = [];
+    const jsInitTask = await (0, js_1.initGenerator)(host, {
+        ...schema,
+        skipFormat: true,
+    });
+    tasks.push(jsInitTask);
     const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
+    tasks.push(initTask);
+    if (!options.skipPackageJson) {
+        tasks.push((0, ensure_dependencies_1.ensureDependencies)(host));
+    }
+    (0, init_root_babel_config_1.initRootBabelConfig)(host);
     (0, create_application_files_1.createApplicationFiles)(host, options);
     (0, add_project_1.addProject)(host, options);
     const lintTask = await (0, add_linting_1.addLinting)(host, {
@@ -30,14 +44,18 @@ async function expoApplicationGeneratorInternal(host, schema) {
             (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
         ],
     });
+    tasks.push(lintTask);
     const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.appProjectRoot, options.js, options.skipPackageJson);
+    tasks.push(jestTask);
     const detoxTask = await (0, add_detox_1.addDetox)(host, options);
+    tasks.push(detoxTask);
     const symlinkTask = (0, symlink_task_1.runSymlink)(host.root, options.appProjectRoot);
+    tasks.push(symlinkTask);
     (0, add_eas_scripts_1.addEasScripts)(host);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
-    return (0, devkit_1.runTasksInSerial)(initTask, lintTask, jestTask, detoxTask, symlinkTask);
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.expoApplicationGeneratorInternal = expoApplicationGeneratorInternal;
 exports.default = expoApplicationGenerator;

package/src/generators/init/init.js

@@ -3,37 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateDependencies = exports.expoInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
-const jest_1 = require("@nx/jest");
-const detox_1 = require("@nx/detox");
-const js_1 = require("@nx/js");
 const add_git_ignore_entry_1 = require("./lib/add-git-ignore-entry");
-const init_root_babel_config_1 = require("./lib/init-root-babel-config");
 async function expoInitGenerator(host, schema) {
     (0, add_git_ignore_entry_1.addGitIgnoreEntry)(host);
-    (0, init_root_babel_config_1.initRootBabelConfig)(host);
+    if (process.env.NX_PCV3 === 'true') {
+        addPlugin(host);
+    }
     const tasks = [];
-    tasks.push(await (0, js_1.initGenerator)(host, {
-        ...schema,
-        skipFormat: true,
-    }));
     if (!schema.skipPackageJson) {
         tasks.push(moveDependency(host));
         tasks.push(updateDependencies(host));
     }
-    if (!schema.unitTestRunner || schema.unitTestRunner === 'jest') {
-        const jestTask = await (0, jest_1.jestInitGenerator)(host, schema);
-        tasks.push(jestTask);
-    }
-    if (!schema.e2eTestRunner || schema.e2eTestRunner === 'detox') {
-        const detoxTask = await (0, detox_1.detoxInitGenerator)(host, {
-            ...schema,
-            skipFormat: true,
-        });
-        tasks.push(detoxTask);
-    }
-    if (process.env.NX_PCV3 === 'true') {
-        addPlugin(host);
-    }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
@@ -46,24 +26,10 @@ function updateDependencies(host) {
         'react-dom': versions_1.reactDomVersion,
         'react-native': versions_1.reactNativeVersion,
         expo: versions_1.expoVersion,
-        'expo-splash-screen': versions_1.expoSplashScreenVersion,
-        'expo-status-bar': versions_1.expoStatusBarVersion,
-        'react-native-web': versions_1.reactNativeWebVersion,
-        '@expo/metro-config': versions_1.expoMetroConfigVersion,
-        'react-native-svg-transformer': versions_1.reactNativeSvgTransformerVersion,
-        'react-native-svg': versions_1.reactNativeSvgVersion,
     }, {
         '@nx/expo': versions_1.nxVersion,
-        '@types/react': versions_1.typesReactVersion,
-        metro: versions_1.metroVersion,
-        'metro-resolver': versions_1.metroVersion,
-        'react-test-renderer': versions_1.reactTestRendererVersion,
-        '@testing-library/react-native': versions_1.testingLibraryReactNativeVersion,
-        '@testing-library/jest-native': versions_1.testingLibraryJestNativeVersion,
-        'jest-expo': versions_1.jestExpoVersion,
         '@expo/cli': versions_1.expoCliVersion,
         'eas-cli': versions_1.easCliVersion,
-        'babel-preset-expo': versions_1.babelPresetExpoVersion,
     });
 }
 exports.updateDependencies = updateDependencies;

package/src/generators/init/schema.d.ts

@@ -1,7 +1,4 @@
 export interface Schema {
-  unitTestRunner?: 'jest' | 'none';
   skipFormat?: boolean;
-  e2eTestRunner?: 'detox' | 'none';
   skipPackageJson?: boolean; // default is false
-  js?: boolean;
 }

package/src/generators/init/schema.json

@@ -5,33 +5,16 @@
   "description": "Add Nx Expo Schematics.",
   "type": "object",
   "properties": {
-    "unitTestRunner": {
-      "description": "Adds the specified unit test runner",
-      "type": "string",
-      "enum": ["jest", "none"],
-      "default": "jest"
-    },
     "skipFormat": {
       "description": "Skip formatting files",
       "type": "boolean",
       "default": false,
       "x-priority": "internal"
     },
-    "e2eTestRunner": {
-      "description": "Adds the specified e2e test runner",
-      "type": "string",
-      "enum": ["detox", "none"],
-      "default": "detox"
-    },
     "skipPackageJson": {
       "type": "boolean",
       "default": false,
       "description": "Do not add dependencies to `package.json`."
-    },
-    "js": {
-      "type": "boolean",
-      "default": false,
-      "description": "Use JavaScript instead of TypeScript"
     }
   },
   "required": []

package/src/generators/library/library.js

@@ -8,6 +8,8 @@ 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");
 async function expoLibraryGenerator(host, schema) {
     return await expoLibraryGeneratorInternal(host, {
         projectNameAndRootFormat: 'derived',
@@ -21,12 +23,17 @@ 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)`);
     }
     const tasks = [];
-    const initTask = await (0, init_1.default)(host, {
-        ...options,
+    const jsInitTask = await (0, js_1.initGenerator)(host, {
+        ...schema,
         skipFormat: true,
-        e2eTestRunner: 'none',
     });
+    tasks.push(jsInitTask);
+    const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
     tasks.push(initTask);
+    if (!options.skipPackageJson) {
+        tasks.push((0, ensure_dependencies_1.ensureDependencies)(host));
+    }
+    (0, init_root_babel_config_1.initRootBabelConfig)(host);
     const addProjectTask = await addProject(host, options);
     if (addProjectTask) {
         tasks.push(addProjectTask);
@@ -57,45 +64,45 @@ async function expoLibraryGeneratorInternal(host, schema) {
 }
 exports.expoLibraryGeneratorInternal = expoLibraryGeneratorInternal;
 async function addProject(host, options) {
-    const targets = {};
-    let task;
-    if (options.publishable || options.buildable) {
-        const { rollupInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
-        const external = [
-            'react/jsx-runtime',
-            'react-native',
-            'react',
-            'react-dom',
-        ];
-        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: '.',
-                    },
-                ],
-            },
-        };
-        task = await rollupInitGenerator(host, { ...options, skipFormat: true });
-    }
-    (0, devkit_1.addProjectConfiguration)(host, options.name, {
+    const project = {
         root: options.projectRoot,
         sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
         projectType: 'library',
         tags: options.parsedTags,
-        targets,
+        targets: {},
+    };
+    (0, devkit_1.addProjectConfiguration)(host, options.name, project);
+    if (!options.publishable && !options.buildable) {
+        return () => { };
+    }
+    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
+    const rollupConfigTask = await configurationGenerator(host, {
+        ...options,
+        project: options.name,
+        skipFormat: true,
     });
-    return task;
+    const external = ['react/jsx-runtime', 'react-native', 'react', 'react-dom'];
+    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.name, project);
+    return rollupConfigTask;
 }
 function updateTsConfig(tree, options) {
     (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json'), (json) => {

package/src/utils/ensure-dependencies.d.ts

@@ -0,0 +1,2 @@
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+export declare function ensureDependencies(host: Tree): GeneratorCallback;

package/src/utils/ensure-dependencies.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureDependencies = void 0;
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("./versions");
+function ensureDependencies(host) {
+    return (0, devkit_1.addDependenciesToPackageJson)(host, {
+        'expo-splash-screen': versions_1.expoSplashScreenVersion,
+        'expo-status-bar': versions_1.expoStatusBarVersion,
+        'react-native-web': versions_1.reactNativeWebVersion,
+        '@expo/metro-config': versions_1.expoMetroConfigVersion,
+        'react-native-svg-transformer': versions_1.reactNativeSvgTransformerVersion,
+        'react-native-svg': versions_1.reactNativeSvgVersion,
+    }, {
+        '@types/react': versions_1.typesReactVersion,
+        metro: versions_1.metroVersion,
+        'metro-resolver': versions_1.metroVersion,
+        'react-test-renderer': versions_1.reactTestRendererVersion,
+        '@testing-library/react-native': versions_1.testingLibraryReactNativeVersion,
+        '@testing-library/jest-native': versions_1.testingLibraryJestNativeVersion,
+        'jest-expo': versions_1.jestExpoVersion,
+        'babel-preset-expo': versions_1.babelPresetExpoVersion,
+    });
+}
+exports.ensureDependencies = ensureDependencies;