@pnp/cli-microsoft365 6.0.0-beta.37b9374 → 6.0.0-beta.3da776c

package/dist/m365/pp/commands/tenant/tenant-settings-list.js

@@ -0,0 +1,45 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
+const commands_1 = require("../../commands");
+class PpTenantSettingsListCommand extends PowerPlatformCommand_1.default {
+    get name() {
+        return commands_1.default.TENANT_SETTINGS_LIST;
+    }
+    get description() {
+        return 'Lists the global Power Platform tenant settings';
+    }
+    defaultProperties() {
+        return ['disableCapacityAllocationByEnvironmentAdmins', 'disableEnvironmentCreationByNonAdminUsers', 'disableNPSCommentsReachout', 'disablePortalsCreationByNonAdminUsers', 'disableSupportTicketsVisibleByAllUsers', 'disableSurveyFeedback', 'disableTrialEnvironmentCreationByNonAdminUsers', 'walkMeOptOut'];
+    }
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.BusinessAppPlatform/listtenantsettings?api-version=2020-10-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+module.exports = new PpTenantSettingsListCommand();
+//# sourceMappingURL=tenant-settings-list.js.map

package/dist/m365/pp/commands.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'pp';
 exports.default = {
+    DATAVERSE_TABLE_LIST: `${prefix} dataverse table list`,
     ENVIRONMENT_LIST: `${prefix} environment list`,
     GATEWAY_LIST: `${prefix} gateway list`,
     MANAGEMENTAPP_ADD: `${prefix} managementapp add`,
-    MANAGEMENTAPP_LIST: `${prefix} managementapp list`
+    MANAGEMENTAPP_LIST: `${prefix} managementapp list`,
+    TENANT_SETTINGS_LIST: `${prefix} tenant settings list`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/search/commands/externalconnection/externalconnection-add.js

@@ -32,31 +32,36 @@ class SearchExternalConnectionAddCommand extends GraphCommand_1.default {
     get description() {
         return 'Adds a new External Connection for Microsoft Search';
     }
-    commandAction(logger, args, cb) {
-        let appIds = [];
-        if (args.options.authorizedAppIds !== undefined &&
-            args.options.authorizedAppIds !== '') {
-            appIds = args.options.authorizedAppIds.split(',');
-        }
-        const commandData = {
-            id: args.options.id,
-            name: args.options.name,
-            description: args.options.description,
-            configuration: {
-                authorizedAppIds: appIds
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let appIds = [];
+            if (args.options.authorizedAppIds !== undefined &&
+                args.options.authorizedAppIds !== '') {
+                appIds = args.options.authorizedAppIds.split(',');
+            }
+            const commandData = {
+                id: args.options.id,
+                name: args.options.name,
+                description: args.options.description,
+                configuration: {
+                    authorizedAppIds: appIds
+                }
+            };
+            const requestOptions = {
+                url: `${this.resource}/v1.0/external/connections`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: commandData
+            };
+            try {
+                yield request_1.default.post(requestOptions);
             }
-        };
-        const requestOptions = {
-            url: `${this.resource}/v1.0/external/connections`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: commandData
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), err => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SearchExternalConnectionAddCommand_instances = new WeakSet(), _SearchExternalConnectionAddCommand_initTelemetry = function _SearchExternalConnectionAddCommand_initTelemetry() {

package/dist/m365/search/commands/externalconnection/externalconnection-get.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
@@ -23,36 +32,36 @@ class SearchExternalConnectionGetCommand extends GraphCommand_1.default {
     get description() {
         return 'Get a specific external connection for use in Microsoft Search';
     }
-    commandAction(logger, args, cb) {
-        let url = `${this.resource}/v1.0/external/connections`;
-        if (args.options.id) {
-            url += `/${encodeURIComponent(args.options.id)}`;
-        }
-        else {
-            url += `?$filter=name eq '${encodeURIComponent(args.options.name)}'`;
-        }
-        const requestOptions = {
-            url: url,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (args.options.name) {
-                if (res.value.length === 0) {
-                    return Promise.reject(`External connection with name '${args.options.name}' not found`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let url = `${this.resource}/v1.0/external/connections`;
+            if (args.options.id) {
+                url += `/${encodeURIComponent(args.options.id)}`;
+            }
+            else {
+                url += `?$filter=name eq '${encodeURIComponent(args.options.name)}'`;
+            }
+            const requestOptions = {
+                url: url,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            try {
+                let res = yield request_1.default.get(requestOptions);
+                if (args.options.name) {
+                    if (res.value.length === 0) {
+                        throw `External connection with name '${args.options.name}' not found`;
+                    }
+                    res = res.value[0];
                 }
-                res = res.value[0];
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            return Promise.resolve(res);
-        })
-            .then(res => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _SearchExternalConnectionGetCommand_instances = new WeakSet(), _SearchExternalConnectionGetCommand_initTelemetry = function _SearchExternalConnectionGetCommand_initTelemetry() {

package/dist/m365/search/commands/externalconnection/externalconnection-list.js

@@ -1,7 +1,16 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const GraphCommand_1 = require("../../../base/GraphCommand");
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const commands_1 = require("../../commands");
 class SearchExternalConnectionListCommand extends GraphCommand_1.default {
     get name() {
@@ -13,13 +22,16 @@ class SearchExternalConnectionListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'name', 'state'];
     }
-    commandAction(logger, args, cb) {
-        utils_1.odata
-            .getAllItems(`${this.resource}/v1.0/external/connections`)
-            .then((connections) => {
-            logger.log(connections);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const connections = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/external/connections`);
+                logger.log(connections);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 module.exports = new SearchExternalConnectionListCommand();

package/dist/m365/search/commands/externalconnection/externalconnection-remove.js

@@ -0,0 +1,108 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SearchExternalConnectionRemoveCommand_instances, _SearchExternalConnectionRemoveCommand_initTelemetry, _SearchExternalConnectionRemoveCommand_initOptions, _SearchExternalConnectionRemoveCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class SearchExternalConnectionRemoveCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _SearchExternalConnectionRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initOptionSets).call(this);
+    }
+    get name() {
+        return commands_1.default.EXTERNALCONNECTION_REMOVE;
+    }
+    get description() {
+        return 'Removes a specific External Connection from Microsoft Search';
+    }
+    getExternalConnectionId(args) {
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/external/connections?$filter=name eq '${encodeURIComponent(args.options.name)}'&$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((res) => {
+            if (res.value.length === 1) {
+                return Promise.resolve(res.value[0].id);
+            }
+            if (res.value.length === 0) {
+                return Promise.reject(`The specified connection does not exist in Microsoft Search`);
+            }
+            return Promise.reject(`Multiple external connections with name ${args.options.name} found. Please disambiguate (IDs): ${res.value.map(x => x.id).join(', ')}`);
+        });
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeExternalConnection = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const externalConnectionId = yield this.getExternalConnectionId(args);
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/external/connections/${encodeURIComponent(externalConnectionId)}`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield removeExternalConnection();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the external connection '${args.options.id || args.options.name}'?`
+                });
+                if (result.continue) {
+                    yield removeExternalConnection();
+                }
+            }
+        });
+    }
+}
+_SearchExternalConnectionRemoveCommand_instances = new WeakSet(), _SearchExternalConnectionRemoveCommand_initTelemetry = function _SearchExternalConnectionRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SearchExternalConnectionRemoveCommand_initOptions = function _SearchExternalConnectionRemoveCommand_initOptions() {
+    this.options.unshift({ option: '--id [id]' }, { option: '--name [name]' }, { option: '--confirm' });
+}, _SearchExternalConnectionRemoveCommand_initOptionSets = function _SearchExternalConnectionRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+};
+module.exports = new SearchExternalConnectionRemoveCommand();
+//# sourceMappingURL=externalconnection-remove.js.map

package/dist/m365/search/commands.js

@@ -4,6 +4,7 @@ const prefix = 'search';
 exports.default = {
     EXTERNALCONNECTION_ADD: `${prefix} externalconnection add`,
     EXTERNALCONNECTION_GET: `${prefix} externalconnection get`,
-    EXTERNALCONNECTION_LIST: `${prefix} externalconnection list`
+    EXTERNALCONNECTION_LIST: `${prefix} externalconnection list`,
+    EXTERNALCONNECTION_REMOVE: `${prefix} externalconnection remove`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/spfx/commands/package/package-generate.js

@@ -20,7 +20,7 @@ const fs = require("fs");
 const os = require("os");
 const path = require("path");
 const uuid_1 = require("uuid");
-const utils_1 = require("../../../../utils");
+const fsUtil_1 = require("../../../../utils/fsUtil");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
@@ -37,119 +37,126 @@ class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
     get description() {
         return 'Generates SharePoint Framework solution package with a no-framework web part rendering the specified HTML snippet';
     }
-    commandAction(logger, args, cb) {
-        const supportedHosts = ['SharePointWebPart'];
-        if (args.options.enableForTeams === 'tab' || args.options.enableForTeams === 'all') {
-            supportedHosts.push('TeamsTab');
-        }
-        if (args.options.enableForTeams === 'personalApp' || args.options.enableForTeams === 'all') {
-            supportedHosts.push('TeamsPersonalApp');
-        }
-        const tokens = {
-            clientSideAssetsFeatureId: SpfxPackageGenerateCommand.generateNewId(),
-            developerName: args.options.developerName || 'Contoso',
-            developerWebsiteUrl: args.options.developerWebsiteUrl || 'https://contoso.com/my-app',
-            developerPrivacyUrl: args.options.developerPrivacyUrl || 'https://contoso.com/privacy',
-            developerTermsOfUseUrl: args.options.developerTermsOfUseUrl || 'https://contoso.com/terms-of-use',
-            developerMpnId: args.options.developerMpnId || '000000',
-            exposePageContextGlobally: args.options.exposePageContextGlobally ? '!0' : '!1',
-            exposeTeamsContextGlobally: args.options.exposeTeamsContextGlobally ? '!0' : '!1',
-            html: args.options.html.replace(/"/g, '\\"').replace(/\r\n/g, ' ').replace(/\n/g, ' '),
-            packageName: SpfxPackageGenerateCommand.getSafePackageName(args.options.webPartTitle),
-            productId: SpfxPackageGenerateCommand.generateNewId(),
-            skipFeatureDeployment: (args.options.allowTenantWideDeployment === true).toString(),
-            supportedHosts: JSON.stringify(supportedHosts).replace(/"/g, '"'),
-            webPartId: SpfxPackageGenerateCommand.generateNewId(),
-            webPartFeatureName: `${args.options.webPartTitle} Feature`,
-            webPartFeatureDescription: `A feature which activates the Client-Side WebPart named ${args.options.webPartTitle}`,
-            webPartAlias: SpfxPackageGenerateCommand.getWebPartAlias(args.options.webPartTitle),
-            webPartName: args.options.webPartTitle,
-            webPartSafeName: SpfxPackageGenerateCommand.getSafeWebPartName(args.options.webPartTitle),
-            webPartDescription: args.options.webPartDescription,
-            webPartModule: SpfxPackageGenerateCommand.getSafePackageName(args.options.webPartTitle)
-        };
-        let tmpDir = undefined;
-        let error;
-        try {
-            if (this.verbose) {
-                logger.log(`Creating temp folder...`);
-            }
-            tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'cli-spfx'));
-            if (this.debug) {
-                logger.log(`Temp folder created at ${tmpDir}`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const supportedHosts = ['SharePointWebPart'];
+            if (args.options.enableForTeams === 'tab' || args.options.enableForTeams === 'all') {
+                supportedHosts.push('TeamsTab');
             }
-            if (this.verbose) {
-                logger.log('Copying files...');
+            if (args.options.enableForTeams === 'personalApp' || args.options.enableForTeams === 'all') {
+                supportedHosts.push('TeamsPersonalApp');
             }
-            const src = path.join(__dirname, 'package-generate', 'assets');
-            utils_1.fsUtil.copyRecursiveSync(src, tmpDir, s => SpfxPackageGenerateCommand.replaceTokens(s, tokens));
-            const files = utils_1.fsUtil.readdirR(tmpDir);
-            if (this.verbose) {
-                logger.log('Processing files...');
-            }
-            files.forEach(filePath => {
+            const tokens = {
+                clientSideAssetsFeatureId: SpfxPackageGenerateCommand.generateNewId(),
+                developerName: args.options.developerName || 'Contoso',
+                developerWebsiteUrl: args.options.developerWebsiteUrl || 'https://contoso.com/my-app',
+                developerPrivacyUrl: args.options.developerPrivacyUrl || 'https://contoso.com/privacy',
+                developerTermsOfUseUrl: args.options.developerTermsOfUseUrl || 'https://contoso.com/terms-of-use',
+                developerMpnId: args.options.developerMpnId || '000000',
+                exposePageContextGlobally: args.options.exposePageContextGlobally ? '!0' : '!1',
+                exposeTeamsContextGlobally: args.options.exposeTeamsContextGlobally ? '!0' : '!1',
+                html: args.options.html.replace(/"/g, '\\"').replace(/\r\n/g, ' ').replace(/\n/g, ' '),
+                packageName: SpfxPackageGenerateCommand.getSafePackageName(args.options.webPartTitle),
+                productId: SpfxPackageGenerateCommand.generateNewId(),
+                skipFeatureDeployment: (args.options.allowTenantWideDeployment === true).toString(),
+                supportedHosts: JSON.stringify(supportedHosts).replace(/"/g, '"'),
+                webPartId: SpfxPackageGenerateCommand.generateNewId(),
+                webPartFeatureName: `${args.options.webPartTitle} Feature`,
+                webPartFeatureDescription: `A feature which activates the Client-Side WebPart named ${args.options.webPartTitle}`,
+                webPartAlias: SpfxPackageGenerateCommand.getWebPartAlias(args.options.webPartTitle),
+                webPartName: args.options.webPartTitle,
+                webPartSafeName: SpfxPackageGenerateCommand.getSafeWebPartName(args.options.webPartTitle),
+                webPartDescription: args.options.webPartDescription,
+                webPartModule: SpfxPackageGenerateCommand.getSafePackageName(args.options.webPartTitle)
+            };
+            let tmpDir = undefined;
+            let error;
+            try {
+                if (this.verbose) {
+                    logger.log(`Creating temp folder...`);
+                }
+                tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'cli-spfx'));
                 if (this.debug) {
-                    logger.log(`Processing ${filePath}...`);
+                    logger.log(`Temp folder created at ${tmpDir}`);
                 }
-                if (!SpfxPackageGenerateCommand.isBinaryFile(filePath)) {
-                    if (this.verbose) {
-                        logger.log('Replacing tokens...');
-                    }
-                    let fileContents = fs.readFileSync(filePath, 'utf-8');
+                if (this.verbose) {
+                    logger.log('Copying files...');
+                }
+                const src = path.join(__dirname, 'package-generate', 'assets');
+                fsUtil_1.fsUtil.copyRecursiveSync(src, tmpDir, s => SpfxPackageGenerateCommand.replaceTokens(s, tokens));
+                const files = fsUtil_1.fsUtil.readdirR(tmpDir);
+                if (this.verbose) {
+                    logger.log('Processing files...');
+                }
+                files.forEach(filePath => {
                     if (this.debug) {
-                        logger.log('Before:');
-                        logger.log(fileContents);
+                        logger.log(`Processing ${filePath}...`);
                     }
-                    fileContents = SpfxPackageGenerateCommand.replaceTokens(fileContents, tokens);
-                    if (this.debug) {
-                        logger.log('After:');
-                        logger.log(fileContents);
+                    if (!SpfxPackageGenerateCommand.isBinaryFile(filePath)) {
+                        if (this.verbose) {
+                            logger.log('Replacing tokens...');
+                        }
+                        let fileContents = fs.readFileSync(filePath, 'utf-8');
+                        if (this.debug) {
+                            logger.log('Before:');
+                            logger.log(fileContents);
+                        }
+                        fileContents = SpfxPackageGenerateCommand.replaceTokens(fileContents, tokens);
+                        if (this.debug) {
+                            logger.log('After:');
+                            logger.log(fileContents);
+                        }
+                        fs.writeFileSync(filePath, fileContents, { encoding: 'utf-8' });
+                    }
+                    else {
+                        if (this.verbose) {
+                            logger.log(`Binary file. Skipping replacing tokens in contents`);
+                        }
                     }
-                    fs.writeFileSync(filePath, fileContents, { encoding: 'utf-8' });
+                });
+                if (this.verbose) {
+                    logger.log('Creating .sppkg file...');
+                }
+                // we need this to be able to inject mock AdmZip for testing
+                /* c8 ignore next 3 */
+                if (!this.archive) {
+                    this.archive = new AdmZip();
                 }
-                else {
-                    if (this.verbose) {
-                        logger.log(`Binary file. Skipping replacing tokens in contents`);
+                const filesToZip = fsUtil_1.fsUtil.readdirR(tmpDir);
+                filesToZip.forEach(f => {
+                    if (this.debug) {
+                        logger.log(`Adding ${f} to archive...`);
                     }
+                    this.archive.addLocalFile(f, path.relative(tmpDir, path.dirname(f)), path.basename(f));
+                });
+                if (this.debug) {
+                    logger.log('Writing archive...');
                 }
-            });
-            if (this.verbose) {
-                logger.log('Creating .sppkg file...');
+                this.archive.writeZip(`${args.options.name}.sppkg`);
             }
-            // we need this to be able to inject mock AdmZip for testing
-            /* c8 ignore next 3 */
-            if (!this.archive) {
-                this.archive = new AdmZip();
+            catch (err) {
+                error = err.message;
             }
-            const filesToZip = utils_1.fsUtil.readdirR(tmpDir);
-            filesToZip.forEach(f => {
-                if (this.debug) {
-                    logger.log(`Adding ${f} to archive...`);
+            finally {
+                try {
+                    if (tmpDir) {
+                        if (this.verbose) {
+                            logger.log(`Deleting temp folder at ${tmpDir}...`);
+                        }
+                        fs.rmdirSync(tmpDir, { recursive: true });
+                    }
+                    if (error) {
+                        throw error;
+                    }
                 }
-                this.archive.addLocalFile(f, path.relative(tmpDir, path.dirname(f)), path.basename(f));
-            });
-            if (this.debug) {
-                logger.log('Writing archive...');
-            }
-            this.archive.writeZip(`${args.options.name}.sppkg`);
-        }
-        catch (err) {
-            error = err.message;
-        }
-        finally {
-            try {
-                if (tmpDir) {
-                    if (this.verbose) {
-                        logger.log(`Deleting temp folder at ${tmpDir}...`);
+                catch (ex) {
+                    if (ex === error) {
+                        throw ex;
                     }
-                    fs.rmdirSync(tmpDir, { recursive: true });
+                    throw `An error has occurred while removing the temp folder at ${tmpDir}. Please remove it manually.`;
                 }
-                cb(error);
             }
-            catch (ex) {
-                cb(`An error has occurred while removing the temp folder at ${tmpDir}. Please remove it manually.`);
-            }
-        }
+        });
     }
     static replaceTokens(s, tokens) {
         return s.replace(/\$([^\$]+)\$/g, (substring, token) => {