@microsoft/generator-sharepoint 1.14.0 → 1.15.0-rc.0

package/lib/common/BaseGenerator.d.ts

@@ -6,7 +6,7 @@ import { ConfigJsonManager } from './ConfigJsonManager';
 import { ServeJsonManager } from './ServeJsonManager';
 import { PackageSolutionJsonManager } from './PackageSolutionJsonManager';
 export declare type AvailableTemplates = 'react' | 'none' | 'minimal';
-export declare type DependencyGroups = 'react' | 'none' | 'minimal' | 'extension' | 'webpart' | 'applicationCustomizer' | 'fieldCustomizer' | 'commandSet' | 'searchQueryModifier' | 'library' | 'adaptiveCardExtension';
+export declare type DependencyGroups = keyof typeof import('./dependencies.json');
 export interface IBaseOptions {
     'skip-install': boolean;
     plusbeta: boolean;
@@ -21,11 +21,11 @@ export declare abstract class BaseGenerator<IOptions extends IBaseOptions, ICont
     context: IContext;
     protected abstract friendlyName: string;
     protected allowEmptyPackageJson: boolean;
+    private _dependenciesByDependencyGroup;
     protected get packageJsonManager(): PackageJsonManager;
     protected get configJson(): ConfigJsonManager;
     protected get serveJson(): ServeJsonManager;
     protected get packageSolutionJson(): PackageSolutionJsonManager;
-    private _dependencyGroupMap;
     private static _checkForUpdates;
     /**
      * Lifecycle events, these are called in a specific order by the Yeoman
@@ -49,12 +49,10 @@ export declare abstract class BaseGenerator<IOptions extends IBaseOptions, ICont
     protected tryInstall(): boolean;
     protected ensureCorrectFolder(): void;
     protected ensureDependencyGroup(group: DependencyGroups): void;
-    private _addResoutionsIfApplicable;
+    protected nameIsDependencyGroup(name: string): name is DependencyGroups;
+    private _ensureDependenciesByDependencyGroup;
+    private _addResolutionsIfApplicable;
     private _doPnpmInstall;
-    private _getDependencies;
-    private _getDevDependencies;
-    private get _dependencyGroups();
     private _untokenizedCopier;
-    private _getDependencyFileName;
 }
 //# sourceMappingURL=BaseGenerator.d.ts.map

package/lib/common/BaseGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseGenerator.d.ts","sourceRoot":"","sources":["../../src/common/BaseGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAG5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAG1E,oBAAY,kBAAkB,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;AAE9D,oBAAY,gBAAgB,GACxB,OAAO,GACP,MAAM,GACN,SAAS,GACT,WAAW,GACX,SAAS,GACT,uBAAuB,GACvB,iBAAiB,GACjB,YAAY,GACZ,qBAAqB,GACrB,SAAS,GACT,uBAAuB,CAAC;AAE5B,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,OAAO,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,8BAAsB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,CAAE,SAAQ,MAAM,CAAC,QAAQ,CAAC;IACnG,SAAS,CAAC,MAAM,CAAC,oBAAoB,EAAE,YAAY,CAAiC;IACpF,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAAkB;IAEtD;;OAEG;IACI,OAAO,EAAE,QAAQ,CAAC;IAEzB,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IACxC,SAAS,CAAC,qBAAqB,EAAE,OAAO,CAAS;IAEjD,SAAS,KAAK,kBAAkB,IAAI,kBAAkB,CAQrD;IAED,SAAS,KAAK,UAAU,IAAI,iBAAiB,CAK5C;IAED,SAAS,KAAK,SAAS,IAAI,gBAAgB,CAK1C;IAED,SAAS,KAAK,mBAAmB,IAAI,0BAA0B,CAK9D;IAED,OAAO,CAAC,mBAAmB,CAAyC;IAEpE,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAa/B;;;;OAIG;IAEH,yFAAyF;aACzE,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAEpD,0EAA0E;aAC1D,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAEjD,gFAAgF;aAChE,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAE5C,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,CAEjC;IAEF,8EAA8E;IACvE,OAAO,CAAC,UAAU,GAAE,OAAc,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAkBhE,8CAA8C;aAC9B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAE/C,8CAA8C;aAC9B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAE3C,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ;IAmChE,SAAS,CAAC,UAAU,IAAI,OAAO;IAQ/B,SAAS,CAAC,mBAAmB,IAAI,IAAI;IAMrC,SAAS,CAAC,qBAAqB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAiD9D,OAAO,CAAC,0BAA0B;IAWlC,OAAO,CAAC,cAAc;IAiCtB,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,mBAAmB;IAK3B,OAAO,KAAK,iBAAiB,GAgC5B;IAED,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,sBAAsB;CAQ/B"}
+{"version":3,"file":"BaseGenerator.d.ts","sourceRoot":"","sources":["../../src/common/BaseGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,YAAY,EAAY,MAAM,8BAA8B,CAAC;AAGtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAG1E,oBAAY,kBAAkB,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;AAE9D,oBAAY,gBAAgB,GAAG,MAAM,cAAc,qBAAqB,CAAC,CAAC;AAC1E,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,OAAO,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAOD,8BAAsB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,CAAE,SAAQ,MAAM,CAAC,QAAQ,CAAC;IACnG,SAAS,CAAC,MAAM,CAAC,oBAAoB,EAAE,YAAY,CAAoD;IACvG,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAAkB;IAEtD;;OAEG;IACI,OAAO,EAAE,QAAQ,CAAC;IAEzB,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IACxC,SAAS,CAAC,qBAAqB,EAAE,OAAO,CAAS;IAEjD,OAAO,CAAC,8BAA8B,CAAqD;IAE3F,SAAS,KAAK,kBAAkB,IAAI,kBAAkB,CAQrD;IAED,SAAS,KAAK,UAAU,IAAI,iBAAiB,CAK5C;IAED,SAAS,KAAK,SAAS,IAAI,gBAAgB,CAK1C;IAED,SAAS,KAAK,mBAAmB,IAAI,0BAA0B,CAK9D;IAED,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAa/B;;;;OAIG;IAEH,yFAAyF;aACzE,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAEpD,0EAA0E;aAC1D,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAEjD,gFAAgF;aAChE,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAE5C,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,CAEjC;IAEF,8EAA8E;IACvE,OAAO,CAAC,UAAU,GAAE,OAAc,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAkBhE,8CAA8C;aAC9B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAE/C,8CAA8C;aAC9B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAE3C,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ;IAmChE,SAAS,CAAC,UAAU,IAAI,OAAO;IAQ/B,SAAS,CAAC,mBAAmB,IAAI,IAAI;IAMrC,SAAS,CAAC,qBAAqB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAiB9D,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,IAAI,gBAAgB;IAMvE,OAAO,CAAC,oCAAoC;IAsB5C,OAAO,CAAC,2BAA2B;IAWnC,OAAO,CAAC,cAAc;IAiCtB,OAAO,CAAC,kBAAkB;CAS3B"}

package/lib/common/BaseGenerator.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -27,6 +31,7 @@ const colors_1 = __importDefault(require("colors"));
 const path = __importStar(require("path"));
 const UpdateNotifier = __importStar(require("update-notifier"));
 const yeoman_generator_1 = __importDefault(require("yeoman-generator"));
+const node_core_library_1 = require("@rushstack/node-core-library");
 const Utils = __importStar(require("./utilities"));
 const PackageJsonManager_1 = require("./PackageJsonManager");
 const ConfigJsonManager_1 = require("./ConfigJsonManager");
@@ -133,35 +138,40 @@ class BaseGenerator extends yeoman_generator_1.default {
         }
     }
     ensureDependencyGroup(group) {
-        const dependencyList = this._getDependencies(group);
-        const devDependencyList = this._getDevDependencies(group);
-        if (!this.packageJsonManager.data.dependencies) {
-            this.packageJsonManager.data.dependencies = {};
-        }
-        if (!this.packageJsonManager.data.devDependencies) {
-            this.packageJsonManager.data.devDependencies = {};
+        const dependenciesByDependencyGroup = this._ensureDependenciesByDependencyGroup();
+        const dependencies = dependenciesByDependencyGroup.get(group);
+        for (const [name, version] of Object.entries(dependencies.dependencies)) {
+            this.packageJsonManager.addDependency(name, version);
         }
-        if (group === 'webpart' ||
-            group === 'extension' ||
-            group === 'library' ||
-            group === 'adaptiveCardExtension') {
-            let fileName = 'firstParty';
-            fileName = this._getDependencyFileName(fileName);
-            const firstPartyDependencies = require(path.join(__dirname, 'dependency', group, fileName));
-            const thirdPartyDependencies = require(path.join(__dirname, 'dependency', 'thirdParty.json'));
-            this.packageJsonManager.merge(firstPartyDependencies);
-            this.packageJsonManager.merge(thirdPartyDependencies);
+        for (const [name, version] of Object.entries(dependencies.devDependencies)) {
+            this.packageJsonManager.addDevDependency(name, version);
         }
-        Object.keys(dependencyList).forEach((name) => {
-            this.packageJsonManager.addDependency(name, dependencyList[name]);
-        });
-        Object.keys(devDependencyList).forEach((name) => {
-            this.packageJsonManager.addDevDependency(name, devDependencyList[name]);
-        });
         // if at any point we are adding some react typings, then ensure they are in the resolutions for Yarn
-        this._addResoutionsIfApplicable(['@types/react']);
+        this._addResolutionsIfApplicable(['@types/react']);
+    }
+    nameIsDependencyGroup(name) {
+        const dependenciesByDependencyGroup = this._ensureDependenciesByDependencyGroup();
+        return dependenciesByDependencyGroup.has(name);
+    }
+    _ensureDependenciesByDependencyGroup() {
+        if (!this._dependenciesByDependencyGroup) {
+            const dependenciesFile = node_core_library_1.JsonFile.load(`${__dirname}/dependencies.json`);
+            const plusBeta = this.options.plusbeta;
+            const dependenciesByDependencyGroup = new Map();
+            this._dependenciesByDependencyGroup = dependenciesByDependencyGroup;
+            for (const [groupName, groupDependencies] of Object.entries(dependenciesFile)) {
+                const dependencyList = {
+                    devDependencies: {},
+                    ...(plusBeta && groupDependencies.plusBeta
+                        ? groupDependencies.plusBeta
+                        : groupDependencies.standard)
+                };
+                dependenciesByDependencyGroup.set(groupName, dependencyList);
+            }
+        }
+        return this._dependenciesByDependencyGroup;
     }
-    _addResoutionsIfApplicable(packages) {
+    _addResolutionsIfApplicable(packages) {
         if (this.packageJsonManager.data.dependencies) {
             for (const packageName of packages) {
                 let packageVersion;
@@ -196,28 +206,6 @@ class BaseGenerator extends yeoman_generator_1.default {
             });
         }, { once: installer + ' ' + args.join(' '), run: false });
     }
-    _getDependencies(group) {
-        return (this._dependencyGroups[group] || {})['dependencies'] || {};
-    }
-    _getDevDependencies(group) {
-        return (this._dependencyGroups[group] || {})['devDependencies'] || {};
-    }
-    /* tslint:disable-next-line:no-any */
-    get _dependencyGroups() {
-        if (!this._dependencyGroupMap) {
-            this._dependencyGroupMap = {};
-            this._dependencyGroupMap['react'] = require(path.join(__dirname, 'dependency', 'react.json'));
-            const applicationCustomizerFileName = this._getDependencyFileName('applicationCustomizer');
-            const fieldCustomizerFileName = this._getDependencyFileName('fieldCustomizer');
-            const commandSetFileName = this._getDependencyFileName('commandSet');
-            const searchQueryModifierFileName = this._getDependencyFileName('searchQueryModifier');
-            this._dependencyGroupMap['applicationCustomizer'] = require(path.join(__dirname, 'dependency', applicationCustomizerFileName));
-            this._dependencyGroupMap['fieldCustomizer'] = require(path.join(__dirname, 'dependency', fieldCustomizerFileName));
-            this._dependencyGroupMap['commandSet'] = require(path.join(__dirname, 'dependency', commandSetFileName));
-            this._dependencyGroupMap['searchQueryModifier'] = require(path.join(__dirname, 'dependency', searchQueryModifierFileName));
-        }
-        return this._dependencyGroupMap;
-    }
     _untokenizedCopier(directory, destination) {
         return (filename) => {
             const sourceFile = path.join(directory, filename);
@@ -225,15 +213,8 @@ class BaseGenerator extends yeoman_generator_1.default {
             this.fs.copyTpl(sourceFile, destinationFile, this.context);
         };
     }
-    _getDependencyFileName(fileName) {
-        if (this.options.plusbeta) {
-            fileName += 'PlusBeta';
-        }
-        fileName += '.json';
-        return fileName;
-    }
 }
 exports.BaseGenerator = BaseGenerator;
-BaseGenerator.generatorPackageJson = require('../../package.json');
+BaseGenerator.generatorPackageJson = node_core_library_1.JsonFile.load(`${__dirname}/../../package.json`);
 BaseGenerator._hasCheckedForUpdates = false;
 //# sourceMappingURL=BaseGenerator.js.map

package/lib/common/JsonManager.d.ts

@@ -4,7 +4,7 @@ export declare abstract class JsonManager<T> {
     protected _fs: Editor;
     protected _data: T;
     set(newData: T): T;
-    merge(newData: T): T;
+    merge(newData: Partial<T>): T;
     get data(): T;
     save(): void;
     protected constructor(_filepath: string, _fs: Editor, _data: T);

package/lib/common/JsonManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"JsonManager.d.ts","sourceRoot":"","sources":["../../src/common/JsonManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAGvC,8BAAsB,WAAW,CAAC,CAAC;IAsBX,SAAS,CAAC,SAAS,EAAE,MAAM;IAAE,SAAS,CAAC,GAAG,EAAE,MAAM;IAAE,SAAS,CAAC,KAAK,EAAE,CAAC;IArBrF,GAAG,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC;IAQlB,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC;IAK3B,IAAW,IAAI,IAAI,CAAC,CAEnB;IAEM,IAAI,IAAI,IAAI;IAInB,SAAS,aAAuB,SAAS,EAAE,MAAM,EAAY,GAAG,EAAE,MAAM,EAAY,KAAK,EAAE,CAAC;CAC7F"}
+{"version":3,"file":"JsonManager.d.ts","sourceRoot":"","sources":["../../src/common/JsonManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAGvC,8BAAsB,WAAW,CAAC,CAAC;IAsBX,SAAS,CAAC,SAAS,EAAE,MAAM;IAAE,SAAS,CAAC,GAAG,EAAE,MAAM;IAAE,SAAS,CAAC,KAAK,EAAE,CAAC;IArBrF,GAAG,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC;IAQlB,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAKpC,IAAW,IAAI,IAAI,CAAC,CAEnB;IAEM,IAAI,IAAI,IAAI;IAInB,SAAS,aAAuB,SAAS,EAAE,MAAM,EAAY,GAAG,EAAE,MAAM,EAAY,KAAK,EAAE,CAAC;CAC7F"}

package/lib/common/JsonManager.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };

package/lib/common/ServeJsonManager.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };

package/lib/common/YeomanConfiguration.d.ts

@@ -19,5 +19,7 @@ export declare class YeomanConfiguration {
     static set environment(value: 'spo');
     static get packageManager(): 'npm' | 'pnpm' | 'yarn';
     static set packageManager(value: 'npm' | 'pnpm' | 'yarn');
+    static get useHeft(): boolean;
+    static set useHeft(value: boolean);
 }
 //# sourceMappingURL=YeomanConfiguration.d.ts.map

package/lib/common/YeomanConfiguration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"YeomanConfiguration.d.ts","sourceRoot":"","sources":["../../src/common/YeomanConfiguration.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,wBAAwB;IACvC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC,CAAC;CAC5B;AAYD;;;GAGG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,CAA2B;WAElC,QAAQ,CAAC,mBAAmB,EAAE,wBAAwB,GAAG,IAAI;IAI3E,WAAkB,WAAW,IAAI,MAAM,CAEtC;IACD,WAAkB,WAAW,CAAC,KAAK,EAAE,MAAM,EAE1C;IAED,WAAkB,OAAO,IAAI,MAAM,CAElC;IACD,WAAkB,OAAO,CAAC,KAAK,EAAE,MAAM,EAEtC;IAED,WAAkB,SAAS,IAAI,MAAM,CAEpC;IACD,WAAkB,SAAS,CAAC,KAAK,EAAE,MAAM,EAExC;IAED,WAAkB,WAAW,IAAI,KAAK,CAErC;IAED,WAAkB,WAAW,CAAC,KAAK,EAAE,KAAK,EAEzC;IAED,WAAkB,cAAc,IAAI,KAAK,GAAG,MAAM,GAAG,MAAM,CAE1D;IAED,WAAkB,cAAc,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,EAE9D;CACF"}
+{"version":3,"file":"YeomanConfiguration.d.ts","sourceRoot":"","sources":["../../src/common/YeomanConfiguration.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,wBAAwB;IACvC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC,CAAC;CAC5B;AAaD;;;GAGG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,CAA2B;WAElC,QAAQ,CAAC,mBAAmB,EAAE,wBAAwB,GAAG,IAAI;IAI3E,WAAkB,WAAW,IAAI,MAAM,CAEtC;IACD,WAAkB,WAAW,CAAC,KAAK,EAAE,MAAM,EAE1C;IAED,WAAkB,OAAO,IAAI,MAAM,CAElC;IACD,WAAkB,OAAO,CAAC,KAAK,EAAE,MAAM,EAEtC;IAED,WAAkB,SAAS,IAAI,MAAM,CAEpC;IACD,WAAkB,SAAS,CAAC,KAAK,EAAE,MAAM,EAExC;IAED,WAAkB,WAAW,IAAI,KAAK,CAErC;IAED,WAAkB,WAAW,CAAC,KAAK,EAAE,KAAK,EAEzC;IAED,WAAkB,cAAc,IAAI,KAAK,GAAG,MAAM,GAAG,MAAM,CAE1D;IAED,WAAkB,cAAc,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,EAE9D;IAED,WAAkB,OAAO,IAAI,OAAO,CAEnC;IAED,WAAkB,OAAO,CAAC,KAAK,EAAE,OAAO,EAEvC;CACF"}

package/lib/common/YeomanConfiguration.js

@@ -8,7 +8,8 @@ const _strings = {
     version: 'version',
     libraryId: 'libraryId',
     environment: 'environment',
-    packageManager: 'packageManager'
+    packageManager: 'packageManager',
+    useHeft: 'useHeft'
 };
 /**
  * This class wraps an untyped property bag with types for
@@ -48,6 +49,12 @@ class YeomanConfiguration {
     static set packageManager(value) {
         YeomanConfiguration._store.set(_strings.packageManager, value);
     }
+    static get useHeft() {
+        return YeomanConfiguration._store.get(_strings.useHeft);
+    }
+    static set useHeft(value) {
+        YeomanConfiguration._store.set(_strings.useHeft, value);
+    }
 }
 exports.YeomanConfiguration = YeomanConfiguration;
 //# sourceMappingURL=YeomanConfiguration.js.map

package/lib/common/dependencies.json

@@ -0,0 +1,228 @@
+{
+  "adaptiveCardExtension": {
+    "standard": {
+      "dependencies": {
+        "@microsoft/sp-core-library": "1.15.0-rc.0",
+        "@microsoft/sp-property-pane": "1.15.0-rc.0",
+        "@microsoft/sp-adaptive-card-extension-base": "1.15.0-rc.0"
+      },
+      "devDependencies": {
+        "@microsoft/sp-module-interfaces": "1.15.0-rc.0"
+      }
+    },
+    "plusBeta": {
+      "dependencies": {
+        "@microsoft/sp-core-library": "1.15.0-rc.0",
+        "@microsoft/sp-property-pane": "1.15.0-rc.0",
+        "@microsoft/sp-adaptive-card-extension-base": "1.15.0-rc.0"
+      },
+      "devDependencies": {
+        "@microsoft/sp-module-interfaces": "1.15.0-rc.0"
+      }
+    }
+  },
+  "applicationCustomizer": {
+    "standard": {
+      "dependencies": {
+        "@microsoft/sp-dialog": "1.15.0-rc.0",
+        "@microsoft/sp-application-base": "1.15.0-rc.0"
+      }
+    },
+    "plusBeta": null
+  },
+  "applicationCustomizerPlusBeta": {
+    "standard": {
+      "dependencies": {
+        "@microsoft/sp-dialog": "1.15.0-rc.0",
+        "@microsoft/sp-application-base": "1.15.0-rc.0"
+      }
+    },
+    "plusBeta": null
+  },
+  "commandSet": {
+    "standard": {
+      "dependencies": {
+        "@microsoft/sp-listview-extensibility": "1.15.0-rc.0",
+        "@microsoft/sp-dialog": "1.15.0-rc.0"
+      }
+    },
+    "plusBeta": null
+  },
+  "commandSetPlusBeta": {
+    "standard": {
+      "dependencies": {
+        "@microsoft/sp-listview-extensibility": "1.15.0-rc.0",
+        "@microsoft/sp-dialog": "1.15.0-rc.0"
+      }
+    },
+    "plusBeta": null
+  },
+  "extension": {
+    "standard": {
+      "dependencies": {
+        "@microsoft/sp-core-library": "1.15.0-rc.0",
+        "@microsoft/decorators": "1.15.0-rc.0"
+      },
+      "devDependencies": {
+        "@microsoft/sp-module-interfaces": "1.15.0-rc.0"
+      }
+    },
+    "plusBeta": {
+      "dependencies": {
+        "@microsoft/sp-core-library": "1.15.0-rc.0",
+        "@microsoft/decorators": "1.15.0-rc.0"
+      },
+      "devDependencies": {
+        "@microsoft/sp-module-interfaces": "1.15.0-rc.0"
+      }
+    }
+  },
+  "fieldCustomizer": {
+    "standard": {
+      "dependencies": {
+        "@microsoft/sp-listview-extensibility": "1.15.0-rc.0"
+      }
+    },
+    "plusBeta": null
+  },
+  "fieldCustomizerPlusBeta": {
+    "standard": {
+      "dependencies": {
+        "@microsoft/sp-listview-extensibility": "1.15.0-rc.0"
+      }
+    },
+    "plusBeta": null
+  },
+  "library": {
+    "standard": {
+      "dependencies": {},
+      "devDependencies": {
+        "@microsoft/sp-module-interfaces": "1.15.0-rc.0"
+      }
+    },
+    "plusBeta": {
+      "dependencies": {},
+      "devDependencies": {
+        "@microsoft/sp-module-interfaces": "1.15.0-rc.0"
+      }
+    }
+  },
+  "react": {
+    "standard": {
+      "dependencies": {
+        "react": "16.13.1",
+        "react-dom": "16.13.1",
+        "office-ui-fabric-react": "7.183.1"
+      },
+      "devDependencies": {
+        "@types/react": "16.9.51",
+        "@types/react-dom": "16.9.8",
+        "eslint-plugin-react-hooks": "4.3.0"
+      }
+    },
+    "plusBeta": null
+  },
+  "searchQueryModifier": {
+    "standard": {
+      "dependencies": {
+        "@microsoft/sp-search-extensibility": "1.15.0-rc.0"
+      }
+    },
+    "plusBeta": null
+  },
+  "searchQueryModifierPlusBeta": {
+    "standard": {
+      "dependencies": {
+        "@microsoft/sp-search-extensibility": "1.15.0-rc.0"
+      }
+    },
+    "plusBeta": null
+  },
+  "webpart": {
+    "standard": {
+      "dependencies": {
+        "@microsoft/sp-core-library": "1.15.0-rc.0",
+        "@microsoft/sp-property-pane": "1.15.0-rc.0",
+        "@microsoft/sp-webpart-base": "1.15.0-rc.0",
+        "@microsoft/sp-lodash-subset": "1.15.0-rc.0",
+        "@microsoft/sp-office-ui-fabric-core": "1.15.0-rc.0"
+      },
+      "devDependencies": {
+        "@microsoft/sp-module-interfaces": "1.15.0-rc.0"
+      }
+    },
+    "plusBeta": {
+      "dependencies": {
+        "@microsoft/sp-core-library": "1.15.0-rc.0",
+        "@microsoft/sp-property-pane": "1.15.0-rc.0",
+        "@microsoft/sp-webpart-base": "1.15.0-rc.0",
+        "@microsoft/sp-lodash-subset": "1.15.0-rc.0",
+        "@microsoft/sp-office-ui-fabric-core": "1.15.0-rc.0"
+      },
+      "devDependencies": {
+        "@microsoft/sp-module-interfaces": "1.15.0-rc.0"
+      }
+    }
+  },
+  "useHeft": {
+    "standard": {
+      "dependencies": {
+        "tslib": "2.3.1"
+      },
+      "devDependencies": {
+        "@microsoft/rush-stack-compiler-4.5": "0.2.0",
+        "@rushstack/eslint-config": "2.5.1",
+        "@microsoft/eslint-plugin-spfx": "1.15.0-rc.0",
+        "@microsoft/eslint-config-spfx": "1.15.0-rc.0",
+        "@microsoft/spfx-web-build-rig": "1.15.0-rc.0",
+        "@rushstack/heft": "0.45.2",
+        "@types/webpack-env": "~1.15.2",
+        "eslint": "8.7.0"
+      }
+    },
+    "plusBeta": null
+  },
+  "useGulp": {
+    "standard": {
+      "dependencies": {
+        "tslib": "2.3.1"
+      },
+      "devDependencies": {
+        "@microsoft/rush-stack-compiler-4.5": "0.2.0",
+        "@rushstack/eslint-config": "2.5.1",
+        "@microsoft/eslint-plugin-spfx": "1.15.0-rc.0",
+        "@microsoft/eslint-config-spfx": "1.15.0-rc.0",
+        "@microsoft/sp-build-web": "1.15.0-rc.0",
+        "@types/webpack-env": "~1.15.2",
+        "eslint": "8.7.0",
+        "ajv": "^6.12.5",
+        "gulp": "4.0.2"
+      }
+    },
+    "plusBeta": null
+  },
+  "formCustomizer": {
+    "standard": {
+      "dependencies": {
+        "@microsoft/sp-core-library": "1.15.0-rc.0",
+        "@microsoft/sp-listview-extensibility": "1.15.0-rc.0",
+        "@microsoft/sp-lodash-subset": "1.15.0-rc.0",
+        "@microsoft/sp-office-ui-fabric-core": "1.15.0-rc.0"
+      },
+      "devDependencies": {
+        "@microsoft/sp-module-interfaces": "1.15.0-rc.0"
+      }
+    },
+    "plusBeta": {
+      "dependencies": {
+        "@microsoft/sp-core-library": "1.15.0-rc.0",
+        "@microsoft/sp-listview-extensibility": "1.15.0-rc.0",
+        "@microsoft/sp-lodash-subset": "1.15.0-rc.0",
+        "@microsoft/sp-office-ui-fabric-core": "1.15.0-rc.0"
+      },
+      "devDependencies": {
+        "@microsoft/sp-module-interfaces": "1.15.0-rc.0"
+      }
+    }
+  }
+}

package/lib/common/spsay.d.ts

@@ -1,2 +1,2 @@
-export default function spsay(solutionName: string): string;
+export default function spsay(solutionName: string, useHeft: boolean): string;
 //# sourceMappingURL=spsay.d.ts.map

package/lib/common/spsay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spsay.d.ts","sourceRoot":"","sources":["../../src/common/spsay.ts"],"names":[],"mappings":"AAuDA,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAK1D"}
+{"version":3,"file":"spsay.d.ts","sourceRoot":"","sources":["../../src/common/spsay.ts"],"names":[],"mappings":"AAuDA,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,CAK5E"}

package/lib/common/spsay.js

@@ -22,16 +22,16 @@ function times(n, character) {
 function space(n) {
     return times(n, ' ');
 }
-function getWords(solutionName) {
+function getWords(solutionName, useHeft) {
     const words = [
-        'Congratulations!',
-        'Solution ' + solutionName + ' is created.',
-        'Run gulp serve to play with it!'
+        `Congratulations!`,
+        `Solution ${solutionName} is created.`,
+        `Run ${useHeft ? 'npm run start' : 'gulp serve'} to play with it!`
     ];
     const colorWords = [
-        'Congratulations!',
-        'Solution ' + colors_1.default.cyan(solutionName) + ' is created.',
-        'Run ' + colors_1.default.yellow('gulp serve') + ' to play with it!'
+        `Congratulations!`,
+        `Solution ${colors_1.default.cyan(solutionName)} is created.`,
+        `Run ${colors_1.default.yellow(useHeft ? 'npm run start' : 'gulp serve')} to play with it!`
     ];
     const maxLength = Math.max.apply(undefined, words.map((word) => word.length));
     const formatted = colorWords.map((word, index) => {
@@ -46,9 +46,9 @@ function getWords(solutionName) {
         .concat(["'" + times(maxLength + 4, '-') + "'"]);
     return wrapped;
 }
-function spsay(solutionName) {
+function spsay(solutionName, useHeft) {
     const colorLogo = logo.map((line) => colors_1.default.cyan(line));
-    const words = getWords(solutionName);
+    const words = getWords(solutionName, useHeft);
     const lines = lodash.zip(colorLogo, words).map((parts) => parts.join(''));
     return '\n' + lines.join('\n') + '\n';
 }

package/lib/common/utilities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utilities.d.ts","sourceRoot":"","sources":["../../src/common/utilities.ts"],"names":[],"mappings":"AAKA,OAAO,MAAM,GAAG,QAAQ,kBAAkB,CAAC,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE9D,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG7C;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAgB7D;AAED,wBAAgB,OAAO,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAuBnD;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAsB5F;AAED,wBAAgB,YAAY,IAAI,MAAM,CAErC;AAGD,wBAAgB,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI,CAErG"}
+{"version":3,"file":"utilities.d.ts","sourceRoot":"","sources":["../../src/common/utilities.ts"],"names":[],"mappings":"AAMA,OAAO,MAAM,GAAG,QAAQ,kBAAkB,CAAC,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE9D,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG7C;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAgB7D;AAED,wBAAgB,OAAO,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAuBnD;AAED,wBAAsB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAyBlG;AAED,wBAAgB,YAAY,IAAI,MAAM,CAErC;AAGD,wBAAgB,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI,CAQrG"}

package/lib/common/utilities.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -26,6 +30,7 @@ exports.compose = exports.generateGuid = exports.checkSolutionFolder = exports.f
 const colors_1 = __importDefault(require("colors"));
 const fs = __importStar(require("fs"));
 const lodash = __importStar(require("lodash"));
+const node_core_library_1 = require("@rushstack/node-core-library");
 const path = __importStar(require("path"));
 const uuid = __importStar(require("uuid"));
 function titleCase(str) {
@@ -68,29 +73,26 @@ function filesIn(...args) {
     return files;
 }
 exports.filesIn = filesIn;
-function checkSolutionFolder(generator, solutionName) {
+async function checkSolutionFolder(generator, solutionName) {
     if (!solutionName) {
         generator.log(colors_1.default.red('!!! Warning !!!'));
-        return generator
-            .prompt([
+        const answers = await generator.prompt([
             {
                 type: 'confirm',
                 name: 'continue',
                 default: undefined,
                 message: 'You are not running under solution folder. Continue?'
             }
-        ])
-            .then((answers) => {
-            if (answers.continue) {
-                return solutionName; // resolve with the solution name
-            }
-            else {
-                throw generator.log(colors_1.default.red('Bye!'));
-            }
-        });
+        ]);
+        if (answers.continue) {
+            return solutionName; // resolve with the solution name
+        }
+        else {
+            throw generator.log(colors_1.default.red('Bye!'));
+        }
     }
     else {
-        return Promise.resolve(solutionName);
+        return solutionName;
     }
 }
 exports.checkSolutionFolder = checkSolutionFolder;
@@ -100,7 +102,10 @@ function generateGuid() {
 exports.generateGuid = generateGuid;
 // tslint:disable-next-line
 function compose(generator, base, options) {
-    base.composeWith(`@microsoft/sharepoint:${generator}`, options);
+    base.composeWith(node_core_library_1.Import.resolveModule({
+        baseFolderPath: __dirname,
+        modulePath: `@microsoft/generator-sharepoint/lib/generators/${generator}`
+    }), options);
 }
 exports.compose = compose;
 //# sourceMappingURL=utilities.js.map