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

package/src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 // nx-ignore-next-line
 const path = require("path");
@@ -9,39 +8,35 @@ const versions_1 = require("../../utils/versions");
 const path_1 = require("path");
 const PROJECT_NAME = 'workspace-plugin';
 const DESTINATION = `tools/${PROJECT_NAME}`;
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (!tree.exists('tools/generators')) {
-            return;
-        }
-        const tasks = [];
-        if (hasWorkspaceGenerators(tree)) {
-            tasks.push(...(yield moveWorkspaceGeneratorsToLocalPlugin(tree)));
+async function default_1(tree) {
+    if (!tree.exists('tools/generators')) {
+        return;
+    }
+    const tasks = [];
+    if (hasWorkspaceGenerators(tree)) {
+        tasks.push(...(await moveWorkspaceGeneratorsToLocalPlugin(tree)));
+    }
+    removeToolsGeneratorsIfEmpty(tree);
+    await (0, devkit_1.formatFiles)(tree);
+    return () => {
+        for (const task of tasks) {
+            task();
         }
-        removeToolsGeneratorsIfEmpty(tree);
-        yield (0, devkit_1.formatFiles)(tree);
-        return () => {
-            for (const task of tasks) {
-                task();
-            }
-        };
-    });
+    };
 }
 exports.default = default_1;
-function moveWorkspaceGeneratorsToLocalPlugin(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        let project = (0, devkit_1.getProjects)(tree).get(PROJECT_NAME);
-        if (!project) {
-            yield createNewPlugin(tree);
-            tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-                '@nx/plugin': versions_1.nxVersion,
-            }));
-            project = (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME);
-        }
-        yield updateExistingPlugin(tree, project);
-        return tasks;
-    });
+async function moveWorkspaceGeneratorsToLocalPlugin(tree) {
+    const tasks = [];
+    let project = (0, devkit_1.getProjects)(tree).get(PROJECT_NAME);
+    if (!project) {
+        await createNewPlugin(tree);
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            '@nx/plugin': versions_1.nxVersion,
+        }));
+        project = (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME);
+    }
+    await updateExistingPlugin(tree, project);
+    return tasks;
 }
 function hasWorkspaceGenerators(tree) {
     const children = tree.children('tools/generators');
@@ -55,7 +50,6 @@ function removeToolsGeneratorsIfEmpty(tree) {
 }
 // Inspired by packages/nx/src/command-line/workspace-generators.ts
 function collectAndMoveGenerators(tree, destinationProjectRoot) {
-    var _a;
     const generators = {};
     const generatorsDir = 'tools/generators';
     const destinationDir = (0, devkit_1.joinPathFragments)(destinationProjectRoot, 'src', 'generators');
@@ -67,7 +61,7 @@ function collectAndMoveGenerators(tree, destinationProjectRoot) {
             generators[c] = {
                 implementation: `./src/generators/${c}`,
                 schema: `./src/generators/${(0, devkit_1.joinPathFragments)(c, 'schema.json')}`,
-                description: (_a = schema.description) !== null && _a !== void 0 ? _a : `Generator ${c}`,
+                description: schema.description ?? `Generator ${c}`,
             };
             moveFilesInDirectory(tree, childDir, (0, devkit_1.joinPathFragments)(destinationDir, c));
         }
@@ -113,32 +107,30 @@ function moveFilesInDirectory(tree, source, destination) {
         tree.rename((0, devkit_1.joinPathFragments)(source, c), (0, devkit_1.joinPathFragments)(destination, c));
     }
 }
-function createNewPlugin(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, devkit_1.ensurePackage)('@nx/plugin', versions_1.nxVersion);
-        const { pluginGenerator } = 
-        // nx-ignore-next-line
-        require('@nx/plugin/src/generators/plugin/plugin');
-        // nx-ignore-next-line
-        const { Linter } = (0, devkit_1.ensurePackage)('@nx/linter', versions_1.nxVersion);
-        const { npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
-        const importPath = npmScope ? `@${npmScope}/${PROJECT_NAME}` : PROJECT_NAME;
-        yield pluginGenerator(tree, {
-            minimal: true,
-            name: PROJECT_NAME,
-            importPath: importPath,
-            skipTsConfig: false,
-            compiler: 'tsc',
-            linter: Linter.EsLint,
-            skipFormat: true,
-            skipLintChecks: false,
-            unitTestRunner: 'jest',
-            e2eTestRunner: 'none',
-            publishable: false,
-        });
-        getCreateGeneratorsJson()(tree, (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME).root, PROJECT_NAME);
-        yield moveGeneratedPlugin(tree, DESTINATION, importPath);
+async function createNewPlugin(tree) {
+    (0, devkit_1.ensurePackage)('@nx/plugin', versions_1.nxVersion);
+    const { pluginGenerator } = 
+    // nx-ignore-next-line
+    require('@nx/plugin/src/generators/plugin/plugin');
+    // nx-ignore-next-line
+    const { Linter } = (0, devkit_1.ensurePackage)('@nx/linter', versions_1.nxVersion);
+    const { npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
+    const importPath = npmScope ? `@${npmScope}/${PROJECT_NAME}` : PROJECT_NAME;
+    await pluginGenerator(tree, {
+        minimal: true,
+        name: PROJECT_NAME,
+        importPath: importPath,
+        skipTsConfig: false,
+        compiler: 'tsc',
+        linter: Linter.EsLint,
+        skipFormat: true,
+        skipLintChecks: false,
+        unitTestRunner: 'jest',
+        e2eTestRunner: 'none',
+        publishable: false,
     });
+    getCreateGeneratorsJson()(tree, (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME).root, PROJECT_NAME);
+    await moveGeneratedPlugin(tree, DESTINATION, importPath);
 }
 function moveGeneratedPlugin(tree, destination, importPath) {
     const config = (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME);
@@ -166,9 +158,8 @@ function updateExistingPlugin(tree, project) {
         generatorsJsonPath = defaultGeneratorsPath;
     }
     (0, devkit_1.updateJson)(tree, generatorsJsonPath, (json) => {
-        var _a;
         const generators = collectAndMoveGenerators(tree, project.root);
-        (_a = json.generators) !== null && _a !== void 0 ? _a : (json.generators = {});
+        json.generators ??= {};
         for (const generator in generators) {
             if (json.generators[generator]) {
                 devkit_1.output.warn({

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-function replacePackage(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/workspace', '@nx/workspace');
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function replacePackage(tree) {
+    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/workspace', '@nx/workspace');
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = replacePackage;

package/src/utilities/buildable-libs-utils.js

@@ -121,7 +121,6 @@ function computeCompilerOptionsPaths(tsConfig, dependencies) {
     return paths;
 }
 function readPaths(tsConfig) {
-    var _a;
     if (!tsModule) {
         tsModule = (0, typescript_1.ensureTypescript)();
     }
@@ -134,7 +133,7 @@ function readPaths(tsConfig) {
         else {
             config = tsConfig;
         }
-        if ((_a = config.options) === null || _a === void 0 ? void 0 : _a.paths) {
+        if (config.options?.paths) {
             return config.options.paths;
         }
         else {
@@ -209,7 +208,6 @@ function updatePaths(dependencies, paths) {
     const pathsKeys = Object.keys(paths);
     // For each registered dependency
     dependencies.forEach((dep) => {
-        var _a;
         // If there are outputs
         if (dep.outputs && dep.outputs.length > 0) {
             // Directly map the dependency name to the output paths (dist/packages/..., etc.)
@@ -224,7 +222,7 @@ function updatePaths(dependencies, paths) {
                     // Bind secondary endpoints for ng-packagr projects
                     let mappedPaths = dep.outputs.map((output) => `${output}/${nestedPart}`);
                     // Get the dependency's package name
-                    const { root } = (((_a = dep.node) === null || _a === void 0 ? void 0 : _a.data) || {});
+                    const { root } = (dep.node?.data || {});
                     if (root) {
                         // Update nested mappings to point to the dependency's output paths
                         mappedPaths = mappedPaths.concat(paths[path].flatMap((path) => dep.outputs.map((output) => path.replace(root, output))));
@@ -265,7 +263,6 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
     packageJson.peerDependencies = packageJson.peerDependencies || {};
     let updatePackageJson = false;
     dependencies.forEach((entry) => {
-        var _a;
         const packageName = (0, operators_1.isNpmProject)(entry.node)
             ? entry.node.data.packageName
             : entry.name;
@@ -289,7 +286,7 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
                 }
                 else if ((0, operators_1.isNpmProject)(entry.node)) {
                     // If an npm dep is part of the workspace devDependencies, do not include it the library
-                    if (!!((_a = workspacePackageJson.devDependencies) === null || _a === void 0 ? void 0 : _a[entry.node.data.packageName])) {
+                    if (!!workspacePackageJson.devDependencies?.[entry.node.data.packageName]) {
                         return;
                     }
                     depVersion = entry.node.data.version;

package/src/utilities/default-base.js

@@ -8,7 +8,7 @@ function deduceDefaultBase() {
         return ((0, child_process_1.execSync)('git config --get init.defaultBranch').toString().trim() ||
             nxDefaultBase);
     }
-    catch (_a) {
+    catch {
         return nxDefaultBase;
     }
 }

package/src/utilities/get-import-path.js

@@ -19,7 +19,7 @@ function getNpmScope(tree) {
     const { name } = tree.exists('package.json')
         ? (0, json_1.readJson)(tree, 'package.json')
         : { name: null };
-    if (name === null || name === void 0 ? void 0 : name.startsWith('@')) {
+    if (name?.startsWith('@')) {
         return name.split('/')[0].substring(1);
     }
 }

package/src/utilities/run-tasks-in-serial.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runTasksInSerial = void 0;
-const tslib_1 = require("tslib");
 /**
  * Run tasks in serial
  *
@@ -9,10 +8,10 @@ const tslib_1 = require("tslib");
  * @param tasks The tasks to run in serial.
  */
 function runTasksInSerial(...tasks) {
-    return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+    return async () => {
         for (const task of tasks) {
-            yield task();
+            await task();
         }
-    });
+    };
 }
 exports.runTasksInSerial = runTasksInSerial;

package/src/utilities/typescript/compilation.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileTypeScriptWatcher = exports.compileTypeScript = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 const ts_config_1 = require("../ts-config");
@@ -30,8 +29,7 @@ function compileTypeScriptWatcher(options, callback) {
     host.afterProgramCreate = (builderProgram) => {
         const originalProgramEmit = builderProgram.emit;
         builderProgram.emit = (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) => {
-            var _a;
-            const consumerCustomTransformers = (_a = options.getCustomTransformers) === null || _a === void 0 ? void 0 : _a.call(options, builderProgram.getProgram());
+            const consumerCustomTransformers = options.getCustomTransformers?.(builderProgram.getProgram());
             const mergedCustomTransformers = mergeCustomTransformers(customTransformers, consumerCustomTransformers);
             return originalProgramEmit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, mergedCustomTransformers);
         };
@@ -39,10 +37,10 @@ function compileTypeScriptWatcher(options, callback) {
             originalAfterProgramCreate(builderProgram);
     };
     const originalOnWatchStatusChange = host.onWatchStatusChange;
-    host.onWatchStatusChange = (a, b, c, d) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-        originalOnWatchStatusChange === null || originalOnWatchStatusChange === void 0 ? void 0 : originalOnWatchStatusChange(a, b, c, d);
-        yield (callback === null || callback === void 0 ? void 0 : callback(a, b, c, d));
-    });
+    host.onWatchStatusChange = async (a, b, c, d) => {
+        originalOnWatchStatusChange?.(a, b, c, d);
+        await callback?.(a, b, c, d);
+    };
     return tsModule.createWatchProgram(host);
 }
 exports.compileTypeScriptWatcher = compileTypeScriptWatcher;
@@ -51,7 +49,7 @@ function mergeCustomTransformers(originalCustomTransformers, consumerCustomTrans
         return originalCustomTransformers;
     const mergedCustomTransformers = {};
     if (consumerCustomTransformers.before) {
-        mergedCustomTransformers.before = (originalCustomTransformers === null || originalCustomTransformers === void 0 ? void 0 : originalCustomTransformers.before)
+        mergedCustomTransformers.before = originalCustomTransformers?.before
             ? [
                 ...originalCustomTransformers.before,
                 ...consumerCustomTransformers.before,
@@ -59,7 +57,7 @@ function mergeCustomTransformers(originalCustomTransformers, consumerCustomTrans
             : consumerCustomTransformers.before;
     }
     if (consumerCustomTransformers.after) {
-        mergedCustomTransformers.after = (originalCustomTransformers === null || originalCustomTransformers === void 0 ? void 0 : originalCustomTransformers.after)
+        mergedCustomTransformers.after = originalCustomTransformers?.after
             ? [
                 ...originalCustomTransformers.after,
                 ...consumerCustomTransformers.after,
@@ -68,7 +66,7 @@ function mergeCustomTransformers(originalCustomTransformers, consumerCustomTrans
     }
     if (consumerCustomTransformers.afterDeclarations) {
         mergedCustomTransformers.afterDeclarations =
-            (originalCustomTransformers === null || originalCustomTransformers === void 0 ? void 0 : originalCustomTransformers.afterDeclarations)
+            originalCustomTransformers?.afterDeclarations
                 ? [
                     ...originalCustomTransformers.afterDeclarations,
                     ...consumerCustomTransformers.afterDeclarations,
@@ -98,7 +96,7 @@ function createProgram(tsconfig, { projectName, getCustomTransformers }) {
         host,
     });
     devkit_1.logger.info(`Compiling TypeScript files for project "${projectName}"...`);
-    const results = program.emit(undefined, undefined, undefined, undefined, getCustomTransformers === null || getCustomTransformers === void 0 ? void 0 : getCustomTransformers(program));
+    const results = program.emit(undefined, undefined, undefined, undefined, getCustomTransformers?.(program));
     if (results.emitSkipped) {
         const diagnostics = tsModule.formatDiagnosticsWithColorAndContext(results.diagnostics, {
             getCurrentDirectory: () => tsModule.sys.getCurrentDirectory(),
@@ -114,6 +112,9 @@ function createProgram(tsconfig, { projectName, getCustomTransformers }) {
     }
 }
 function normalizeOptions(options) {
-    var _a, _b;
-    return Object.assign(Object.assign({}, options), { deleteOutputPath: (_a = options.deleteOutputPath) !== null && _a !== void 0 ? _a : true, rootDir: (_b = options.rootDir) !== null && _b !== void 0 ? _b : options.projectRoot });
+    return {
+        ...options,
+        deleteOutputPath: options.deleteOutputPath ?? true,
+        rootDir: options.rootDir ?? options.projectRoot,
+    };
 }

package/src/utils/rules/format-files.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatFiles = void 0;
-const tslib_1 = require("tslib");
 const schematics_1 = require("@angular-devkit/schematics");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
@@ -32,28 +31,31 @@ function formatFiles(options = { skipFormat: false }, directory = '') {
         if (files.size === 0) {
             return host;
         }
-        return (0, rxjs_1.from)(files).pipe((0, operators_1.filter)((file) => host.exists(file.path)), (0, operators_1.mergeMap)((file) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, rxjs_1.from)(files).pipe((0, operators_1.filter)((file) => host.exists(file.path)), (0, operators_1.mergeMap)(async (file) => {
             const systemPath = path.join(devkit_1.workspaceRoot, file.path);
             let options = {
                 filepath: systemPath,
             };
-            const resolvedOptions = yield prettier.resolveConfig(systemPath);
+            const resolvedOptions = await prettier.resolveConfig(systemPath);
             if (resolvedOptions) {
-                options = Object.assign(Object.assign({}, options), resolvedOptions);
+                options = {
+                    ...options,
+                    ...resolvedOptions,
+                };
             }
-            const support = yield prettier.getFileInfo(systemPath, options);
+            const support = await prettier.getFileInfo(systemPath, options);
             if (support.ignored || !support.inferredParser) {
                 return;
             }
             try {
                 host.overwrite(file.path, 
                 // In prettier v3 the format result is a promise
-                yield prettier.format(file.content, options));
+                await prettier.format(file.content, options));
             }
             catch (e) {
                 context.logger.warn(`Could not format ${file.path} because ${e.message}`);
             }
-        })), (0, operators_1.map)(() => host));
+        }), (0, operators_1.map)(() => host));
     };
 }
 exports.formatFiles = formatFiles;

package/src/utils/rules/visit-not-ignored-files.js

@@ -15,12 +15,12 @@ function visitNotIgnoredFiles(visitor, dir = (0, core_1.normalize)('')) {
             ig.add(host.read('.gitignore').toString());
         }
         function visit(_dir) {
-            if (_dir && (ig === null || ig === void 0 ? void 0 : ig.ignores(_dir))) {
+            if (_dir && ig?.ignores(_dir)) {
                 return;
             }
             const dirEntry = host.getDir(_dir);
             dirEntry.subfiles.forEach((file) => {
-                if (ig === null || ig === void 0 ? void 0 : ig.ignores((0, core_1.join)(_dir, file))) {
+                if (ig?.ignores((0, core_1.join)(_dir, file))) {
                     return;
                 }
                 const maybeRule = visitor((0, core_1.join)(_dir, file), host, context);

package/src/utils/testing-utils.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MockBuilderContext = exports.createEmptyWorkspace = exports.getFileContent = void 0;
-const tslib_1 = require("tslib");
 const core_1 = require("@angular-devkit/core/src/workspace/core");
 /**
  * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. Use tree.read(filePath, 'utf-8') instead.
@@ -107,15 +106,11 @@ class MockBuilderContext {
         };
         this.logger = new NoopLogger();
     }
-    addBuilderFromPackage(path) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return yield this.architectHost.addBuilderFromPackage(path);
-        });
+    async addBuilderFromPackage(path) {
+        return await this.architectHost.addBuilderFromPackage(path);
     }
-    addTarget(target, builderName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return this.architectHost.addTarget(target, builderName);
-        });
+    async addTarget(target, builderName) {
+        return this.architectHost.addTarget(target, builderName);
     }
     getBuilderNameForTarget(target) {
         return this.architectHost.getBuilderNameForTarget(target);
@@ -136,11 +131,9 @@ class MockBuilderContext {
     reportStatus(status) { }
     reportProgress(current, total, status) { }
     addTeardown(teardown) { }
-    getProjectMetadata(target) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return (this.architectHost &&
-                this.architectHost.getProjectMetadata(target));
-        });
+    async getProjectMetadata(target) {
+        return (this.architectHost &&
+            this.architectHost.getProjectMetadata(target));
     }
 }
 exports.MockBuilderContext = MockBuilderContext;

package/src/utils/workspace.js

@@ -1,69 +1,58 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateBuilderConfig = exports.updateWorkspace = exports.getWorkspace = void 0;
-const tslib_1 = require("tslib");
 const core_1 = require("@angular-devkit/core");
 function createHost(tree) {
     return {
-        readFile(path) {
-            return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                const data = tree.read(path);
-                if (!data) {
-                    throw new Error('File not found.');
-                }
-                return data.toString();
-            });
+        async readFile(path) {
+            const data = tree.read(path);
+            if (!data) {
+                throw new Error('File not found.');
+            }
+            return data.toString();
         },
-        writeFile(path, data) {
-            return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                return tree.overwrite(path, data);
-            });
+        async writeFile(path, data) {
+            return tree.overwrite(path, data);
         },
-        isDirectory(path) {
-            return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                // approximate a directory check
-                // special case needed when testing wrapped schematics
-                if (path === '/')
-                    return true;
-                return !tree.exists(path) && tree.getDir(path).subfiles.length > 0;
-            });
+        async isDirectory(path) {
+            // approximate a directory check
+            // special case needed when testing wrapped schematics
+            if (path === '/')
+                return true;
+            return !tree.exists(path) && tree.getDir(path).subfiles.length > 0;
         },
-        isFile(path) {
-            return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                return tree.exists(path);
-            });
+        async isFile(path) {
+            return tree.exists(path);
         },
     };
 }
 /**
  * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. This function can be replaced with 'getProjects' with Nx Devkit.
  */
-function getWorkspace(tree, path = '/') {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const host = createHost(tree);
-        const { workspace } = yield core_1.workspaces.readWorkspace(path, host);
-        return workspace;
-    });
+async function getWorkspace(tree, path = '/') {
+    const host = createHost(tree);
+    const { workspace } = await core_1.workspaces.readWorkspace(path, host);
+    return workspace;
 }
 exports.getWorkspace = getWorkspace;
 /**
  * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. This function can be replaced with 'updateProjectConfiguration' with Nx Devkit.
  */
 function updateWorkspace(updaterOrWorkspace) {
-    return (tree) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+    return async (tree) => {
         const host = createHost(tree);
         if (typeof updaterOrWorkspace === 'function') {
-            const { workspace } = yield core_1.workspaces.readWorkspace('/', host);
+            const { workspace } = await core_1.workspaces.readWorkspace('/', host);
             const result = updaterOrWorkspace(workspace);
             if (result !== undefined) {
-                yield result;
+                await result;
             }
-            yield core_1.workspaces.writeWorkspace(workspace, host);
+            await core_1.workspaces.writeWorkspace(workspace, host);
         }
         else {
-            yield core_1.workspaces.writeWorkspace(updaterOrWorkspace, host);
+            await core_1.workspaces.writeWorkspace(updaterOrWorkspace, host);
         }
-    });
+    };
 }
 exports.updateWorkspace = updateWorkspace;
 /**