@microsoft/generator-sharepoint 1.20.0 → 1.21.0-beta.2

package/lib/generators/solution/index.js

@@ -1,38 +1,83 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = 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(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    composeWith: function() {
+        return composeWith;
+    },
+    defineOptions: function() {
+        return defineOptions;
     }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
 });
-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.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineOptions = exports.composeWith = void 0;
-const lodash = __importStar(require("lodash"));
-const path = __importStar(require("path"));
-const Utils = __importStar(require("../../common/utilities"));
-const BaseGenerator_1 = require("../../common/BaseGenerator");
-const YeomanConfiguration_1 = require("../../common/YeomanConfiguration");
+const _lodash = /*#__PURE__*/ _interop_require_wildcard(require("lodash"));
+const _path = /*#__PURE__*/ _interop_require_wildcard(require("path"));
+const _utilities = /*#__PURE__*/ _interop_require_wildcard(require("../../common/utilities"));
+const _BaseGenerator = require("../../common/BaseGenerator");
+const _YeomanConfiguration = require("../../common/YeomanConfiguration");
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {
+        __proto__: null
+    };
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
+}
 function composeWith(base, options) {
-    Utils.compose(path.basename(__dirname), base, options);
+    _utilities.compose(_path.basename(__dirname), base, options);
 }
-exports.composeWith = composeWith;
 function defineOptions(generator) {
     generator.option('solution-name', {
         description: 'Solution name, as well as folder name',
@@ -51,14 +96,11 @@ function defineOptions(generator) {
         type: String
     });
     generator.option('skip-feature-deployment', {
-        description: 'If specified, allow the tenant admin the choice of being able to ' +
-            'deploy the components to all sites immediately without running any ' +
-            'feature deployment or adding apps in sites',
+        description: 'If specified, allow the tenant admin the choice of being able to ' + 'deploy the components to all sites immediately without running any ' + 'feature deployment or adding apps in sites',
         type: Boolean
     });
     generator.option('is-domain-isolated', {
-        description: 'If specified, the solution will have permissions to access web APIs ' +
-            'that are unique not shared with other components in the tenant',
+        description: 'If specified, the solution will have permissions to access web APIs ' + 'that are unique not shared with other components in the tenant',
         type: Boolean
     });
     generator.option('use-heft', {
@@ -66,11 +108,9 @@ function defineOptions(generator) {
         type: Boolean
     });
 }
-exports.defineOptions = defineOptions;
-class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
+class SolutionGenerator extends _BaseGenerator.BaseGenerator {
     initializing() {
-        /* no-op */
-    }
+    /* no-op */ }
     async prompting() {
         if (!this._shouldExecute()) {
             return;
@@ -79,8 +119,8 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
             {
                 type: 'input',
                 name: 'solutionName',
-                default: lodash.kebabCase(this.appname),
-                when: () => !this.config.get('solutionName'),
+                default: _lodash.kebabCase(this.appname),
+                when: ()=>!this.config.get('solutionName'),
                 message: 'What is your solution name?'
             }
         ]);
@@ -93,12 +133,10 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
         if (skipFeatureDeploymentConfig !== undefined) {
             if (typeof skipFeatureDeploymentConfig === 'string') {
                 skipFeatureDeployment = skipFeatureDeploymentConfig.toLowerCase() === 'true';
-            }
-            else {
+            } else {
                 skipFeatureDeployment = skipFeatureDeploymentConfig;
             }
-        }
-        else {
+        } else {
             skipFeatureDeployment = true;
         }
         const componentType = this.config.get('componentType');
@@ -113,12 +151,10 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
         if (isDomainIsolatedConfig !== undefined) {
             if (typeof isDomainIsolatedConfig === 'string') {
                 isDomainIsolated = isDomainIsolatedConfig.toLowerCase() === 'true';
-            }
-            else {
+            } else {
                 isDomainIsolated = isDomainIsolatedConfig;
             }
-        }
-        else {
+        } else {
             isDomainIsolated = false;
         }
         // allows to set --use-heft false
@@ -127,29 +163,27 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
         if (useHeftConfig !== undefined) {
             if (typeof useHeftConfig === 'string') {
                 useHeft = useHeftConfig.toLowerCase() === 'true';
-            }
-            else {
+            } else {
                 useHeft = useHeftConfig;
             }
         }
         const isPlusBeta = this.config.get('plusBeta');
         this.context.solutionName = solutionName;
         this.context.useHeft = !!useHeft;
-        this.context.libraryName = lodash.kebabCase(this.context.solutionName);
-        this.context.libraryId = Utils.generateGuid();
+        this.context.libraryName = _lodash.kebabCase(this.context.solutionName);
+        this.context.libraryId = _utilities.generateGuid();
         this.context.solutionShortDescription = solutionShortDescription;
         this.context.skipFeatureDeployment = skipFeatureDeployment;
         this.context.isDomainIsolated = isDomainIsolated;
-        this.context.version = BaseGenerator_1.BaseGenerator.generatorPackageJson.version;
+        this.context.version = _BaseGenerator.BaseGenerator.generatorPackageJson.version;
         this.context.versionBadge = `https://img.shields.io/badge/version-${this.context.version.replace('-', '--')}-${this.context.version.indexOf('-') !== -1 ? 'yellow' : 'green'}.svg`;
         // store some variables
-        YeomanConfiguration_1.YeomanConfiguration.version = BaseGenerator_1.BaseGenerator.generatorPackageJson.version;
-        YeomanConfiguration_1.YeomanConfiguration.libraryName = this.context.libraryName;
-        YeomanConfiguration_1.YeomanConfiguration.libraryId = this.context.libraryId;
-        YeomanConfiguration_1.YeomanConfiguration.environment = environment;
-        YeomanConfiguration_1.YeomanConfiguration.packageManager =
-            this.config.get('packageManager') || YeomanConfiguration_1.YeomanConfiguration.packageManager || 'npm';
-        YeomanConfiguration_1.YeomanConfiguration.useHeft = !!useHeft;
+        _YeomanConfiguration.YeomanConfiguration.version = _BaseGenerator.BaseGenerator.generatorPackageJson.version;
+        _YeomanConfiguration.YeomanConfiguration.libraryName = this.context.libraryName;
+        _YeomanConfiguration.YeomanConfiguration.libraryId = this.context.libraryId;
+        _YeomanConfiguration.YeomanConfiguration.environment = environment;
+        _YeomanConfiguration.YeomanConfiguration.packageManager = this.config.get('packageManager') || _YeomanConfiguration.YeomanConfiguration.packageManager || 'npm';
+        _YeomanConfiguration.YeomanConfiguration.useHeft = !!useHeft;
         this.config.set('solutionName', solutionName);
         this.config.set('useHeft', useHeft);
         this.config.set('environment', environment);
@@ -167,9 +201,7 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
     }
     configuring() {
         if (this._shouldExecute()) {
-            const packageJsonTemplate = this.context.useHeft
-                ? require('./heft.package.json')
-                : require('./non-heft.package.json');
+            const packageJsonTemplate = this.context.useHeft ? require('./heft.package.json') : require('./non-heft.package.json');
             if (this.packageJsonManager.data) {
                 this.log(`Overwriting an existing "package.json"`);
             }
@@ -177,8 +209,7 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
             this.packageJsonManager.set(packageJsonTemplate);
             if (this.context.useHeft) {
                 this.ensureDependencyGroup('useHeft');
-            }
-            else {
+            } else {
                 this.ensureDependencyGroup('useGulp');
             }
             if (this.configJson.data) {
@@ -199,13 +230,12 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
             console.log();
             super.writing(false);
             const dest = this.destinationRoot();
-            this.copyTemplate(path.join(this.sourceRoot(), 'base'), dest);
+            this.copyTemplate(_path.join(this.sourceRoot(), 'base'), dest);
             if (this.context.useHeft) {
-                this.copyTemplate(path.join(this.sourceRoot(), 'heft'), dest);
-            }
-            else {
-                this.copyTemplate(path.join(this.sourceRoot(), 'gulp'), dest);
-                this.copyTemplate(path.join(this.sourceRoot(), YeomanConfiguration_1.YeomanConfiguration.environment), dest);
+                this.copyTemplate(_path.join(this.sourceRoot(), 'heft'), dest);
+            } else {
+                this.copyTemplate(_path.join(this.sourceRoot(), 'gulp'), dest);
+                this.copyTemplate(_path.join(this.sourceRoot(), _YeomanConfiguration.YeomanConfiguration.environment), dest);
             }
             this.packageJsonManager.save();
             this.configJson.save();
@@ -220,22 +250,22 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
         }
     }
     end() {
-        /* no-op */
+    /* no-op */ }
+    _shouldExecute() {
+        return this.config.get('isCreatingSolution');
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    constructor(args, options) {
+    constructor(args, options){
         super(args, options);
-        this.allowEmptyPackageJson = true;
-        this.friendlyName = 'Solution';
+        _define_property(this, "allowEmptyPackageJson", true);
+        _define_property(this, "friendlyName", 'Solution');
         defineOptions(this);
     }
-    _shouldExecute() {
-        return this.config.get('isCreatingSolution');
-    }
 }
 // Yeoman expects exports of this type, which overrides the TS exports above
 // Ensure that anything marked as export above is also listed here
 module.exports = SolutionGenerator;
 module.exports.composeWith = composeWith;
 module.exports.defineOptions = defineOptions;
-//# sourceMappingURL=index.js.map
+
+//#sourceMappingUrl=./index.js.map

package/lib/generators/solution/non-heft.package.json

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "engines": {
-    "node": ">=18.17.1 <19.0.0"
+    "node": ">=22.14.0 < 23.0.0"
   },
   "main": "lib/index.js",
   "scripts": {

package/lib/generators/webpart/index.js

@@ -1,45 +1,91 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = 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(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    WebpartGenerator: function() {
+        return WebpartGenerator;
+    },
+    composeWith: function() {
+        return composeWith;
+    },
+    defineOptions: function() {
+        return defineOptions;
     }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
 });
-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.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebpartGenerator = exports.defineOptions = exports.composeWith = void 0;
-const path = __importStar(require("path"));
-const Utils = __importStar(require("../../common/utilities"));
-const YeomanConfiguration_1 = require("../../common/YeomanConfiguration");
-const BaseComponent = __importStar(require("../component/BaseComponentGenerator"));
+const _path = /*#__PURE__*/ _interop_require_wildcard(require("path"));
+const _utilities = /*#__PURE__*/ _interop_require_wildcard(require("../../common/utilities"));
+const _YeomanConfiguration = require("../../common/YeomanConfiguration");
+const _BaseComponentGenerator = /*#__PURE__*/ _interop_require_wildcard(require("../component/BaseComponentGenerator"));
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {
+        __proto__: null
+    };
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
+}
 function composeWith(base, options) {
-    Utils.compose(path.basename(__dirname), base, options);
+    _utilities.compose(_path.basename(__dirname), base, options);
 }
-exports.composeWith = composeWith;
 function defineOptions(generator) {
-    BaseComponent.defineOptions(generator, 'Web part');
+    _BaseComponentGenerator.defineOptions(generator, 'Web part');
 }
-exports.defineOptions = defineOptions;
-class WebpartGenerator extends BaseComponent.BaseComponentGenerator {
+class WebpartGenerator extends _BaseComponentGenerator.BaseComponentGenerator {
     initializing() {
-        /* no-op */
-    }
+    /* no-op */ }
     async prompting() {
         this.ensureCorrectFolder();
         if (this._shouldExecute()) {
@@ -51,8 +97,8 @@ class WebpartGenerator extends BaseComponent.BaseComponentGenerator {
             super.configuring();
             this.ensureDependencyGroup('webpart');
             this.serveJson.setUpForWebParts();
-            const solutionName = YeomanConfiguration_1.YeomanConfiguration.libraryName;
-            this.packageSolutionJson.addFeature(Utils.generateGuid(), `${solutionName} Feature`, `The feature that activates elements of the ${solutionName} solution.`, false);
+            const solutionName = _YeomanConfiguration.YeomanConfiguration.libraryName;
+            this.packageSolutionJson.addFeature(_utilities.generateGuid(), `${solutionName} Feature`, `The feature that activates elements of the ${solutionName} solution.`, false);
         }
     }
     writing() {
@@ -60,12 +106,12 @@ class WebpartGenerator extends BaseComponent.BaseComponentGenerator {
             super.writing(false);
             const dest = this._getOutputFolder(this.context.componentNameCamelCase);
             const template = this.context.template;
-            this.copyTemplate(path.join(this.sourceRoot(), template), dest);
+            this.copyTemplate(_path.join(this.sourceRoot(), template), dest);
             if (template !== 'minimal') {
-                this.copyTemplate(path.join(this.sourceRoot(), 'loc'), path.join(dest, 'loc'));
-                this.copyTemplate(path.join(this.sourceRoot(), 'assets'), path.join(dest, 'assets'));
+                this.copyTemplate(_path.join(this.sourceRoot(), 'loc'), _path.join(dest, 'loc'));
+                this.copyTemplate(_path.join(this.sourceRoot(), 'assets'), _path.join(dest, 'assets'));
             }
-            this.copyTemplate(path.join(this.sourceRoot(), 'base'), dest);
+            this.copyTemplate(_path.join(this.sourceRoot(), 'base'), dest);
             this.fs.copy(this.templatePath('./images/outline.png'), this.destinationPath(`teams/${this.context.componentId}_outline.png`));
             this.fs.copy(this.templatePath('./images/color.png'), this.destinationPath(`teams/${this.context.componentId}_color.png`));
         }
@@ -78,22 +124,25 @@ class WebpartGenerator extends BaseComponent.BaseComponentGenerator {
     end() {
         super.end();
     }
-    constructor(args, options) {
-        super(args, options);
-        this.friendlyName = 'Web part';
-        this.codeName = 'WebPart';
-        this.allowedTemplates = ['react', 'minimal'];
-        this.folderName = 'webparts';
-        defineOptions(this);
-    }
     _shouldExecute() {
         return this.config.get('environment') === 'spo' && this.config.get('componentType') === 'webpart';
     }
+    constructor(args, options){
+        super(args, options);
+        _define_property(this, "friendlyName", 'Web part');
+        _define_property(this, "codeName", 'WebPart');
+        _define_property(this, "allowedTemplates", [
+            'react',
+            'minimal'
+        ]);
+        _define_property(this, "folderName", 'webparts');
+        defineOptions(this);
+    }
 }
-exports.WebpartGenerator = WebpartGenerator;
 // Yeoman expects exports of this type, which overrides the TS exports above
 // Ensure that anything marked as export above is also listed here
 module.exports = WebpartGenerator;
 module.exports.defineOptions = defineOptions;
 module.exports.composeWith = composeWith;
-//# sourceMappingURL=index.js.map
+
+//#sourceMappingUrl=./index.js.map

package/lib/generators/webpart/initial.teamsManifest.json

@@ -41,10 +41,8 @@
     "res-2-sdf.cdn.office.net",
     "res-1.cdn.office.net",
     "res-2.cdn.office.net",
-    "resourceseng.blob.core.windows.net",
-    "odspwebdevdeploy.blob.core.windows.net",
-    "odspwebcidev.blob.core.windows.net",
-    "odspweblocaldev.blob.core.windows.net",
+    "odspwebcidev.z13.web.core.windows.net",
+    "odspwebuserdev.z1.web.core.windows.net",
     "msft.spoppe.com"
   ],
   "webApplicationInfo": {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@microsoft/generator-sharepoint",
-  "version": "1.20.0",
+  "version": "1.21.0-beta.2",
   "description": "Yeoman generator for the SharePoint Framework",
   "engines": {
-    "node": ">=18.17.1 <19.0.0"
+    "node": ">=22.14.0 < 23.0.0"
   },
   "keywords": [
     "yeoman-generator"
@@ -11,20 +11,45 @@
   "license": "https://aka.ms/spfx/license",
   "homepage": "http://aka.ms/spfx",
   "main": "lib/generators/app/index.js",
+  "module": "lib-esm/generators/app/index.js",
+  "typings": "lib-dts/generators/app/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./lib-esm/generators/app/index.js",
+      "require": "./lib/generators/app/index.js",
+      "types": "./lib-dts/generators/app/index.d.ts"
+    },
+    "./lib/*": {
+      "import": "./lib-esm/*.js",
+      "require": "./lib/*.js",
+      "types": "./lib-dts/*.d.ts"
+    },
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "lib/*": [
+        "lib-dts/*"
+      ]
+    }
+  },
   "dependencies": {
-    "@rushstack/node-core-library": "5.7.0",
-    "@rushstack/terminal": "0.14.0",
+    "@rushstack/node-core-library": "5.12.0",
+    "@rushstack/terminal": "0.15.1",
     "colors": "~1.2.1",
     "lodash": "4.17.21",
+    "mem-fs": "2.2.1",
     "update-notifier": "5.1.0",
     "uuid": "^9.0.0",
     "yeoman-generator": "5.10.0",
     "yosay": "2.0.2",
-    "@microsoft/spfx-heft-plugins": "1.20.2"
+    "@microsoft/spfx-heft-plugins": "1.21.0-beta.2"
   },
   "devDependencies": {
-    "@microsoft/rush-lib": "5.133.0",
-    "@rushstack/heft": "0.67.0",
+    "@microsoft/rush-lib": "5.150.0",
+    "@rushstack/heft": "0.71.0",
+    "@rushstack/heft-isolated-typescript-transpile-plugin": "0.1.1",
+    "@rushstack/heft-typescript-plugin": "0.8.0",
     "@types/inquirer": "7.3.1",
     "@types/lodash": "4.14.117",
     "@types/mem-fs-editor": "7.0.1",
@@ -32,8 +57,8 @@
     "@types/uuid": "9.0.1",
     "@types/yeoman-generator": "5.2.14",
     "@types/yosay": "2.0.0",
-    "eslint": "8.57.0",
-    "@odsp-web-tools/internal-node-rig": "0.1.0"
+    "eslint": "8.57.1",
+    "@msinternal/internal-node-rig": "0.1.0"
   },
   "scripts": {
     "build": "heft test --clean",
@@ -41,9 +66,10 @@
     "test": "heft run --only test",
     "start": "heft build-watch",
     "test-watch": "heft test-watch",
-    "_phase:tool-build": "heft run --only build -- --clean",
+    "_phase:depscan": "heft depscan",
     "_phase:test": "heft run --only test -- --clean",
-    "_phase:build-incremental": "heft run --only build --",
-    "_phase:depscan": "heft depscan"
+    "_phase:test:incremental": "heft run --only test --",
+    "_phase:tool-build": "heft run --only build -- --clean",
+    "_phase:tool-build:incremental": "heft run --only build --"
   }
 }

package/lib/common/BaseGenerator.d.ts

@@ -1,59 +0,0 @@
-import yeoman from 'yeoman-generator';
-import type { Editor } from 'mem-fs-editor';
-import { type IPackageJson } from '@rushstack/node-core-library';
-import { PackageJsonManager } from './PackageJsonManager';
-import { ConfigJsonManager } from './ConfigJsonManager';
-import { ServeJsonManager } from './ServeJsonManager';
-import { PackageSolutionJsonManager } from './PackageSolutionJsonManager';
-export type AvailableTemplates = 'react' | 'none' | 'minimal';
-export type DependencyGroups = keyof typeof import('./dependencies.json');
-export interface IBaseOptions {
-    'skip-install': boolean;
-    plusbeta: boolean;
-    force?: boolean;
-}
-export declare abstract class BaseGenerator<IOptions extends IBaseOptions, IContext extends object> extends yeoman<IOptions> {
-    protected static generatorPackageJson: IPackageJson;
-    private static _hasCheckedForUpdates;
-    /**
-     * The context property bag used by templates
-     */
-    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 static _checkForUpdates;
-    /**
-     * Lifecycle events, these are called in a specific order by the Yeoman
-     * generator, which is why they are listed here in order.
-     * http://yeoman.io/authoring/running-context.html
-     */
-    /** Your initialization methods (checking current project state, getting configs, etc) */
-    abstract initializing(): Promise<void> | void;
-    /** Where you prompt users for options (where you'd call this.prompt()) */
-    abstract prompting(): Promise<void> | void;
-    /** Saving configurations and configure the project (creating metadata files) */
-    abstract configuring(): Promise<void> | void;
-    copyTemplate: Editor['copy'];
-    /** Where you write the generator specific files (routes, controllers, etc) */
-    writing(shouldCopy?: boolean): void;
-    /** Where installation are run (npm, bower) */
-    abstract install(): Promise<void> | void;
-    /** Called last, cleanup, say good bye, etc */
-    abstract end(): Promise<void> | void;
-    protected constructor(args: string | string[], options: IOptions);
-    protected tryInstall(): boolean;
-    protected ensureCorrectFolder(): void;
-    protected ensureDependencyGroup(group: DependencyGroups): void;
-    protected nameIsDependencyGroup(name: string): name is DependencyGroups;
-    private _ensureDependenciesByDependencyGroup;
-    private _dedupeDependencies;
-    private _addResolutionsIfApplicable;
-    private _doPnpmInstall;
-    private _untokenizedCopier;
-}
-//# sourceMappingURL=BaseGenerator.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"BaseGenerator.d.ts","sourceRoot":"","sources":["../../src/common/BaseGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,KAAK,YAAY,EAAY,MAAM,8BAA8B,CAAC;AAG3E,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,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;AAE9D,MAAM,MAAM,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,CACjC,QAAQ,SAAS,YAAY,EAC7B,QAAQ,SAAS,MAAM,CACvB,SAAQ,MAAM,CAAC,QAAQ,CAAC;IACxB,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,IAAI;IAkBhD,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;IAqB9D,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,IAAI,gBAAgB;IAMvE,OAAO,CAAC,oCAAoC;IAsB5C,OAAO,CAAC,mBAAmB;IAe3B,OAAO,CAAC,2BAA2B;IAWnC,OAAO,CAAC,cAAc;IAiCtB,OAAO,CAAC,kBAAkB;CAS3B"}