@nx/expo 23.0.0-beta.18 → 23.0.0-beta.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "23.0.0-beta.18",
+  "version": "23.0.0-beta.19",
   "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.18",
-    "@nx/eslint": "23.0.0-beta.18",
-    "@nx/js": "23.0.0-beta.18",
-    "@nx/react": "23.0.0-beta.18",
+    "@nx/devkit": "23.0.0-beta.19",
+    "@nx/eslint": "23.0.0-beta.19",
+    "@nx/js": "23.0.0-beta.19",
+    "@nx/react": "23.0.0-beta.19",
     "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.18"
+    "nx": "23.0.0-beta.19"
   },
   "optionalDependencies": {
-    "@nx/detox": "23.0.0-beta.18",
-    "@nx/rollup": "23.0.0-beta.18"
+    "@nx/detox": "23.0.0-beta.19",
+    "@nx/rollup": "23.0.0-beta.19"
   },
   "executors": "./executors.json",
   "ng-update": {

package/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../packages/expo/plugins/plugin.ts"],"names":[],"mappings":"AAMA,OAAO,EAIL,aAAa,EAMd,MAAM,YAAY,CAAC;AAQpB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAID,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,iBAAiB,CA6BxD,CAAC;AAEF,eAAO,MAAM,aAAa,kCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../packages/expo/plugins/plugin.ts"],"names":[],"mappings":"AAMA,OAAO,EAML,aAAa,EAMd,MAAM,YAAY,CAAC;AAQpB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAID,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,iBAAiB,CA2DxD,CAAC;AAEF,eAAO,MAAM,aAAa,kCAAc,CAAC"}

package/plugins/plugin.js

@@ -18,8 +18,29 @@ exports.createNodes = [
         const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
         const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
         const lockFileName = (0, js_1.getLockFileName)(packageManager);
+        const normalizedOptions = normalizeOptions(options);
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, pmc, lockFileName), configFiles, options, context);
+            const { entries, preErrors } = await filterExpoConfigs(configFiles, context);
+            const projectHashes = await (0, internal_1.calculateHashesForCreateNodes)(entries.map((e) => e.projectRoot), normalizedOptions, context, entries.map(() => [lockFileName]));
+            let results = [];
+            let nodeErrors = [];
+            try {
+                results = await (0, devkit_1.createNodesFromFiles)((configFile, _, ctx, idx) => createNodesInternal(configFile, normalizedOptions, ctx, targetsCache, pmc, projectHashes[idx]), entries.map((e) => e.configFile), options, context);
+            }
+            catch (e) {
+                if (e instanceof devkit_1.AggregateCreateNodesError) {
+                    results = e.partialResults ?? [];
+                    nodeErrors = e.errors;
+                }
+                else {
+                    throw e;
+                }
+            }
+            const allErrors = [...preErrors, ...nodeErrors];
+            if (allErrors.length > 0) {
+                throw new devkit_1.AggregateCreateNodesError(allErrors, results);
+            }
+            return results;
         }
         finally {
             targetsCache.writeToDisk();
@@ -27,24 +48,8 @@ exports.createNodes = [
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFile, options, context, targetsCache, pmc, lockFileName) {
-    options = normalizeOptions(options);
+async function createNodesInternal(configFile, options, context, targetsCache, pmc, hash) {
     const projectRoot = (0, path_1.dirname)(configFile);
-    // 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('metro.config.js')) {
-        return {};
-    }
-    // Check if it's an Expo project
-    const packageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(context.workspaceRoot, projectRoot, 'package.json'));
-    const appConfig = await getAppConfig(configFile, context);
-    if (!appConfig.expo &&
-        !packageJson.dependencies?.['expo'] &&
-        !packageJson.devDependencies?.['expo']) {
-        return {};
-    }
-    const hash = await (0, internal_1.calculateHashForCreateNodes)(projectRoot, options, context, [lockFileName]);
     if (!targetsCache.has(hash)) {
         targetsCache.set(hash, buildExpoTargets(projectRoot, options, context, pmc));
     }
@@ -107,6 +112,35 @@ function getAppConfig(configFilePath, context) {
     const resolvedPath = (0, path_1.join)(context.workspaceRoot, configFilePath);
     return (0, internal_1.loadConfigFile)(resolvedPath);
 }
+async function filterExpoConfigs(configFiles, context) {
+    const preErrors = [];
+    const candidates = await Promise.all(configFiles.map(async (configFile) => {
+        try {
+            const projectRoot = (0, path_1.dirname)(configFile);
+            const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
+            if (!siblingFiles.includes('package.json') ||
+                !siblingFiles.includes('metro.config.js')) {
+                return null;
+            }
+            const packageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(context.workspaceRoot, projectRoot, 'package.json'));
+            const appConfig = await getAppConfig(configFile, context);
+            if (!appConfig.expo &&
+                !packageJson.dependencies?.['expo'] &&
+                !packageJson.devDependencies?.['expo']) {
+                return null;
+            }
+            return { configFile, projectRoot };
+        }
+        catch (e) {
+            preErrors.push([configFile, e]);
+            return null;
+        }
+    }));
+    return {
+        entries: candidates.filter((c) => c !== null),
+        preErrors,
+    };
+}
 function getInputs(namedInputs) {
     return [
         ...('production' in namedInputs