@nx/react 16.8.0-beta.4 → 16.8.0-beta.5

package/src/module-federation/utils.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModuleFederationConfig = exports.getFunctionDeterminateRemoteUrl = void 0;
-const tslib_1 = require("tslib");
 const module_federation_1 = require("@nx/devkit/src/utils/module-federation");
 const devkit_1 = require("@nx/devkit");
 const project_graph_1 = require("nx/src/project-graph/project-graph");
@@ -9,50 +8,50 @@ function getFunctionDeterminateRemoteUrl(isServer = false) {
     const target = isServer ? 'serve-server' : 'serve';
     const remoteEntry = isServer ? 'server/remoteEntry.js' : 'remoteEntry.js';
     return function (remote) {
-        var _a, _b, _c, _d, _e;
         const remoteConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(remote);
-        const serveTarget = (_a = remoteConfiguration === null || remoteConfiguration === void 0 ? void 0 : remoteConfiguration.targets) === null || _a === void 0 ? void 0 : _a[target];
+        const serveTarget = remoteConfiguration?.targets?.[target];
         if (!serveTarget) {
             throw new Error(`Cannot automatically determine URL of remote (${remote}). Looked for property "host" in the project's "${serveTarget}" target.\n
       You can also use the tuple syntax in your webpack config to configure your remotes. e.g. \`remotes: [['remote1', 'http://localhost:4201']]\``);
         }
-        const host = (_c = (_b = serveTarget.options) === null || _b === void 0 ? void 0 : _b.host) !== null && _c !== void 0 ? _c : `http${serveTarget.options.ssl ? 's' : ''}://localhost`;
-        const port = (_e = (_d = serveTarget.options) === null || _d === void 0 ? void 0 : _d.port) !== null && _e !== void 0 ? _e : 4201;
+        const host = serveTarget.options?.host ??
+            `http${serveTarget.options.ssl ? 's' : ''}://localhost`;
+        const port = serveTarget.options?.port ?? 4201;
         return `${host.endsWith('/') ? host.slice(0, -1) : host}:${port}/${remoteEntry}`;
     };
 }
 exports.getFunctionDeterminateRemoteUrl = getFunctionDeterminateRemoteUrl;
-function getModuleFederationConfig(mfConfig, options = { isServer: false }) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let projectGraph;
-        try {
-            projectGraph = (0, devkit_1.readCachedProjectGraph)();
-        }
-        catch (e) {
-            projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
-        }
-        const project = (_a = projectGraph.nodes[mfConfig.name]) === null || _a === void 0 ? void 0 : _a.data;
-        if (!project) {
-            throw Error(`Cannot find project "${mfConfig.name}". Check that the name is correct in module-federation.config.js`);
-        }
-        const dependencies = (0, module_federation_1.getDependentPackagesForProject)(projectGraph, mfConfig.name);
-        if (mfConfig.shared) {
-            dependencies.workspaceLibraries = dependencies.workspaceLibraries.filter((lib) => mfConfig.shared(lib.importKey, {}) !== false);
-            dependencies.npmPackages = dependencies.npmPackages.filter((pkg) => mfConfig.shared(pkg, {}) !== false);
-        }
-        const sharedLibraries = (0, module_federation_1.shareWorkspaceLibraries)(dependencies.workspaceLibraries);
-        const npmPackages = (0, module_federation_1.sharePackages)(dependencies.npmPackages);
-        const sharedDependencies = Object.assign(Object.assign({}, sharedLibraries.getLibraries()), npmPackages);
-        (0, module_federation_1.applySharedFunction)(sharedDependencies, mfConfig.shared);
-        (0, module_federation_1.applyAdditionalShared)(sharedDependencies, mfConfig.additionalShared, projectGraph);
-        const mapRemotesFunction = options.isServer ? module_federation_1.mapRemotesForSSR : module_federation_1.mapRemotes;
-        const determineRemoteUrlFn = options.determineRemoteUrl ||
-            getFunctionDeterminateRemoteUrl(options.isServer);
-        const mappedRemotes = !mfConfig.remotes || mfConfig.remotes.length === 0
-            ? {}
-            : mapRemotesFunction(mfConfig.remotes, 'js', determineRemoteUrlFn);
-        return { sharedLibraries, sharedDependencies, mappedRemotes };
-    });
+async function getModuleFederationConfig(mfConfig, options = { isServer: false }) {
+    let projectGraph;
+    try {
+        projectGraph = (0, devkit_1.readCachedProjectGraph)();
+    }
+    catch (e) {
+        projectGraph = await (0, devkit_1.createProjectGraphAsync)();
+    }
+    const project = projectGraph.nodes[mfConfig.name]?.data;
+    if (!project) {
+        throw Error(`Cannot find project "${mfConfig.name}". Check that the name is correct in module-federation.config.js`);
+    }
+    const dependencies = (0, module_federation_1.getDependentPackagesForProject)(projectGraph, mfConfig.name);
+    if (mfConfig.shared) {
+        dependencies.workspaceLibraries = dependencies.workspaceLibraries.filter((lib) => mfConfig.shared(lib.importKey, {}) !== false);
+        dependencies.npmPackages = dependencies.npmPackages.filter((pkg) => mfConfig.shared(pkg, {}) !== false);
+    }
+    const sharedLibraries = (0, module_federation_1.shareWorkspaceLibraries)(dependencies.workspaceLibraries);
+    const npmPackages = (0, module_federation_1.sharePackages)(dependencies.npmPackages);
+    const sharedDependencies = {
+        ...sharedLibraries.getLibraries(),
+        ...npmPackages,
+    };
+    (0, module_federation_1.applySharedFunction)(sharedDependencies, mfConfig.shared);
+    (0, module_federation_1.applyAdditionalShared)(sharedDependencies, mfConfig.additionalShared, projectGraph);
+    const mapRemotesFunction = options.isServer ? module_federation_1.mapRemotesForSSR : module_federation_1.mapRemotes;
+    const determineRemoteUrlFn = options.determineRemoteUrl ||
+        getFunctionDeterminateRemoteUrl(options.isServer);
+    const mappedRemotes = !mfConfig.remotes || mfConfig.remotes.length === 0
+        ? {}
+        : mapRemotesFunction(mfConfig.remotes, 'js', determineRemoteUrlFn);
+    return { sharedLibraries, sharedDependencies, mappedRemotes };
 }
 exports.getModuleFederationConfig = getModuleFederationConfig;

package/src/module-federation/with-module-federation-ssr.js

@@ -1,32 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withModuleFederationForSSR = void 0;
-const tslib_1 = require("tslib");
 const utils_1 = require("./utils");
-function withModuleFederationForSSR(options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { sharedLibraries, sharedDependencies, mappedRemotes } = yield (0, utils_1.getModuleFederationConfig)(options, {
-            isServer: true,
-        });
-        return (config) => {
-            config.target = false;
-            config.output.uniqueName = options.name;
-            config.optimization = {
-                runtimeChunk: false,
-            };
-            config.plugins.push(new (require('@module-federation/node').UniversalFederationPlugin)({
-                name: options.name,
-                filename: 'remoteEntry.js',
-                exposes: options.exposes,
-                remotes: mappedRemotes,
-                shared: Object.assign({}, sharedDependencies),
-                library: {
-                    type: 'commonjs-module',
-                },
-                isServer: true,
-            }, {}), sharedLibraries.getReplacementPlugin());
-            return config;
-        };
+async function withModuleFederationForSSR(options) {
+    const { sharedLibraries, sharedDependencies, mappedRemotes } = await (0, utils_1.getModuleFederationConfig)(options, {
+        isServer: true,
     });
+    return (config) => {
+        config.target = false;
+        config.output.uniqueName = options.name;
+        config.optimization = {
+            runtimeChunk: false,
+        };
+        config.plugins.push(new (require('@module-federation/node').UniversalFederationPlugin)({
+            name: options.name,
+            filename: 'remoteEntry.js',
+            exposes: options.exposes,
+            remotes: mappedRemotes,
+            shared: {
+                ...sharedDependencies,
+            },
+            library: {
+                type: 'commonjs-module',
+            },
+            isServer: true,
+        }, {}), sharedLibraries.getReplacementPlugin());
+        return config;
+    };
 }
 exports.withModuleFederationForSSR = withModuleFederationForSSR;

package/src/module-federation/with-module-federation.js

@@ -1,34 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withModuleFederation = void 0;
-const tslib_1 = require("tslib");
 const utils_1 = require("./utils");
 const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin");
 /**
  * @param {ModuleFederationConfig} options
  * @return {Promise<AsyncNxWebpackPlugin>}
  */
-function withModuleFederation(options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { sharedDependencies, sharedLibraries, mappedRemotes } = yield (0, utils_1.getModuleFederationConfig)(options);
-        return (config, ctx) => {
-            var _a;
-            config.output.uniqueName = options.name;
-            config.output.publicPath = 'auto';
-            config.optimization = {
-                runtimeChunk: false,
-            };
-            config.experiments = Object.assign(Object.assign({}, config.experiments), { outputModule: true });
-            config.plugins.push(new ModuleFederationPlugin({
-                name: options.name,
-                library: (_a = options.library) !== null && _a !== void 0 ? _a : { type: 'module' },
-                filename: 'remoteEntry.js',
-                exposes: options.exposes,
-                remotes: mappedRemotes,
-                shared: Object.assign({}, sharedDependencies),
-            }), sharedLibraries.getReplacementPlugin());
-            return config;
+async function withModuleFederation(options) {
+    const { sharedDependencies, sharedLibraries, mappedRemotes } = await (0, utils_1.getModuleFederationConfig)(options);
+    return (config, ctx) => {
+        config.output.uniqueName = options.name;
+        config.output.publicPath = 'auto';
+        config.optimization = {
+            runtimeChunk: false,
         };
-    });
+        config.experiments = {
+            ...config.experiments,
+            outputModule: true,
+        };
+        config.plugins.push(new ModuleFederationPlugin({
+            name: options.name,
+            library: options.library ?? { type: 'module' },
+            filename: 'remoteEntry.js',
+            exposes: options.exposes,
+            remotes: mappedRemotes,
+            shared: {
+                ...sharedDependencies,
+            },
+        }), sharedLibraries.getReplacementPlugin());
+        return config;
+    };
 }
 exports.withModuleFederation = withModuleFederation;

package/src/rules/update-module-federation-project.js

@@ -5,8 +5,15 @@ const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../utils/versions");
 function updateModuleFederationProject(host, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
-    projectConfig.targets.build.options = Object.assign(Object.assign({}, projectConfig.targets.build.options), { main: `${options.appProjectRoot}/src/main.ts`, webpackConfig: `${options.appProjectRoot}/webpack.config.js` });
-    projectConfig.targets.build.configurations.production = Object.assign(Object.assign({}, projectConfig.targets.build.configurations.production), { webpackConfig: `${options.appProjectRoot}/webpack.config.prod.js` });
+    projectConfig.targets.build.options = {
+        ...projectConfig.targets.build.options,
+        main: `${options.appProjectRoot}/src/main.ts`,
+        webpackConfig: `${options.appProjectRoot}/webpack.config.js`,
+    };
+    projectConfig.targets.build.configurations.production = {
+        ...projectConfig.targets.build.configurations.production,
+        webpackConfig: `${options.appProjectRoot}/webpack.config.prod.js`,
+    };
     projectConfig.targets.serve.executor =
         '@nx/react:module-federation-dev-server';
     projectConfig.targets.serve.options.port = options.devServerPort;

package/src/utils/ast-utils.js

@@ -107,7 +107,7 @@ function findExportDeclarationsForJsx(source) {
             ...(0, js_1.findNodes)(node, tsModule.SyntaxKind.ExportSpecifier),
         ];
     });
-    const componentNames = componentNamesNodes === null || componentNamesNodes === void 0 ? void 0 : componentNamesNodes.map((node) => node.getText());
+    const componentNames = componentNamesNodes?.map((node) => node.getText());
     const all = [...variables, ...variableStatements, ...fns, ...cls];
     let foundExport;
     let foundJSX;
@@ -116,27 +116,25 @@ function findExportDeclarationsForJsx(source) {
             tsModule.SyntaxKind.JsxSelfClosingElement,
             tsModule.SyntaxKind.JsxOpeningElement,
         ]);
-        return foundJSX === null || foundJSX === void 0 ? void 0 : foundJSX.length;
+        return foundJSX?.length;
     });
     const exported = nodesContainingJSX.filter((x) => {
-        var _a, _b, _c;
         foundExport = (0, js_1.findNodes)(x, tsModule.SyntaxKind.ExportKeyword);
         if (x.kind === tsModule.SyntaxKind.VariableStatement) {
-            const nameNode = (_a = (0, js_1.findNodes)(x, tsModule.SyntaxKind.VariableDeclaration)) === null || _a === void 0 ? void 0 : _a[0];
-            return (((_b = nameNode === null || nameNode === void 0 ? void 0 : nameNode.name) === null || _b === void 0 ? void 0 : _b.kind) === tsModule.SyntaxKind.Identifier ||
-                (foundExport === null || foundExport === void 0 ? void 0 : foundExport.length) ||
-                (componentNames === null || componentNames === void 0 ? void 0 : componentNames.includes((_c = nameNode === null || nameNode === void 0 ? void 0 : nameNode.name) === null || _c === void 0 ? void 0 : _c.getText())));
+            const nameNode = (0, js_1.findNodes)(x, tsModule.SyntaxKind.VariableDeclaration)?.[0];
+            return (nameNode?.name?.kind === tsModule.SyntaxKind.Identifier ||
+                foundExport?.length ||
+                componentNames?.includes(nameNode?.name?.getText()));
         }
         else {
             return ((x.name.kind === tsModule.SyntaxKind.Identifier &&
-                (foundExport === null || foundExport === void 0 ? void 0 : foundExport.length)) ||
-                (componentNames === null || componentNames === void 0 ? void 0 : componentNames.includes(x.name.getText())));
+                foundExport?.length) ||
+                componentNames?.includes(x.name.getText()));
         }
     });
     const exportedDeclarations = exported.map((x) => {
-        var _a;
         if (x.kind === tsModule.SyntaxKind.VariableStatement) {
-            const nameNode = (_a = (0, js_1.findNodes)(x, tsModule.SyntaxKind.VariableDeclaration)) === null || _a === void 0 ? void 0 : _a[0];
+            const nameNode = (0, js_1.findNodes)(x, tsModule.SyntaxKind.VariableDeclaration)?.[0];
             return nameNode;
         }
         return x;
@@ -473,14 +471,13 @@ function getComponentNode(sourceFile) {
 }
 exports.getComponentNode = getComponentNode;
 function getComponentPropsInterface(sourceFile, cmpDeclaration) {
-    var _a, _b, _c, _d;
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
     let propsTypeName = null;
     if (tsModule.isFunctionDeclaration(cmpDeclaration)) {
         const propsParam = cmpDeclaration.parameters.find((x) => tsModule.isParameter(x) && x.name.text === 'props');
-        if ((_a = propsParam === null || propsParam === void 0 ? void 0 : propsParam.type) === null || _a === void 0 ? void 0 : _a['typeName']) {
+        if (propsParam?.type?.['typeName']) {
             propsTypeName = propsParam.type.typeName.text;
         }
     }
@@ -489,7 +486,7 @@ function getComponentPropsInterface(sourceFile, cmpDeclaration) {
         const arrowFn = cmpDeclaration
             .initializer;
         const propsParam = arrowFn.parameters.find((x) => tsModule.isParameter(x) && x.name.text === 'props');
-        if ((_b = propsParam === null || propsParam === void 0 ? void 0 : propsParam.type) === null || _b === void 0 ? void 0 : _b['typeName']) {
+        if (propsParam?.type?.['typeName']) {
             propsTypeName = propsParam.type.typeName.text;
         }
     }
@@ -505,7 +502,7 @@ function getComponentPropsInterface(sourceFile, cmpDeclaration) {
                     x.expression.name.text;
                 return name === 'Component' || name === 'PureComponent';
             });
-            if ((_d = (_c = propsTypeExpression === null || propsTypeExpression === void 0 ? void 0 : propsTypeExpression.typeArguments) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d['typeName']) {
+            if (propsTypeExpression?.typeArguments?.[0]?.['typeName']) {
                 propsTypeName = propsTypeExpression.typeArguments[0].typeName.getText();
             }
         }

package/src/utils/create-ts-config.js

@@ -32,7 +32,10 @@ function createTsConfig(host, projectRoot, type, options, relativePathToRootTsCo
     // inline tsconfig.base.json into the project
     if (options.rootProject) {
         json.compileOnSave = false;
-        json.compilerOptions = Object.assign(Object.assign({}, shared.tsConfigBaseOptions), json.compilerOptions);
+        json.compilerOptions = {
+            ...shared.tsConfigBaseOptions,
+            ...json.compilerOptions,
+        };
         json.exclude = ['node_modules', 'tmp'];
     }
     else {
@@ -42,9 +45,8 @@ function createTsConfig(host, projectRoot, type, options, relativePathToRootTsCo
     const tsconfigProjectPath = `${projectRoot}/tsconfig.${type}.json`;
     if (options.bundler === 'vite' && host.exists(tsconfigProjectPath)) {
         (0, json_1.updateJson)(host, tsconfigProjectPath, (json) => {
-            var _a, _b;
-            (_a = json.compilerOptions) !== null && _a !== void 0 ? _a : (json.compilerOptions = {});
-            const types = new Set((_b = json.compilerOptions.types) !== null && _b !== void 0 ? _b : []);
+            json.compilerOptions ??= {};
+            const types = new Set(json.compilerOptions.types ?? []);
             types.add('node');
             types.add('vite/client');
             json.compilerOptions.types = Array.from(types);

package/src/utils/ct-utils.js

@@ -1,31 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isComponent = exports.getBundlerFromTarget = exports.addCTTargetWithBuildTarget = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const ast_utils_1 = require("./ast-utils");
 let tsModule;
 const allowedFileExt = new RegExp(/\.[jt]sx?/);
 const isSpecFile = new RegExp(/(spec|test)\./);
-function addCTTargetWithBuildTarget(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let found = { target: options.buildTarget, config: undefined };
-        // Specifically undefined as a workaround for Remix to pass an empty string as the buildTarget
-        if (options.buildTarget === undefined) {
-            const { findBuildConfig } = yield Promise.resolve().then(() => require('@nx/cypress/src/utils/find-target-options'));
-            found = yield findBuildConfig(tree, {
-                project: options.project,
-                buildTarget: options.buildTarget,
-                validExecutorNames: options.validExecutorNames,
-            });
-            assertValidConfig(found === null || found === void 0 ? void 0 : found.config);
-        }
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-        projectConfig.targets['component-test'].options = Object.assign(Object.assign({}, projectConfig.targets['component-test'].options), { devServerTarget: found.target, skipServe: true });
-        (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
-        return found;
-    });
+async function addCTTargetWithBuildTarget(tree, options) {
+    let found = { target: options.buildTarget, config: undefined };
+    // Specifically undefined as a workaround for Remix to pass an empty string as the buildTarget
+    if (options.buildTarget === undefined) {
+        const { findBuildConfig } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/find-target-options'));
+        found = await findBuildConfig(tree, {
+            project: options.project,
+            buildTarget: options.buildTarget,
+            validExecutorNames: options.validExecutorNames,
+        });
+        assertValidConfig(found?.config);
+    }
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    projectConfig.targets['component-test'].options = {
+        ...projectConfig.targets['component-test'].options,
+        devServerTarget: found.target,
+        skipServe: true,
+    };
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
+    return found;
 }
 exports.addCTTargetWithBuildTarget = addCTTargetWithBuildTarget;
 function assertValidConfig(config) {
@@ -33,22 +34,19 @@ function assertValidConfig(config) {
         throw new Error('Unable to find a valid build configuration. Try passing in a target for an app. --build-target=<project>:<target>[:<configuration>]');
     }
 }
-function getBundlerFromTarget(found, tree) {
-    var _a, _b, _c;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (found.target && ((_a = found.config) === null || _a === void 0 ? void 0 : _a.executor)) {
-            return found.config.executor === '@nrwl/vite:build' ||
-                found.config.executor === '@nx/vite:build'
-                ? 'vite'
-                : 'webpack';
-        }
-        const { target, project } = (0, devkit_1.parseTargetString)(found.target, yield (0, devkit_1.createProjectGraphAsync)());
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
-        const executor = (_c = (_b = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _b === void 0 ? void 0 : _b[target]) === null || _c === void 0 ? void 0 : _c.executor;
-        return executor === '@nrwl/vite:build' || executor === '@nx/vite:build'
+async function getBundlerFromTarget(found, tree) {
+    if (found.target && found.config?.executor) {
+        return found.config.executor === '@nrwl/vite:build' ||
+            found.config.executor === '@nx/vite:build'
             ? 'vite'
             : 'webpack';
-    });
+    }
+    const { target, project } = (0, devkit_1.parseTargetString)(found.target, await (0, devkit_1.createProjectGraphAsync)());
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
+    const executor = projectConfig?.targets?.[target]?.executor;
+    return executor === '@nrwl/vite:build' || executor === '@nx/vite:build'
+        ? 'vite'
+        : 'webpack';
 }
 exports.getBundlerFromTarget = getBundlerFromTarget;
 function isComponent(tree, filePath) {

package/src/utils/lint.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extendReactEslintJson = exports.extraEslintDependencies = void 0;
-const tslib_1 = require("tslib");
 const versions_1 = require("./versions");
 exports.extraEslintDependencies = {
     dependencies: {},
@@ -16,7 +15,10 @@ exports.extraEslintDependencies = {
  * @deprecated Use `addExtendsToLintConfig` from `@nx/linter` instead.
  */
 const extendReactEslintJson = (json) => {
-    const { extends: pluginExtends } = json, config = tslib_1.__rest(json, ["extends"]);
-    return Object.assign({ extends: ['plugin:@nx/react', ...(pluginExtends || [])] }, config);
+    const { extends: pluginExtends, ...config } = json;
+    return {
+        extends: ['plugin:@nx/react', ...(pluginExtends || [])],
+        ...config,
+    };
 };
 exports.extendReactEslintJson = extendReactEslintJson;

package/src/utils/testing-generators.js

@@ -1,35 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLib = exports.createApp = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const application_1 = require("../generators/application/application");
 const linter_1 = require("@nx/linter");
-function createApp(tree, appName) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, application_1.default)(tree, {
-            e2eTestRunner: 'none',
-            linter: linter_1.Linter.EsLint,
-            skipFormat: true,
-            style: 'css',
-            unitTestRunner: 'none',
-            name: appName,
-            projectNameAndRootFormat: 'as-provided',
-        });
+async function createApp(tree, appName) {
+    await (0, application_1.default)(tree, {
+        e2eTestRunner: 'none',
+        linter: linter_1.Linter.EsLint,
+        skipFormat: true,
+        style: 'css',
+        unitTestRunner: 'none',
+        name: appName,
+        projectNameAndRootFormat: 'as-provided',
     });
 }
 exports.createApp = createApp;
-function createLib(tree, libName) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { fileName } = (0, devkit_1.names)(libName);
-        tree.write(`/${fileName}/src/index.ts`, `import React from 'react';\n`);
-        (0, devkit_1.addProjectConfiguration)(tree, fileName, {
-            tags: [],
-            root: `${fileName}`,
-            projectType: 'library',
-            sourceRoot: `${fileName}/src`,
-            targets: {},
-        });
+async function createLib(tree, libName) {
+    const { fileName } = (0, devkit_1.names)(libName);
+    tree.write(`/${fileName}/src/index.ts`, `import React from 'react';\n`);
+    (0, devkit_1.addProjectConfiguration)(tree, fileName, {
+        tags: [],
+        root: `${fileName}`,
+        projectType: 'library',
+        sourceRoot: `${fileName}/src`,
+        targets: {},
     });
 }
 exports.createLib = createLib;