@nx/expo 17.3.0-beta.1 → 17.3.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "17.3.0-beta.1",
+  "version": "17.3.0-beta.2",
   "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.1",
-    "@nx/devkit": "17.3.0-beta.1",
-    "@nx/jest": "17.3.0-beta.1",
-    "@nx/js": "17.3.0-beta.1",
-    "@nx/eslint": "17.3.0-beta.1",
-    "@nx/react": "17.3.0-beta.1",
-    "@nx/webpack": "17.3.0-beta.1",
-    "@nrwl/expo": "17.3.0-beta.1"
+    "@nx/detox": "17.3.0-beta.2",
+    "@nx/devkit": "17.3.0-beta.2",
+    "@nx/jest": "17.3.0-beta.2",
+    "@nx/js": "17.3.0-beta.2",
+    "@nx/eslint": "17.3.0-beta.2",
+    "@nx/react": "17.3.0-beta.2",
+    "@nx/webpack": "17.3.0-beta.2",
+    "@nrwl/expo": "17.3.0-beta.2"
   },
   "peerDependencies": {
     "expo": ">= 49.0.0",

package/plugin.d.ts

@@ -0,0 +1 @@
+export { createNodes, ExpoPluginOptions } from './plugins/plugin';

package/plugin.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createNodes = void 0;
+var plugin_1 = require("./plugins/plugin");
+Object.defineProperty(exports, "createNodes", { enumerable: true, get: function () { return plugin_1.createNodes; } });

package/plugins/plugin.d.ts

@@ -0,0 +1,14 @@
+import { CreateDependencies, CreateNodes } from '@nx/devkit';
+export interface ExpoPluginOptions {
+    startTargetName?: string;
+    runIosTargetName?: string;
+    runAndroidTargetName?: string;
+    exportTargetName?: string;
+    exportWebTargetName?: string;
+    prebuildTargetName?: string;
+    installTargetName?: string;
+    buildTargetName?: string;
+    submitTargetName?: string;
+}
+export declare const createDependencies: CreateDependencies;
+export declare const createNodes: CreateNodes<ExpoPluginOptions>;

package/plugins/plugin.js

@@ -0,0 +1,160 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createNodes = exports.createDependencies = void 0;
+const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
+const js_1 = require("@nx/js");
+const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
+const fs_1 = require("fs");
+const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
+const cache_directory_1 = require("nx/src/utils/cache-directory");
+const cachePath = (0, path_1.join)(cache_directory_1.projectGraphCacheDirectory, 'expo.hash');
+const targetsCache = (0, fs_1.existsSync)(cachePath) ? readTargetsCache() : {};
+const calculatedTargets = {};
+function readTargetsCache() {
+    return (0, devkit_1.readJsonFile)(cachePath);
+}
+function writeTargetsToCache(targets) {
+    (0, devkit_1.writeJsonFile)(cachePath, targets);
+}
+const createDependencies = () => {
+    writeTargetsToCache(calculatedTargets);
+    return [];
+};
+exports.createDependencies = createDependencies;
+exports.createNodes = [
+    '**/app.{json,config.js}',
+    (configFilePath, options, context) => {
+        options = normalizeOptions(options);
+        const projectRoot = (0, path_1.dirname)(configFilePath);
+        // Do not create a project if package.json or project.json or metro.config.js isn't there.
+        const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
+        if (!siblingFiles.includes('package.json') ||
+            !siblingFiles.includes('project.json') ||
+            !siblingFiles.includes('metro.config.js')) {
+            return {};
+        }
+        const appConfig = getAppConfig(configFilePath, context);
+        // if appConfig.expo is not defined
+        if (!appConfig.expo) {
+            return {};
+        }
+        const hash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [
+            (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot)),
+        ]);
+        const targets = targetsCache[hash]
+            ? targetsCache[hash]
+            : buildExpoTargets(projectRoot, options, context);
+        calculatedTargets[hash] = targets;
+        return {
+            projects: {
+                [projectRoot]: {
+                    targets,
+                },
+            },
+        };
+    },
+];
+function buildExpoTargets(projectRoot, options, context) {
+    const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
+    const targets = {
+        [options.startTargetName]: {
+            command: `expo start`,
+            options: { cwd: projectRoot },
+        },
+        [options.runIosTargetName]: {
+            command: `expo run:ios`,
+            options: { cwd: projectRoot },
+        },
+        [options.runAndroidTargetName]: {
+            command: `expo run:android`,
+            options: { cwd: projectRoot },
+        },
+        [options.exportTargetName]: {
+            command: `expo export`,
+            options: { cwd: projectRoot },
+            cache: true,
+            dependsOn: [`^${options.exportTargetName}`],
+            inputs: getInputs(namedInputs),
+            outputs: [getOutputs(projectRoot, 'dist')],
+        },
+        [options.exportWebTargetName]: {
+            command: `expo export:web`,
+            options: { cwd: projectRoot },
+            cache: true,
+            dependsOn: [`^${options.exportWebTargetName}`],
+            inputs: getInputs(namedInputs),
+            outputs: [getOutputs(projectRoot, 'web-build')],
+        },
+        [options.installTargetName]: {
+            command: `expo install`,
+            options: { cwd: devkit_1.workspaceRoot }, // install at workspace root
+        },
+        [options.prebuildTargetName]: {
+            command: `expo prebuild`,
+            options: { cwd: projectRoot },
+        },
+        [options.buildTargetName]: {
+            command: `eas build`,
+            options: { cwd: projectRoot },
+            dependsOn: [`^${options.buildTargetName}`],
+            inputs: getInputs(namedInputs),
+        },
+        [options.submitTargetName]: {
+            command: `eas submit`,
+            options: { cwd: projectRoot },
+            dependsOn: [`^${options.submitTargetName}`],
+            inputs: getInputs(namedInputs),
+        },
+    };
+    return targets;
+}
+function getAppConfig(configFilePath, context) {
+    const resolvedPath = (0, path_1.join)(context.workspaceRoot, configFilePath);
+    let module = load(resolvedPath);
+    return module.default ?? module;
+}
+function getInputs(namedInputs) {
+    return [
+        ...('production' in namedInputs
+            ? ['default', '^production']
+            : ['default', '^default']),
+        {
+            externalDependencies: ['react-native'],
+        },
+    ];
+}
+function getOutputs(projectRoot, dir) {
+    if (projectRoot === '.') {
+        return `{projectRoot}/${dir}`;
+    }
+    else {
+        return `{workspaceRoot}/${projectRoot}/${dir}`;
+    }
+}
+/**
+ * Load the module after ensuring that the require cache is cleared.
+ */
+function load(path) {
+    // Clear cache if the path is in the cache
+    if (require.cache[path]) {
+        for (const k of Object.keys(require.cache)) {
+            delete require.cache[k];
+        }
+    }
+    // Then require
+    return require(path);
+}
+function normalizeOptions(options) {
+    options ??= {};
+    options.startTargetName ??= 'start';
+    options.runIosTargetName ??= 'run-ios';
+    options.runAndroidTargetName ??= 'run-android';
+    options.exportTargetName ??= 'export';
+    options.exportWebTargetName ??= 'export-web';
+    options.prebuildTargetName ??= 'prebuild';
+    options.installTargetName ??= 'install';
+    options.buildTargetName ??= 'build';
+    options.submitTargetName ??= 'submit';
+    return options;
+}

package/src/generators/application/application.js

@@ -20,9 +20,9 @@ async function expoApplicationGenerator(host, schema) {
 exports.expoApplicationGenerator = expoApplicationGenerator;
 async function expoApplicationGeneratorInternal(host, schema) {
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
     (0, create_application_files_1.createApplicationFiles)(host, options);
     (0, add_project_1.addProject)(host, options);
-    const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
     const lintTask = await (0, add_linting_1.addLinting)(host, {
         ...options,
         projectRoot: options.appProjectRoot,

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

@@ -3,11 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = void 0;
 const devkit_1 = require("@nx/devkit");
 function addProject(host, options) {
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
+        ? p === '@nx/expo/plugin'
+        : p.plugin === '@nx/expo/plugin');
     const projectConfiguration = {
         root: options.appProjectRoot,
         sourceRoot: `${options.appProjectRoot}/src`,
         projectType: 'application',
-        targets: { ...getTargets(options) },
+        targets: hasPlugin ? {} : getTargets(options),
         tags: options.parsedTags,
     };
     (0, devkit_1.addProjectConfiguration)(host, options.projectName, projectConfiguration, options.standaloneConfig);

package/src/generators/init/init.js

@@ -31,6 +31,9 @@ async function expoInitGenerator(host, schema) {
         });
         tasks.push(detoxTask);
     }
+    if (process.env.NX_PCV3 === 'true') {
+        addPlugin(host);
+    }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
@@ -67,4 +70,30 @@ exports.updateDependencies = updateDependencies;
 function moveDependency(host) {
     return (0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/react-native'], []);
 }
+function addPlugin(host) {
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    nxJson.plugins ??= [];
+    for (const plugin of nxJson.plugins) {
+        if (typeof plugin === 'string'
+            ? plugin === '@nx/expo/plugin'
+            : plugin.plugin === '@nx/expo/plugin') {
+            return;
+        }
+    }
+    nxJson.plugins.push({
+        plugin: '@nx/expo/plugin',
+        options: {
+            startTargetName: 'start',
+            runIosTargetName: 'run-ios',
+            runAndroidTargetName: 'run-android',
+            exportTargetName: 'export',
+            exportWebTargetName: 'export-web',
+            prebuildTargetName: 'prebuild',
+            installTargetName: 'install',
+            buildTargetName: 'build',
+            submitTargetName: 'submit',
+        },
+    });
+    (0, devkit_1.updateNxJson)(host, nxJson);
+}
 exports.default = expoInitGenerator;