@nrwl/expo 13.9.0 → 14.0.0

package/.eslintrc.json

@@ -1,5 +1,7 @@
 {
   "extends": "../../.eslintrc",
-  "rules": {},
+  "rules": {
+    "@typescript-eslint/no-empty-function": "off"
+  },
   "ignorePatterns": ["!**/*"]
 }

package/generators.json

@@ -56,6 +56,11 @@
       "schema": "./src/generators/component/schema.json",
       "description": "Create a component",
       "aliases": ["c"]
+    },
+    "preset": {
+      "factory": "./src/generators/preset/preset",
+      "schema": "./src/generators/preset/schema.json",
+      "description": "Create Expo preset"
     }
   }
 }

package/migrations.json

@@ -9,6 +9,20 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "14.0.0": {
+      "version": "14.0.0-beta.0",
+      "packages": {
+        "expo-cli": {
+          "version": "5.4.0",
+          "alwaysAddToPackageJson": false
+        },
+        "babel-preset-expo": {
+          "version": "~9.0.2",
+          "alwaysAddToPackageJson": false,
+          "addToPackageJson": "devDependencies"
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/expo",
-  "version": "13.9.0",
+  "version": "14.0.0",
   "description": "Expo Plugin for Nx",
   "keywords": [
     "Monorepo",
@@ -33,7 +33,7 @@
     "@nrwl/workspace": "*",
     "chalk": "4.1.0",
     "enhanced-resolve": "^5.8.3",
-    "expo-cli": "^5.2.0",
+    "expo-cli": "^5.4.0",
     "metro-resolver": "^0.66.2",
     "tsconfig-paths": "^3.9.0"
   },

package/plugins/metro-resolver.js

@@ -5,11 +5,10 @@ const tslib_1 = require("tslib");
 const metroResolver = require("metro-resolver");
 const tsconfig_paths_1 = require("tsconfig-paths");
 const chalk = require("chalk");
-const devkit_1 = require("@nrwl/devkit");
 const enhanced_resolve_1 = require("enhanced-resolve");
 const path_1 = require("path");
 const fs = require("fs");
-const app_root_1 = require("@nrwl/tao/src/utils/app-root");
+const devkit_1 = require("@nrwl/devkit");
 /*
  * Use tsconfig to resolve additional workspace libs.
  *
@@ -22,17 +21,13 @@ function getResolveRequest(extensions) {
         if (DEBUG)
             console.log(chalk.cyan(`[Nx] Resolving: ${moduleName}`));
         const { resolveRequest } = _context, context = (0, tslib_1.__rest)(_context, ["resolveRequest"]);
-        let resolvedPath = defaultMetroResolver(context, moduleName, platform);
+        const resolvedPath = defaultMetroResolver(context, moduleName, platform) ||
+            tsconfigPathsResolver(context, extensions, realModuleName, moduleName, platform) ||
+            pnpmResolver(extensions, context, realModuleName, moduleName);
         if (resolvedPath) {
             return resolvedPath;
         }
-        if ((0, devkit_1.detectPackageManager)(app_root_1.appRootPath) === 'pnpm') {
-            resolvedPath = pnpmResolver(extensions, context, realModuleName, moduleName);
-            if (resolvedPath) {
-                return resolvedPath;
-            }
-        }
-        return tsconfigPathsResolver(context, extensions, realModuleName, moduleName, platform);
+        throw new Error(`Cannot resolve ${chalk.bold(moduleName)}`);
     };
 }
 exports.getResolveRequest = getResolveRequest;
@@ -58,9 +53,9 @@ function defaultMetroResolver(context, moduleName, platform) {
 function pnpmResolver(extensions, context, realModuleName, moduleName) {
     const DEBUG = process.env.NX_REACT_NATIVE_DEBUG === 'true';
     try {
-        const pnpmResolver = getPnpmResolver(app_root_1.appRootPath, extensions);
+        const pnpmResolve = getPnpmResolver(extensions);
         const lookupStartPath = (0, path_1.dirname)(context.originModulePath);
-        const filePath = pnpmResolver.resolveSync({}, lookupStartPath, realModuleName);
+        const filePath = pnpmResolve.resolveSync({}, lookupStartPath, realModuleName);
         if (filePath) {
             return { type: 'sourceFile', filePath };
         }
@@ -93,7 +88,6 @@ function tsconfigPathsResolver(context, extensions, realModuleName, moduleName,
             console.log(chalk.red(`[Nx] Failed to resolve ${chalk.bold(moduleName)}`));
             console.log(chalk.cyan(`[Nx] The following tsconfig paths was used:\n:${chalk.bold(JSON.stringify(paths, null, 2))}`));
         }
-        throw new Error(`Cannot resolve ${chalk.bold(moduleName)}`);
     }
 }
 let matcher;
@@ -124,14 +118,14 @@ function getMatcher() {
  * It is inspired form https://github.com/vjpr/pnpm-expo-example/blob/main/packages/pnpm-expo-helper/util/make-resolver.js.
  */
 let resolver;
-function getPnpmResolver(appRootPath, extensions) {
+function getPnpmResolver(extensions) {
     if (!resolver) {
         const fileSystem = new enhanced_resolve_1.CachedInputFileSystem(fs, 4000);
         resolver = enhanced_resolve_1.ResolverFactory.createResolver({
             fileSystem,
             extensions: extensions.map((extension) => '.' + extension),
             useSyncFileSystemCalls: true,
-            modules: [(0, path_1.join)(appRootPath, 'node_modules'), 'node_modules'],
+            modules: [(0, path_1.join)(devkit_1.workspaceRoot, 'node_modules'), 'node_modules'],
         });
     }
     return resolver;

package/plugins/metro-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"metro-resolver.js","sourceRoot":"","sources":["../../../../packages/expo/plugins/metro-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"metro-resolver.js","sourceRoot":"","sources":["../../../../packages/expo/plugins/metro-resolver.ts"],"names":[],"mappings":"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"}

package/plugins/with-nx-metro.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withNxMetro = void 0;
-const file_utils_1 = require("@nrwl/workspace/src/core/file-utils");
-const app_root_1 = require("@nrwl/workspace/src/utils/app-root");
+const devkit_1 = require("@nrwl/devkit");
 const path_1 = require("path");
 const metro_resolver_1 = require("./metro-resolver");
 function withNxMetro(config, opts = {}) {
@@ -11,12 +10,11 @@ function withNxMetro(config, opts = {}) {
         process.env.NX_REACT_NATIVE_DEBUG = 'true';
     if (opts.extensions)
         extensions.push(...opts.extensions);
-    // Set the root to workspace root so we can resolve modules and assets
-    config.projectRoot = app_root_1.appRootPath;
+    config.projectRoot = __dirname;
     const watchFolders = config.watchFolders || [];
     config.watchFolders = watchFolders.concat([
-        (0, path_1.join)(app_root_1.appRootPath, 'node_modules'),
-        (0, path_1.join)(app_root_1.appRootPath, (0, file_utils_1.workspaceLayout)().libsDir),
+        (0, path_1.join)(devkit_1.workspaceRoot, 'node_modules'),
+        (0, path_1.join)(devkit_1.workspaceRoot, (0, devkit_1.workspaceLayout)().libsDir),
     ]);
     // Add support for paths specified by tsconfig
     config.resolver = Object.assign(Object.assign({}, config.resolver), { resolveRequest: (0, metro_resolver_1.getResolveRequest)(extensions) });

package/plugins/with-nx-metro.js.map

@@ -1 +1 @@
-{"version":3,"file":"with-nx-metro.js","sourceRoot":"","sources":["../../../../packages/expo/plugins/with-nx-metro.ts"],"names":[],"mappings":";;;AAAA,oEAAsE;AACtE,iEAAiE;AACjE,+BAA4B;AAC5B,qDAAqD;AAOrD,SAAgB,WAAW,CAAC,MAAW,EAAE,OAAsB,EAAE;IAC/D,MAAM,UAAU,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC1D,IAAI,IAAI,CAAC,KAAK;QAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAG,MAAM,CAAC;IAC3D,IAAI,IAAI,CAAC,UAAU;QAAE,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;IAEzD,sEAAsE;IACtE,MAAM,CAAC,WAAW,GAAG,sBAAW,CAAC;IAEjC,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC;IAC/C,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC;QACxC,IAAA,WAAI,EAAC,sBAAW,EAAE,cAAc,CAAC;QACjC,IAAA,WAAI,EAAC,sBAAW,EAAE,IAAA,4BAAe,GAAE,CAAC,OAAO,CAAC;KAC7C,CAAC,CAAC;IAEH,8CAA8C;IAC9C,MAAM,CAAC,QAAQ,mCACV,MAAM,CAAC,QAAQ,KAClB,cAAc,EAAE,IAAA,kCAAiB,EAAC,UAAU,CAAC,GAC9C,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AArBD,kCAqBC"}
+{"version":3,"file":"with-nx-metro.js","sourceRoot":"","sources":["../../../../packages/expo/plugins/with-nx-metro.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAC9D,+BAA4B;AAC5B,qDAAqD;AAOrD,SAAgB,WAAW,CAAC,MAAW,EAAE,OAAsB,EAAE;IAC/D,MAAM,UAAU,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC1D,IAAI,IAAI,CAAC,KAAK;QAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAG,MAAM,CAAC;IAC3D,IAAI,IAAI,CAAC,UAAU;QAAE,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;IAEzD,MAAM,CAAC,WAAW,GAAG,SAAS,CAAC;IAE/B,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC;IAC/C,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC;QACxC,IAAA,WAAI,EAAC,sBAAa,EAAE,cAAc,CAAC;QACnC,IAAA,WAAI,EAAC,sBAAa,EAAE,IAAA,wBAAe,GAAE,CAAC,OAAO,CAAC;KAC/C,CAAC,CAAC;IAEH,8CAA8C;IAC9C,MAAM,CAAC,QAAQ,mCACV,MAAM,CAAC,QAAQ,KAClB,cAAc,EAAE,IAAA,kCAAiB,EAAC,UAAU,CAAC,GAC9C,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AApBD,kCAoBC"}

package/project.json

@@ -20,7 +20,7 @@
     "test": {
       "executor": "@nrwl/jest:jest",
       "options": {
-        "jestConfig": "packages/expo/jest.config.js",
+        "jestConfig": "packages/expo/jest.config.ts",
         "passWithNoTests": true
       },
       "outputs": ["coverage/packages/expo"]

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

@@ -2,4 +2,4 @@ import { Tree, GeneratorCallback } from '@nrwl/devkit';
 import { Schema } from './schema';
 export declare function expoApplicationGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default expoApplicationGenerator;
-export declare const expoApplicationSchematic: (options: Schema) => (tree: any, context: any) => Promise<any>;
+export declare const expoApplicationSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/application/files/app.json.template

@@ -1,6 +1,6 @@
 {
   "expo": {
-    "name": "<%= projectName %>",
+    "name": "<%= displayName %>",
     "slug": "<%= projectName %>",
     "version": "1.0.0",
     "orientation": "portrait",

package/src/generators/application/lib/create-application-files.js

@@ -11,7 +11,7 @@ function createApplicationFiles(host, options) {
     };
     const packageManager = (0, devkit_1.detectPackageManager)(host.root);
     const packageLockFile = packageManagerLockFile[packageManager];
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files'), options.appProjectRoot, Object.assign(Object.assign({}, options), { offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot), easBuildPath: '/Users/expo/workingdir/build', packageManager,
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files'), options.appProjectRoot, Object.assign(Object.assign({}, options), { offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot), packageManager,
         packageLockFile }));
     if (options.unitTestRunner === 'none') {
         host.delete((0, path_1.join)(options.appProjectRoot, `App.spec.tsx`));

package/src/generators/application/lib/create-application-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/expo/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AACtB,+BAA4B;AAG5B,SAAgB,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IAC1E,MAAM,sBAAsB,GAAmC;QAC7D,GAAG,EAAE,mBAAmB;QACxB,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,gBAAgB;KACvB,CAAC;IACF,MAAM,cAAc,GAAG,IAAA,6BAAoB,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,eAAe,GAAG,sBAAsB,CAAC,cAAc,CAAC,CAAC;IAC/D,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,cAAc,kCAClE,OAAO,KACV,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,EACtD,YAAY,EAAE,8BAA8B,EAC5C,cAAc;QACd,eAAe,IACf,CAAC;IACH,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC,CAAC;KAC3D;IACD,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;KACZ;AACH,CAAC;AArBD,wDAqBC"}
+{"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/expo/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AACtB,+BAA4B;AAG5B,SAAgB,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IAC1E,MAAM,sBAAsB,GAAmC;QAC7D,GAAG,EAAE,mBAAmB;QACxB,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,gBAAgB;KACvB,CAAC;IACF,MAAM,cAAc,GAAG,IAAA,6BAAoB,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,eAAe,GAAG,sBAAsB,CAAC,cAAc,CAAC,CAAC;IAC/D,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,cAAc,kCAClE,OAAO,KACV,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,EACtD,cAAc;QACd,eAAe,IACf,CAAC;IACH,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC,CAAC;KAC3D;IACD,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;KACZ;AACH,CAAC;AApBD,wDAoBC"}

package/src/generators/component/component.d.ts

@@ -2,4 +2,4 @@ import { Schema } from './schema';
 import { Tree } from '@nrwl/devkit';
 export declare function expoComponentGenerator(host: Tree, schema: Schema): Promise<void>;
 export default expoComponentGenerator;
-export declare const expoComponentSchematic: (options: Schema) => (tree: any, context: any) => Promise<any>;
+export declare const expoComponentSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/component/schema.json

@@ -1,8 +1,8 @@
 {
   "cli": "nx",
-  "$id": "NxReactNativeApplication",
+  "$id": "NxExpoComponent",
   "$schema": "http://json-schema.org/schema",
-  "title": "Create a React Component for Nx",
+  "title": "Create a Expo Component for Nx",
   "type": "object",
   "examples": [
     {

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

@@ -3,4 +3,4 @@ import { Schema } from './schema';
 export declare function expoInitGenerator(host: Tree, schema: Schema): Promise<import("@nrwl/devkit").GeneratorCallback>;
 export declare function updateDependencies(host: Tree): import("@nrwl/devkit").GeneratorCallback;
 export default expoInitGenerator;
-export declare const reactNativeInitSchematic: (options: Schema) => (tree: any, context: any) => Promise<any>;
+export declare const reactNativeInitSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/init/init.js

@@ -8,7 +8,6 @@ const versions_1 = require("../../utils/versions");
 const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
 const jest_1 = require("@nrwl/jest");
 const detox_1 = require("@nrwl/detox");
-const versions_2 = require("@nrwl/react/src/utils/versions");
 const add_git_ignore_entry_1 = require("./lib/add-git-ignore-entry");
 const init_root_babel_config_1 = require("./lib/init-root-babel-config");
 function expoInitGenerator(host, schema) {
@@ -33,9 +32,15 @@ function expoInitGenerator(host, schema) {
 }
 exports.expoInitGenerator = expoInitGenerator;
 function updateDependencies(host) {
+    var _a;
+    const { dependencies = {} } = (0, devkit_1.readJson)(host, 'package.json');
+    // TODO(Emily): Remove this once Expo supports React Native 0.68.0.
+    if ((_a = dependencies['react']) === null || _a === void 0 ? void 0 : _a.match(/[\^~]?18/)) {
+        devkit_1.logger.warn(`React version ${dependencies['react']} is incompatible with Expo version ${versions_1.expoVersion}. Nx will downgrade the version to ${versions_1.reactVersion}.`);
+    }
     return (0, devkit_1.addDependenciesToPackageJson)(host, {
-        react: versions_2.reactVersion,
-        'react-dom': versions_2.reactVersion,
+        react: versions_1.reactVersion,
+        'react-dom': versions_1.reactVersion,
         'react-native': versions_1.reactNativeVersion,
         expo: versions_1.expoVersion,
         'expo-dev-client': versions_1.expoDevClientVersion,
@@ -53,7 +58,7 @@ function updateDependencies(host) {
         'react-native-svg': versions_1.reactNativeSvgVersion,
     }, {
         '@nrwl/expo': versions_1.nxVersion,
-        '@types/react': versions_2.typesReactVersion,
+        '@types/react': versions_1.reactVersion,
         '@types/react-native': versions_1.typesReactNativeVersion,
         'metro-resolver': versions_1.metroVersion,
         '@testing-library/react-native': versions_1.testingLibraryReactNativeVersion,
@@ -62,6 +67,7 @@ function updateDependencies(host) {
         'expo-cli': versions_1.expoCliVersion,
         'tsconfig-paths-webpack-plugin': versions_1.tsConfigPathsWebpackPluginVersion,
         '@svgr/webpack': versions_1.svgrWebpackVersion,
+        'babel-preset-expo': versions_1.babelPresetExpoVersion,
     });
 }
 exports.updateDependencies = updateDependencies;

package/src/generators/init/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,iGAA4F;AAC5F,yCAMsB;AAEtB,mDAyB8B;AAC9B,2FAAqF;AAErF,qCAA+C;AAC/C,uCAAiD;AACjD,6DAGwC;AAExC,qEAA+D;AAC/D,yEAAmE;AAEnE,SAAsB,iBAAiB,CAAC,IAAU,EAAE,MAAc;;QAChE,IAAA,6CAAoB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACzC,IAAA,wCAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,IAAA,4CAAmB,EAAC,IAAI,CAAC,CAAC;QAE1B,MAAM,KAAK,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;QAE/D,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,EAAE;YAC9D,MAAM,QAAQ,GAAG,IAAA,wBAAiB,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7C,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtB;QAED,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,KAAK,OAAO,EAAE;YAC7D,MAAM,SAAS,GAAG,MAAM,IAAA,0BAAkB,EAAC,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;YACvE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACvB;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAtBD,8CAsBC;AAED,SAAgB,kBAAkB,CAAC,IAAU;IAC3C,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,KAAK,EAAE,uBAAY;QACnB,WAAW,EAAE,uBAAY;QACzB,cAAc,EAAE,6BAAkB;QAClC,IAAI,EAAE,sBAAW;QACjB,iBAAiB,EAAE,+BAAoB;QACvC,iBAAiB,EAAE,+BAAoB;QACvC,kBAAkB,EAAE,gCAAqB;QACzC,oBAAoB,EAAE,iCAAsB;QAC5C,yBAAyB,EAAE,uCAA4B;QACvD,oBAAoB,EAAE,kCAAuB;QAC7C,cAAc,EAAE,6BAAkB;QAClC,8BAA8B,EAAE,2CAAgC;QAChE,yBAAyB,EAAE,uCAA4B;QACvD,gCAAgC,EAAE,4CAAiC;QACnE,sBAAsB,EAAE,oCAAyB;QACjD,8BAA8B,EAAE,2CAAgC;QAChE,kBAAkB,EAAE,gCAAqB;KAC1C,EACD;QACE,YAAY,EAAE,oBAAS;QACvB,cAAc,EAAE,4BAAiB;QACjC,qBAAqB,EAAE,kCAAuB;QAC9C,gBAAgB,EAAE,uBAAY;QAC9B,+BAA+B,EAAE,2CAAgC;QACjE,8BAA8B,EAAE,0CAA+B;QAC/D,WAAW,EAAE,0BAAe;QAC5B,UAAU,EAAE,yBAAc;QAC1B,+BAA+B,EAAE,4CAAiC;QAClE,eAAe,EAAE,6BAAkB;KACpC,CACF,CAAC;AACJ,CAAC;AAnCD,gDAmCC;AAED,SAAS,cAAc,CAAC,IAAU;IAChC,OAAO,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,oBAAoB,CAAC,EAAE,EAAE,CAAC,CAAC;AAC7E,CAAC;AAED,kBAAe,iBAAiB,CAAC;AACpB,QAAA,wBAAwB,GAAG,IAAA,2BAAkB,EAAC,iBAAiB,CAAC,CAAC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/generators/init/init.ts"],"names":[],"mappings":"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"}

package/src/generators/init/schema.json

@@ -1,8 +1,8 @@
 {
   "cli": "nx",
-  "$id": "NxReactNativeInit",
+  "$id": "NxExpoInit",
   "$schema": "http://json-schema.org/schema",
-  "title": "Add Nx React Schematics",
+  "title": "Add Nx Expo Schematics",
   "type": "object",
   "properties": {
     "unitTestRunner": {

package/src/generators/library/library.d.ts

@@ -2,4 +2,4 @@ import { GeneratorCallback, Tree } from '@nrwl/devkit';
 import { Schema } from './schema';
 export declare function expoLibraryGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default expoLibraryGenerator;
-export declare const expoLibrarySchematic: (options: Schema) => (tree: any, context: any) => Promise<any>;
+export declare const expoLibrarySchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/library/schema.json

@@ -1,8 +1,8 @@
 {
   "cli": "nx",
-  "$id": "NxReactNativeLibrary",
+  "$id": "NxExpoLibrary",
   "$schema": "http://json-schema.org/schema",
-  "title": "Create a React Native Library for Nx",
+  "title": "Create a Expo Library for Nx",
   "type": "object",
   "examples": [
     {

package/src/generators/preset/preset.d.ts

@@ -0,0 +1,4 @@
+import { Tree } from '@nrwl/devkit';
+import { PresetGeneratorSchema } from './schema';
+export default function expoPresetGenerator(tree: Tree, options: PresetGeneratorSchema): Promise<import("@nrwl/devkit").GeneratorCallback>;
+export declare const expoPresetSchematic: (generatorOptions: PresetGeneratorSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/preset/preset.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.expoPresetSchematic = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const set_default_collection_1 = require("@nrwl/workspace/src/utilities/set-default-collection");
+const application_1 = require("../application/application");
+function expoPresetGenerator(tree, options) {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        const appTask = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { name: options.appName || options.name }));
+        (0, set_default_collection_1.setDefaultCollection)(tree, '@nrwl/expo');
+        yield (0, devkit_1.formatFiles)(tree);
+        return appTask;
+    });
+}
+exports.default = expoPresetGenerator;
+exports.expoPresetSchematic = (0, devkit_1.convertNxGenerator)(expoPresetGenerator);
+//# sourceMappingURL=preset.js.map

package/src/generators/preset/preset.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/generators/preset/preset.ts"],"names":[],"mappings":";;;;AAAA,yCAAqE;AACrE,iGAA4F;AAC5F,4DAAkE;AAGlE,SAA8B,mBAAmB,CAC/C,IAAU,EACV,OAA8B;;QAE9B,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAwB,EAAC,IAAI,kCAC9C,OAAO,KACV,IAAI,EAAE,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,IACrC,CAAC;QAEH,IAAA,6CAAoB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAEzC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,OAAO,CAAC;IACjB,CAAC;CAAA;AAdD,sCAcC;AAEY,QAAA,mBAAmB,GAAG,IAAA,2BAAkB,EAAC,mBAAmB,CAAC,CAAC"}

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

@@ -0,0 +1,13 @@
+import { Linter } from '@nrwl/linter';
+
+export interface PresetGeneratorSchema {
+  name: string;
+  appName: string;
+  tags?: string;
+  directory?: string;
+  js: boolean; // default is false
+  e2eTestRunner: 'detox' | 'none'; // default is detox
+  skipFormat: boolean; // default is true
+  linter: Linter; // default is eslint
+  unitTestRunner: 'jest' | 'none'; // default is jest
+}

package/src/generators/preset/schema.json

@@ -0,0 +1,62 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "cli": "nx",
+  "$id": "Preset",
+  "title": "Add Nx Expo Preset",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "workspace name",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What workspace name would you like to use?"
+    },
+    "appName": {
+      "type": "string",
+      "description": "app name",
+      "x-prompt": "What app name would you like to use?"
+    },
+    "tags": {
+      "type": "string",
+      "description": "Add tags to the project (used for linting)",
+      "alias": "t"
+    },
+    "directory": {
+      "type": "string",
+      "description": "A directory where the project is placed",
+      "alias": "d"
+    },
+    "js": {
+      "type": "boolean",
+      "description": "Generate JavaScript files rather than TypeScript files",
+      "default": false
+    },
+    "e2eTestRunner": {
+      "description": "Adds the specified e2e test runner",
+      "type": "string",
+      "enum": ["detox", "none"],
+      "default": "detox"
+    },
+    "skipFormat": {
+      "description": "Skip formatting files",
+      "type": "boolean",
+      "default": false
+    },
+    "linter": {
+      "description": "The tool to use for running lint checks.",
+      "type": "string",
+      "enum": ["eslint", "tslint"],
+      "default": "eslint"
+    },
+    "unitTestRunner": {
+      "type": "string",
+      "enum": ["jest", "none"],
+      "description": "Test runner to use for unit tests",
+      "default": "jest"
+    }
+  },
+  "required": []
+}

package/src/utils/ensure-node-modules-symlink.js.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-node-modules-symlink.js","sourceRoot":"","sources":["../../../../../packages/expo/src/utils/ensure-node-modules-symlink.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,2BAA8B;AAC9B,yBAAyB;AAGzB;;;;;;;GAOG;AACH,SAAgB,wBAAwB,CACtC,aAAqB,EACrB,WAAmB;IAEnB,MAAM,wBAAwB,GAAG,IAAA,WAAI,EAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IACrE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,wBAAwB,CAAC,EAAE;QAC5C,MAAM,IAAI,KAAK,CAAC,eAAe,wBAAwB,EAAE,CAAC,CAAC;KAC5D;IAED,MAAM,kBAAkB,GAAG,IAAA,WAAI,EAAC,aAAa,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;IAC5E,6EAA6E;IAC7E,MAAM,WAAW,GAAG,IAAA,aAAQ,GAAE,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC;IAEhE,IAAI,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE;QACrC,EAAE,CAAC,SAAS,CAAC,kBAAkB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KACvD;IACD,EAAE,CAAC,WAAW,CAAC,wBAAwB,EAAE,kBAAkB,EAAE,WAAW,CAAC,CAAC;AAC5E,CAAC;AAjBD,4DAiBC"}
+{"version":3,"file":"ensure-node-modules-symlink.js","sourceRoot":"","sources":["../../../../../packages/expo/src/utils/ensure-node-modules-symlink.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,2BAA8B;AAC9B,yBAAyB;AAEzB;;;;;;;GAOG;AACH,SAAgB,wBAAwB,CACtC,aAAqB,EACrB,WAAmB;IAEnB,MAAM,wBAAwB,GAAG,IAAA,WAAI,EAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IACrE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,wBAAwB,CAAC,EAAE;QAC5C,MAAM,IAAI,KAAK,CAAC,eAAe,wBAAwB,EAAE,CAAC,CAAC;KAC5D;IAED,MAAM,kBAAkB,GAAG,IAAA,WAAI,EAAC,aAAa,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;IAC5E,6EAA6E;IAC7E,MAAM,WAAW,GAAG,IAAA,aAAQ,GAAE,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC;IAEhE,IAAI,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE;QACrC,EAAE,CAAC,SAAS,CAAC,kBAAkB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KACvD;IACD,EAAE,CAAC,WAAW,CAAC,wBAAwB,EAAE,kBAAkB,EAAE,WAAW,CAAC,CAAC;AAC5E,CAAC;AAjBD,4DAiBC"}

package/src/utils/find-all-npm-dependencies.d.ts

@@ -1,2 +1,2 @@
-import { ProjectGraph } from '@nrwl/workspace/src/core/project-graph';
+import { ProjectGraph } from '@nrwl/devkit';
 export declare function findAllNpmDependencies(graph: ProjectGraph, projectName: string, list?: string[], seen?: Set<string>): string[];

package/src/utils/versions.d.ts

@@ -5,9 +5,11 @@ export declare const expoStatusBarVersion = "1.2.0";
 export declare const expoMetroConfigVersion = "0.3.10";
 export declare const expoStructuredHeadersVersion = "2.1.1";
 export declare const expoSplashScreenVersion = "0.14.2";
-export declare const expoUpdatesVersion = "0.11.6";
+export declare const expoUpdatesVersion = "~0.11.6";
 export declare const jestExpoVersion = "44.0.1";
-export declare const expoCliVersion = "5.3.0";
+export declare const expoCliVersion = "5.4.0";
+export declare const babelPresetExpoVersion = "~9.0.2";
+export declare const reactVersion = "17.0.1";
 export declare const reactNativeVersion = "0.64.3";
 export declare const typesReactNativeVersion = "0.64.3";
 export declare const reactNativeWebVersion = "0.17.5";

package/src/utils/versions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsConfigPathsWebpackPluginVersion = exports.testingLibraryJestNativeVersion = exports.testingLibraryReactNativeVersion = exports.metroVersion = exports.svgrWebpackVersion = exports.reactNativeSvgVersion = exports.reactNativeSvgTransformerVersion = exports.reactNativeScreensVersion = exports.reactNativeSafeAreaContextVersion = exports.reactNativeReanimatedVersion = exports.reactNativeGestureHandlerVersion = exports.reactNativeWebVersion = exports.typesReactNativeVersion = exports.reactNativeVersion = exports.expoCliVersion = exports.jestExpoVersion = exports.expoUpdatesVersion = exports.expoSplashScreenVersion = exports.expoStructuredHeadersVersion = exports.expoMetroConfigVersion = exports.expoStatusBarVersion = exports.expoDevClientVersion = exports.expoVersion = exports.nxVersion = void 0;
+exports.tsConfigPathsWebpackPluginVersion = exports.testingLibraryJestNativeVersion = exports.testingLibraryReactNativeVersion = exports.metroVersion = exports.svgrWebpackVersion = exports.reactNativeSvgVersion = exports.reactNativeSvgTransformerVersion = exports.reactNativeScreensVersion = exports.reactNativeSafeAreaContextVersion = exports.reactNativeReanimatedVersion = exports.reactNativeGestureHandlerVersion = exports.reactNativeWebVersion = exports.typesReactNativeVersion = exports.reactNativeVersion = exports.reactVersion = exports.babelPresetExpoVersion = exports.expoCliVersion = exports.jestExpoVersion = exports.expoUpdatesVersion = exports.expoSplashScreenVersion = exports.expoStructuredHeadersVersion = exports.expoMetroConfigVersion = exports.expoStatusBarVersion = exports.expoDevClientVersion = exports.expoVersion = exports.nxVersion = void 0;
 exports.nxVersion = '*';
 exports.expoVersion = '44.0.6';
 exports.expoDevClientVersion = '0.8.4';
@@ -8,9 +8,14 @@ exports.expoStatusBarVersion = '1.2.0';
 exports.expoMetroConfigVersion = '0.3.10';
 exports.expoStructuredHeadersVersion = '2.1.1';
 exports.expoSplashScreenVersion = '0.14.2';
-exports.expoUpdatesVersion = '0.11.6';
+exports.expoUpdatesVersion = '~0.11.6';
 exports.jestExpoVersion = '44.0.1';
-exports.expoCliVersion = '5.3.0';
+exports.expoCliVersion = '5.4.0';
+exports.babelPresetExpoVersion = '~9.0.2';
+// TODO(Emily): Remove this once expo supports react-native 0.68.0.
+// v18 is only supported on the New Architecture
+// See: https://reactnative.dev/blog/2022/03/15/an-update-on-the-new-architecture-rollout
+exports.reactVersion = '17.0.1';
 exports.reactNativeVersion = '0.64.3';
 exports.typesReactNativeVersion = '0.64.3';
 exports.reactNativeWebVersion = '0.17.5';

package/src/utils/versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/expo/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAEhB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,oBAAoB,GAAG,OAAO,CAAC;AAC/B,QAAA,oBAAoB,GAAG,OAAO,CAAC;AAC/B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,4BAA4B,GAAG,OAAO,CAAC;AACvC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,OAAO,CAAC;AAEzB,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AACjC,QAAA,gCAAgC,GAAG,OAAO,CAAC;AAC3C,QAAA,4BAA4B,GAAG,OAAO,CAAC;AACvC,QAAA,iCAAiC,GAAG,OAAO,CAAC;AAC5C,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AAErC,QAAA,gCAAgC,GAAG,OAAO,CAAC;AAC3C,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AACjC,QAAA,kBAAkB,GAAG,QAAQ,CAAA;AAE7B,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,gCAAgC,GAAG,OAAO,CAAC;AAC3C,QAAA,+BAA+B,GAAG,OAAO,CAAC;AAE1C,QAAA,iCAAiC,GAAG,OAAO,CAAC"}
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/expo/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAEhB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,oBAAoB,GAAG,OAAO,CAAC;AAC/B,QAAA,oBAAoB,GAAG,OAAO,CAAC;AAC/B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,4BAA4B,GAAG,OAAO,CAAC;AACvC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,kBAAkB,GAAG,SAAS,CAAC;AAC/B,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,OAAO,CAAC;AACzB,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAE/C,mEAAmE;AACnE,gDAAgD;AAChD,yFAAyF;AAC5E,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AACjC,QAAA,gCAAgC,GAAG,OAAO,CAAC;AAC3C,QAAA,4BAA4B,GAAG,OAAO,CAAC;AACvC,QAAA,iCAAiC,GAAG,OAAO,CAAC;AAC5C,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AAErC,QAAA,gCAAgC,GAAG,OAAO,CAAC;AAC3C,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AACjC,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAE9B,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,gCAAgC,GAAG,OAAO,CAAC;AAC3C,QAAA,+BAA+B,GAAG,OAAO,CAAC;AAE1C,QAAA,iCAAiC,GAAG,OAAO,CAAC"}

package/tsconfig.lib.json

@@ -6,6 +6,6 @@
     "declaration": true,
     "types": ["node"]
   },
-  "exclude": ["**/*.spec.ts", "**/*.test.ts"],
+  "exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
   "include": ["**/*.ts"]
 }

package/tsconfig.spec.json

@@ -14,6 +14,7 @@
     "**/*.spec.js",
     "**/*.test.jsx",
     "**/*.spec.jsx",
-    "**/*.d.ts"
+    "**/*.d.ts",
+    "jest.config.ts"
   ]
 }

package/jest.config.js

@@ -1,12 +0,0 @@
-module.exports = {
-  preset: '../../jest.preset.js',
-  transform: {
-    '^.+\\.[tj]sx?$': 'ts-jest',
-  },
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html', 'json'],
-  globals: {
-    'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' },
-  },
-  displayName: 'expo',
-  testEnvironment: 'node',
-};