@nx/expo 16.8.0-beta.3 → 16.8.0-beta.5

package/src/generators/init/init.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expoInitSchematic = exports.updateDependencies = exports.expoInitGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 const jest_1 = require("@nx/jest");
@@ -9,29 +8,33 @@ 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");
-function expoInitGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, add_git_ignore_entry_1.addGitIgnoreEntry)(host);
-        (0, init_root_babel_config_1.initRootBabelConfig)(host);
-        const tasks = [];
-        tasks.push(yield (0, js_1.initGenerator)(host, Object.assign(Object.assign({}, schema), { skipFormat: true })));
-        if (!schema.skipPackageJson) {
-            tasks.push(moveDependency(host));
-            tasks.push(updateDependencies(host));
-        }
-        if (!schema.unitTestRunner || schema.unitTestRunner === 'jest') {
-            const jestTask = yield (0, jest_1.jestInitGenerator)(host, schema);
-            tasks.push(jestTask);
-        }
-        if (!schema.e2eTestRunner || schema.e2eTestRunner === 'detox') {
-            const detoxTask = yield (0, detox_1.detoxInitGenerator)(host, Object.assign(Object.assign({}, schema), { skipFormat: true }));
-            tasks.push(detoxTask);
-        }
-        if (!schema.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+async function expoInitGenerator(host, schema) {
+    (0, add_git_ignore_entry_1.addGitIgnoreEntry)(host);
+    (0, init_root_babel_config_1.initRootBabelConfig)(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 (!schema.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.expoInitGenerator = expoInitGenerator;
 function updateDependencies(host) {

package/src/generators/init/lib/add-git-ignore-entry.js

@@ -4,12 +4,11 @@ exports.addGitIgnoreEntry = void 0;
 const devkit_1 = require("@nx/devkit");
 const gitignore_entries_1 = require("./gitignore-entries");
 function addGitIgnoreEntry(host) {
-    var _a;
     if (!host.exists('.gitignore')) {
         devkit_1.logger.warn(`Couldn't find .gitignore file to update`);
         return;
     }
-    let content = (_a = host.read('.gitignore')) === null || _a === void 0 ? void 0 : _a.toString('utf-8').trimEnd();
+    let content = host.read('.gitignore')?.toString('utf-8').trimEnd();
     if (!/\.expo\/$/gm.test(content)) {
         content = `${content}\n${gitignore_entries_1.gitIgnoreEntriesForExpo}\n`;
     }

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

@@ -1,27 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
-const tslib_1 = require("tslib");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-function normalizeOptions(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { projectName, names: projectNames, projectRoot, importPath, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
-            name: options.name,
-            projectType: 'library',
-            directory: options.directory,
-            importPath: options.importPath,
-            projectNameAndRootFormat: options.projectNameAndRootFormat,
-            callingGenerator: '@nx/expo:library',
-        });
-        const parsedTags = options.tags
-            ? options.tags.split(',').map((s) => s.trim())
-            : [];
-        const appMain = options.js ? 'src/index.js' : 'src/index.ts';
-        const normalized = Object.assign(Object.assign({}, options), { fileName: projectName, routePath: `/${projectNames.projectSimpleName}`, name: projectName, projectRoot,
-            parsedTags,
-            importPath,
-            appMain });
-        return normalized;
+async function normalizeOptions(host, options) {
+    const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+        name: options.name,
+        projectType: 'library',
+        directory: options.directory,
+        importPath: options.importPath,
+        projectNameAndRootFormat: options.projectNameAndRootFormat,
+        callingGenerator: '@nx/expo:library',
     });
+    const parsedTags = options.tags
+        ? options.tags.split(',').map((s) => s.trim())
+        : [];
+    const appMain = options.js ? 'src/index.js' : 'src/index.ts';
+    const normalized = {
+        ...options,
+        fileName: projectName,
+        routePath: `/${projectNames.projectSimpleName}`,
+        name: projectName,
+        projectRoot,
+        parsedTags,
+        importPath,
+        appMain,
+    };
+    return normalized;
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/library/library.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expoLibrarySchematic = exports.expoLibraryGeneratorInternal = exports.expoLibraryGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const init_1 = require("../init/init");
@@ -9,100 +8,117 @@ 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");
-function expoLibraryGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield expoLibraryGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+async function expoLibraryGenerator(host, schema) {
+    return await expoLibraryGeneratorInternal(host, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.expoLibraryGenerator = expoLibraryGenerator;
-function expoLibraryGeneratorInternal(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = yield (0, normalize_options_1.normalizeOptions)(host, schema);
-        if (options.publishable === true && !schema.importPath) {
-            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 = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { skipFormat: true, e2eTestRunner: 'none' }));
-        tasks.push(initTask);
-        const addProjectTask = yield addProject(host, options);
-        if (addProjectTask) {
-            tasks.push(addProjectTask);
-        }
-        createFiles(host, options);
-        const lintTask = yield (0, add_linting_1.addLinting)(host, Object.assign(Object.assign({}, options), { projectName: options.name, tsConfigPaths: [
-                (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
-            ] }));
-        tasks.push(lintTask);
-        const jestTask = yield (0, add_jest_1.addJest)(host, options.unitTestRunner, options.name, options.projectRoot, options.js, options.skipPackageJson);
-        tasks.push(jestTask);
-        if (options.publishable || options.buildable) {
-            updateLibPackageNpmScope(host, options);
-        }
-        if (!options.skipTsConfig) {
-            (0, js_1.addTsConfigPath)(host, options.importPath, [
-                (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
-            ]);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
+async function expoLibraryGeneratorInternal(host, schema) {
+    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    if (options.publishable === true && !schema.importPath) {
+        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,
+        skipFormat: true,
+        e2eTestRunner: 'none',
+    });
+    tasks.push(initTask);
+    const addProjectTask = await addProject(host, options);
+    if (addProjectTask) {
+        tasks.push(addProjectTask);
+    }
+    createFiles(host, options);
+    const lintTask = await (0, add_linting_1.addLinting)(host, {
+        ...options,
+        projectName: options.name,
+        tsConfigPaths: [
+            (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
+        ],
     });
+    tasks.push(lintTask);
+    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.name, options.projectRoot, options.js, options.skipPackageJson);
+    tasks.push(jestTask);
+    if (options.publishable || options.buildable) {
+        updateLibPackageNpmScope(host, options);
+    }
+    if (!options.skipTsConfig) {
+        (0, js_1.addTsConfigPath)(host, options.importPath, [
+            (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
+        ]);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.expoLibraryGeneratorInternal = expoLibraryGeneratorInternal;
-function addProject(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        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 = yield rollupInitGenerator(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
-        }
-        (0, devkit_1.addProjectConfiguration)(host, options.name, {
-            root: options.projectRoot,
-            sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
-            projectType: 'library',
-            tags: options.parsedTags,
-            targets,
-        });
-        return task;
+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, {
+        root: options.projectRoot,
+        sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
+        projectType: 'library',
+        tags: options.parsedTags,
+        targets,
     });
+    return task;
 }
 function updateTsConfig(tree, options) {
     (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json'), (json) => {
         if (options.strict) {
-            json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { forceConsistentCasingInFileNames: true, strict: true, noImplicitReturns: true, noFallthroughCasesInSwitch: true });
+            json.compilerOptions = {
+                ...json.compilerOptions,
+                forceConsistentCasingInFileNames: true,
+                strict: true,
+                noImplicitReturns: true,
+                noFallthroughCasesInSwitch: true,
+            };
         }
         return json;
     });
 }
 function createFiles(host, options) {
-    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/lib'), options.projectRoot, Object.assign(Object.assign(Object.assign({}, options), (0, devkit_1.names)(options.name)), { tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot) }));
+    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/lib'), options.projectRoot, {
+        ...options,
+        ...(0, devkit_1.names)(options.name),
+        tmpl: '',
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
+        rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot),
+    });
     if (!options.publishable && !options.buildable) {
         host.delete(`${options.projectRoot}/package.json`);
     }

package/src/migrations/update-14-0-0/add-project-root-metro-config-14-0-0.js

@@ -1,34 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 /**
  * Add projectRoot and watchFolders options in metro.config.js
  * @param tree
  */
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        projects.forEach((project) => {
-            var _a, _b;
-            const metroConfigPath = `${project.root}/metro.config.js`;
-            if (((_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.start) === null || _b === void 0 ? void 0 : _b.executor) !== '@nrwl/react-native:start' ||
-                !tree.exists(metroConfigPath))
+async function update(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    projects.forEach((project) => {
+        const metroConfigPath = `${project.root}/metro.config.js`;
+        if (project.targets?.start?.executor !== '@nrwl/react-native:start' ||
+            !tree.exists(metroConfigPath))
+            return;
+        try {
+            const metroConfigContent = tree.read(metroConfigPath, 'utf-8');
+            if (metroConfigContent.includes('projectRoot: __dirname')) {
                 return;
-            try {
-                const metroConfigContent = tree.read(metroConfigPath, 'utf-8');
-                if (metroConfigContent.includes('projectRoot: __dirname')) {
-                    return;
-                }
-                if (metroConfigContent.includes('projectRoot'))
-                    return;
-                tree.write(metroConfigPath, metroConfigContent.replace('debug: ', 'projectRoot: __dirname, watchFolders: [], debug: '));
             }
-            catch (_c) {
-                devkit_1.logger.error((0, devkit_1.stripIndents) `Unable to update ${metroConfigPath} for project ${project.root}.`);
-            }
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+            if (metroConfigContent.includes('projectRoot'))
+                return;
+            tree.write(metroConfigPath, metroConfigContent.replace('debug: ', 'projectRoot: __dirname, watchFolders: [], debug: '));
+        }
+        catch {
+            devkit_1.logger.error((0, devkit_1.stripIndents) `Unable to update ${metroConfigPath} for project ${project.root}.`);
+        }
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;

package/src/migrations/update-14-1-2/add-eject-target-14-1-2.js

@@ -1,24 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 /**
  * Add eject to targets for expo app
  */
-function update(tree) {
-    var _a, _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        for (const [name, config] of projects.entries()) {
-            if (((_b = (_a = config.targets) === null || _a === void 0 ? void 0 : _a['start']) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/expo:start') {
-                config.targets['eject'] = {
-                    executor: '@nrwl/expo:eject',
-                    options: {},
-                };
-            }
-            (0, devkit_1.updateProjectConfiguration)(tree, name, config);
+async function update(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [name, config] of projects.entries()) {
+        if (config.targets?.['start']?.executor === '@nrwl/expo:start') {
+            config.targets['eject'] = {
+                executor: '@nrwl/expo:eject',
+                options: {},
+            };
         }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+        (0, devkit_1.updateProjectConfiguration)(tree, name, config);
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;

package/src/migrations/update-14-4-3/add-eas-build-target.js

@@ -1,41 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 /**
  * Add eas build and build-list target for expo
  */
-function update(tree) {
-    var _a, _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        for (const [name, config] of projects.entries()) {
-            if (((_b = (_a = config.targets) === null || _a === void 0 ? void 0 : _a['start']) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/expo:start') {
-                if (!config.targets['build']) {
-                    config.targets['build'] = {
-                        executor: '@nrwl/expo:build',
-                        options: {},
-                    };
-                }
-                if (!config.targets['build-list']) {
-                    config.targets['build-list'] = {
-                        executor: '@nrwl/expo:build-list',
-                        options: {},
-                    };
-                }
-                if (!config.targets['download']) {
-                    config.targets['download'] = {
-                        executor: '@nrwl/expo:download',
-                        options: {
-                            output: (0, path_1.join)(config.root, 'dist'),
-                        },
-                    };
-                }
+async function update(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [name, config] of projects.entries()) {
+        if (config.targets?.['start']?.executor === '@nrwl/expo:start') {
+            if (!config.targets['build']) {
+                config.targets['build'] = {
+                    executor: '@nrwl/expo:build',
+                    options: {},
+                };
+            }
+            if (!config.targets['build-list']) {
+                config.targets['build-list'] = {
+                    executor: '@nrwl/expo:build-list',
+                    options: {},
+                };
+            }
+            if (!config.targets['download']) {
+                config.targets['download'] = {
+                    executor: '@nrwl/expo:download',
+                    options: {
+                        output: (0, path_1.join)(config.root, 'dist'),
+                    },
+                };
             }
-            (0, devkit_1.updateProjectConfiguration)(tree, name, config);
         }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+        (0, devkit_1.updateProjectConfiguration)(tree, name, config);
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;

package/src/migrations/update-14-5-1/add-eas-update-target.js

@@ -1,26 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 /**
  * Add eas update target for expo
  */
-function update(tree) {
-    var _a, _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        for (const [name, config] of projects.entries()) {
-            if (((_b = (_a = config.targets) === null || _a === void 0 ? void 0 : _a['start']) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/expo:start') {
-                if (!config.targets['update']) {
-                    config.targets['update'] = {
-                        executor: '@nrwl/expo:update',
-                        options: {},
-                    };
-                }
-                (0, devkit_1.updateProjectConfiguration)(tree, name, config);
+async function update(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [name, config] of projects.entries()) {
+        if (config.targets?.['start']?.executor === '@nrwl/expo:start') {
+            if (!config.targets['update']) {
+                config.targets['update'] = {
+                    executor: '@nrwl/expo:update',
+                    options: {},
+                };
             }
+            (0, devkit_1.updateProjectConfiguration)(tree, name, config);
         }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;