@flarum/cli 2.0.0-beta.9 → 2.0.1

package/lib/boilersmith/scaffolding/scaffolder.d.ts

@@ -4,7 +4,10 @@ import { DefaultProviders, Step } from '../step-manager';
 import { Module, ModuleStatusCache } from './module';
 import { TemplateParam } from './template-param';
 import { IO } from 'boilersmith/io';
-export declare type ExcludeScaffoldingFunc = (fs: Store, paths: Paths) => string[];
+export declare type ExcludeScaffoldingFunc = (fs: Store, paths: Paths) => {
+    files: string[];
+    configKeys: Record<string, string[]>;
+};
 export declare class Scaffolder<TN extends string = string, MN extends string = string> {
     private templateParams;
     private modules;

package/lib/boilersmith/scaffolding/scaffolder.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Scaffolder = void 0;
 const tslib_1 = require("tslib");
 const globby_1 = (0, tslib_1.__importDefault)(require("globby"));
-const node_path_1 = require("node:path");
+const path_1 = require("path");
 const json_leaf_paths_1 = require("boilersmith/utils/json-leaf-paths");
 const read_tpl_1 = require("boilersmith/utils/read-tpl");
 const init_step_factory_1 = require("./init-step-factory");
@@ -27,8 +27,8 @@ class Scaffolder {
     }
     registerTemplateParam(templateParam) {
         if ((0, template_param_1.isComputedParam)(templateParam)) {
-            const currParams = new Set(this.templateParams.map(p => (0, template_param_1.getParamName)(p)));
-            const missingDeps = templateParam.uses.filter(dep => !currParams.has(dep));
+            const currParams = new Set(this.templateParams.map((p) => (0, template_param_1.getParamName)(p)));
+            const missingDeps = templateParam.uses.filter((dep) => !currParams.has(dep));
             if (missingDeps.length > 0) {
                 throw new Error(`Computed template param "${(0, template_param_1.getParamName)(templateParam)}" is missing dependency params: "${missingDeps.join(', ')}".`);
             }
@@ -56,7 +56,7 @@ class Scaffolder {
     }
     moduleFiles(moduleName) {
         var _a, _b;
-        return (_b = (_a = this.modules.find(m => m.name === moduleName)) === null || _a === void 0 ? void 0 : _a.filesToReplace.map(f => typeof f === 'string' ? f : f.path)) !== null && _b !== void 0 ? _b : [];
+        return (_b = (_a = this.modules.find((m) => m.name === moduleName)) === null || _a === void 0 ? void 0 : _a.filesToReplace.map((f) => (typeof f === 'string' ? f : f.path))) !== null && _b !== void 0 ? _b : [];
     }
     /**
      * Confirm that all files and configuration keys in the scaffolding dir
@@ -66,13 +66,13 @@ class Scaffolder {
     async validate() {
         const errors = [];
         // Generate template data for future checks
-        const paramVals = Object.fromEntries(this.templateParams.map(param => [(0, template_param_1.getParamName)(param), 'TEST']));
-        const modulesEnabled = Object.fromEntries(this.modules.map(module => [module.name, true]));
+        const paramVals = Object.fromEntries(this.templateParams.map((param) => [(0, template_param_1.getParamName)(param), 'TEST']));
+        const modulesEnabled = Object.fromEntries(this.modules.map((module) => [module.name, true]));
         const tplData = { params: paramVals, modules: modulesEnabled };
-        const tplDataFlat = Object.assign(Object.assign({}, (0, rename_keys_1.renameKeys)(tplData.modules, k => `modules.${k}`)), (0, rename_keys_1.renameKeys)(tplData.params, k => `params.${k}`));
-        const moduleNames = new Set(this.modules.map(m => m.name));
+        const tplDataFlat = Object.assign(Object.assign({}, (0, rename_keys_1.renameKeys)(tplData.modules, (k) => `modules.${k}`)), (0, rename_keys_1.renameKeys)(tplData.params, (k) => `params.${k}`));
+        const moduleNames = new Set(this.modules.map((m) => m.name));
         for (const module of this.modules) {
-            const missingDeps = module.togglable ? module.dependsOn.filter(dep => !moduleNames.has(dep)) : [];
+            const missingDeps = module.togglable ? module.dependsOn.filter((dep) => !moduleNames.has(dep)) : [];
             if (missingDeps.length > 0) {
                 errors.push(`Module "${module.name}" depends on modules that are not registered: "${missingDeps.join(', ')}".`);
             }
@@ -81,23 +81,23 @@ class Scaffolder {
         const configKeysToOwnerModules = new Map();
         const templateParamsToUsingModules = new Map();
         for (const module of this.modules) {
-            module.filesToReplace.forEach(file => {
+            module.filesToReplace.forEach((file) => {
                 var _a;
                 const path = typeof file === 'string' ? file : file.path;
                 const currModules = (_a = filesToOwnerModules.get(path)) !== null && _a !== void 0 ? _a : [];
                 filesToOwnerModules.set(path, [...currModules, module.name]);
             });
-            module.needsTemplateParams.forEach(paramName => {
+            module.needsTemplateParams.forEach((paramName) => {
                 var _a;
                 const currModules = (_a = filesToOwnerModules.get(paramName)) !== null && _a !== void 0 ? _a : [];
                 templateParamsToUsingModules.set(paramName, [...currModules, module.name]);
             });
-            Object.keys(module.jsonToAugment).forEach(jsonPath => {
+            Object.keys(module.jsonToAugment).forEach((jsonPath) => {
                 var _a;
                 const ownedKeys = (0, clone_and_fill_1.cloneAndFill)(module.jsonToAugment, tplDataFlat)[jsonPath];
                 const currJsonData = (_a = configKeysToOwnerModules.get(jsonPath)) !== null && _a !== void 0 ? _a : { fileOwners: [], keyOwners: new Map() };
                 currJsonData.fileOwners.push(module.name);
-                ownedKeys.forEach(key => {
+                ownedKeys.forEach((key) => {
                     var _a;
                     const currModules = (_a = currJsonData.keyOwners.get(key)) !== null && _a !== void 0 ? _a : [];
                     currJsonData.keyOwners.set(key, [...currModules, module.name]);
@@ -109,46 +109,46 @@ class Scaffolder {
         const moduleOwnedFiles = [...filesToOwnerModules.keys()];
         const moduleOwnedJsonConfs = new Set(configKeysToOwnerModules.keys());
         moduleOwnedFiles
-            .filter(path => moduleOwnedJsonConfs.has(path))
-            .forEach(path => {
+            .filter((path) => moduleOwnedJsonConfs.has(path))
+            .forEach((path) => {
             var _a, _b;
             const fileModules = (_a = filesToOwnerModules.get(path)) === null || _a === void 0 ? void 0 : _a.join(', ');
             const keyModules = (_b = configKeysToOwnerModules.get(path)) === null || _b === void 0 ? void 0 : _b.fileOwners.join(', ');
             errors.push(`File "${path}" is owned by modules: "${fileModules}". However, it also has keys that are owned by modules: "${keyModules}".`);
         });
         // Ensure that all owned files exist in the filesystem.
-        const scaffoldingFilePaths = new Set((await (0, globby_1.default)((0, node_path_1.resolve)(this.scaffoldDir, '**/*'), { dot: true })).map(p => p.replace(`${this.scaffoldDir}/`, '')).filter(p => p !== ''));
+        const scaffoldingFilePaths = new Set((await (0, globby_1.default)((0, path_1.resolve)(this.scaffoldDir, '**/*'), { dot: true })).map((p) => p.replace(`${this.scaffoldDir}/`, '')).filter((p) => p !== ''));
         moduleOwnedFiles
-            .filter(path => !scaffoldingFilePaths.has(path))
-            .forEach(path => {
+            .filter((path) => !scaffoldingFilePaths.has(path))
+            .forEach((path) => {
             var _a;
             const fileModules = (_a = filesToOwnerModules.get(path)) === null || _a === void 0 ? void 0 : _a.join(', ');
             errors.push(`File "${path}" is owned by modules: "${fileModules}", but it doesn't exist in the scaffolding directory.`);
         });
         [...moduleOwnedJsonConfs]
-            .filter(path => !scaffoldingFilePaths.has(path))
-            .forEach(path => {
+            .filter((path) => !scaffoldingFilePaths.has(path))
+            .forEach((path) => {
             var _a;
             const keyModules = (_a = configKeysToOwnerModules.get(path)) === null || _a === void 0 ? void 0 : _a.fileOwners.join(', ');
             errors.push(`File "${path}" has keys owned by modules: "${keyModules}", but it doesn't exist in the scaffolding directory.`);
         });
         // Ensure that all files in the filesystem are owned by at least one module.
         [...scaffoldingFilePaths]
-            .filter(path => !filesToOwnerModules.has(path) && !configKeysToOwnerModules.has(path))
-            .forEach(path => {
+            .filter((path) => !filesToOwnerModules.has(path) && !configKeysToOwnerModules.has(path))
+            .forEach((path) => {
             errors.push(`File "${path}" is not owned by any module.`);
         });
         // Ensure that every template param is used by at least one module.
         this.templateParams
-            .filter(p => !templateParamsToUsingModules.has((0, template_param_1.getParamName)(p)))
-            .forEach(p => {
+            .filter((p) => !templateParamsToUsingModules.has((0, template_param_1.getParamName)(p)))
+            .forEach((p) => {
             errors.push(`Template param "${(0, template_param_1.getParamName)(p)}" is defined, but not used by any modules.`);
         });
         // Ensure that every module's needed template params are provided.
-        const providedParams = new Set(this.templateParams.map(p => (0, template_param_1.getParamName)(p)));
+        const providedParams = new Set(this.templateParams.map((p) => (0, template_param_1.getParamName)(p)));
         [...templateParamsToUsingModules.keys()]
-            .filter(paramName => !providedParams.has(paramName))
-            .forEach(paramName => {
+            .filter((paramName) => !providedParams.has(paramName))
+            .forEach((paramName) => {
             var _a;
             const paramModules = (_a = templateParamsToUsingModules.get(paramName)) === null || _a === void 0 ? void 0 : _a.join(', ');
             errors.push(`Template param "${paramName}" is used by modules: "${paramModules}", but is not provided.`);
@@ -164,14 +164,14 @@ class Scaffolder {
             if (errors.length > 0) {
                 throw new Error(errors.join('\n'));
             }
-            const contents = (0, read_tpl_1.readTpl)((0, node_path_1.resolve)(this.scaffoldDir, path), tplData);
+            const contents = (0, read_tpl_1.readTpl)((0, path_1.resolve)(this.scaffoldDir, path), tplData);
             let json;
             try {
                 json = JSON.parse(contents);
                 const keys = new Set((0, json_leaf_paths_1.jsonLeafPaths)(json));
                 [...keys]
-                    .filter(k => !ownerData.keyOwners.has(k))
-                    .forEach(k => {
+                    .filter((k) => !ownerData.keyOwners.has(k))
+                    .forEach((k) => {
                     errors.push(`Key "${k}" in file "${path}" is not owned by any module.`);
                 });
                 [...ownerData.keyOwners.entries()]
@@ -195,8 +195,8 @@ class Scaffolder {
             throw new Error(errors.join('\n'));
         }
         // Ensure that all files can be resolved with ejs using provided template variables.
-        scaffoldingFilePaths.forEach(path => {
-            (0, read_tpl_1.readTpl)((0, node_path_1.resolve)(this.scaffoldDir, path), tplData);
+        scaffoldingFilePaths.forEach((path) => {
+            (0, read_tpl_1.readTpl)((0, path_1.resolve)(this.scaffoldDir, path), tplData);
         });
     }
 }

package/lib/boilersmith/scaffolding/template-param.d.ts

@@ -11,7 +11,7 @@ interface PromptTemplateParam<T, N extends string = string> {
 }
 interface ComputedTemplateParam<T, N extends string = string> {
     name: N;
-    uses: string[];
+    uses: N[];
     compute: (paths: Paths, ...args: any[]) => Promise<T>;
 }
 export declare type TemplateParam<T = unknown, N extends string = string> = PromptTemplateParam<T, N> | ComputedTemplateParam<T, N>;

package/lib/boilersmith/scaffolding/template-param.js

@@ -17,7 +17,7 @@ async function withComputedParamValues(params, paths, paramVals) {
     const vals = Object.assign({}, paramVals);
     const computedParams = params.filter(isComputedParam);
     for (const p of computedParams) {
-        const depValues = p.uses.map(key => vals[key]);
+        const depValues = p.uses.map((key) => vals[key]);
         // eslint-disable-next-line no-await-in-loop
         vals[p.name] = await p.compute(paths, ...depValues);
     }
@@ -39,7 +39,7 @@ async function currParamValues(params, fs, paths, io) {
     const paramVals = {};
     for (const p of promptParams) {
         // eslint-disable-next-line no-await-in-loop
-        paramVals[p.prompt.name] = (_a = await p.getCurrVal(fs, paths)) !== null && _a !== void 0 ? _a : await io.getParam(p.prompt);
+        paramVals[p.prompt.name] = (_a = (await p.getCurrVal(fs, paths))) !== null && _a !== void 0 ? _a : (await io.getParam(p.prompt));
     }
     return withComputedParamValues(params, paths, paramVals);
 }

package/lib/boilersmith/step-manager.d.ts

@@ -72,7 +72,6 @@ export declare class StepManager<Providers extends DefaultProviders> {
     run(paths: Paths, io: IO, providers: Providers, dry?: boolean): Promise<StepsResult>;
     protected stepShouldRun(storedStep: StoredStep<Providers>, io: IO, packagePath?: string): Promise<boolean>;
     protected runStep(storedStep: StoredStep<Providers>, paths: Paths, io: IO, providers: Providers, packagePath?: string, fs?: Store): Promise<Store>;
-    protected commit(fs: Store): Promise<boolean>;
 }
 export declare class AtomicStepManager<Providers = DefaultProviders> extends StepManager<Providers> {
     protected steps: StoredStep<Providers>[];

package/lib/boilersmith/step-manager.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AtomicStepManager = exports.StepManager = void 0;
 /* eslint-disable no-await-in-loop */
 const mem_fs_1 = require("mem-fs");
-const mem_fs_editor_1 = require("mem-fs-editor");
 const exposed_param_manager_1 = require("./exposed-param-manager");
-const formatDependencies = (strings) => strings.map(s => `"${s}"`).join(', ');
+const commit_async_1 = require("./utils/commit-async");
+const formatDependencies = (strings) => strings.map((s) => `"${s}"`).join(', ');
 class StepManager {
     constructor() {
         this.steps = [];
@@ -37,7 +37,7 @@ class StepManager {
         return this;
     }
     validateDependencies(step, dependencies, mapPaths) {
-        const missingDependencySteps = dependencies.map(dep => dep.sourceStep).filter(stepName => !this.namedSteps.has(stepName));
+        const missingDependencySteps = dependencies.map((dep) => dep.sourceStep).filter((stepName) => !this.namedSteps.has(stepName));
         if (missingDependencySteps.length > 0) {
             throw new Error(`Step of type "${step.type}" depends on nonexistent named steps ${formatDependencies(missingDependencySteps)}`);
         }
@@ -52,7 +52,7 @@ class StepManager {
             if (mapPaths.length === 0 && (sourceStep === null || sourceStep === void 0 ? void 0 : sourceStep.mapPaths.length)) {
                 throw new Error(`Non path-mapped step of type "${step.type}" may not depend on path-mapped step "${sourceStep === null || sourceStep === void 0 ? void 0 : sourceStep.name}".`);
             }
-            const missingMapPathsDeps = mapPaths.filter(p => sourceStep && !sourceStep.mapPaths.includes(p));
+            const missingMapPathsDeps = mapPaths.filter((p) => sourceStep && !sourceStep.mapPaths.includes(p));
             if (sourceStep && (missingMapPathsDeps === null || missingMapPathsDeps === void 0 ? void 0 : missingMapPathsDeps.length) && sourceStep.mapPaths.length > 0) {
                 throw new Error(`Step of type "${step.type}" (A) depends on named step: "${sourceStep.name}" (B), but is mapped across some paths that (B) is not: "${missingMapPathsDeps.join(', ')}"`);
             }
@@ -62,7 +62,7 @@ class StepManager {
         }
     }
     async run(paths, io, providers, dry = false) {
-        if (dry && this.steps.some(s => !(s instanceof AtomicStepManager) && !s.step.composable)) {
+        if (dry && this.steps.some((s) => !(s instanceof AtomicStepManager) && !s.step.composable)) {
             throw new Error('Cannot dry run, as this step manager has non-composable steps.');
         }
         const stepNames = [];
@@ -72,7 +72,7 @@ class StepManager {
                 return;
             const fs = await this.runStep(step, paths, io, providers, packagePath);
             if (!dry) {
-                await this.commit(fs);
+                await (0, commit_async_1.commitAsync)(fs);
             }
             stepNames.push(packagePath ? `${step.step.type} (${packagePath})` : step.step.type);
         };
@@ -139,9 +139,9 @@ class StepManager {
             const sourceStep = this.namedSteps.get(dep.sourceStep);
             let depValue;
             depValue =
-                dep.exposedName === '__succeeded' ?
-                    this.exposedParams.stepRan(dep.sourceStep, packagePath) :
-                    this.exposedParams.get(dep.sourceStep, dep.exposedName, (sourceStep === null || sourceStep === void 0 ? void 0 : sourceStep.mapPaths.length) ? packagePath : undefined);
+                dep.exposedName === '__succeeded'
+                    ? this.exposedParams.stepRan(dep.sourceStep, packagePath)
+                    : this.exposedParams.get(dep.sourceStep, dep.exposedName, (sourceStep === null || sourceStep === void 0 ? void 0 : sourceStep.mapPaths.length) ? packagePath : undefined);
             if (dep.modifier) {
                 depValue = dep.modifier(depValue);
             }
@@ -156,16 +156,6 @@ class StepManager {
         }
         return newFs;
     }
-    async commit(fs) {
-        return new Promise((resolve, _reject) => {
-            (0, mem_fs_editor_1.create)(fs).commit(err => {
-                if (err) {
-                    throw new Error(err);
-                }
-                resolve(true);
-            });
-        });
-    }
 }
 exports.StepManager = StepManager;
 class AtomicStepManager extends StepManager {
@@ -222,7 +212,7 @@ class AtomicStepManager extends StepManager {
             };
         }
         if (!dry) {
-            await this.commit(fs);
+            await (0, commit_async_1.commitAsync)(fs);
         }
         return {
             succeeded: true,

package/lib/boilersmith/steps/stub-base.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const pick_deep_1 = (0, tslib_1.__importDefault)(require("pick-deep"));
 const mem_fs_editor_1 = require("mem-fs-editor");
 const clone_and_fill_1 = require("../utils/clone-and-fill");
-const node_path_1 = require("node:path");
+const path_1 = require("path");
 class BaseStubStep {
     constructor(stubDir, scaffolder) {
         this.composable = true;
@@ -27,7 +27,7 @@ class BaseStubStep {
         const newFileName = await this.getFileName(fs, paths, io);
         const newFilePath = paths.package(this.schema.root || this.defaultRoot, this.subdir, newFileName);
         const stub = (0, clone_and_fill_1.cloneAndFill)(this.schema.sourceFile, this.params);
-        fsEditor.copyTpl((0, node_path_1.resolve)(this.stubDir, stub), newFilePath, this.params);
+        fsEditor.copyTpl((0, path_1.resolve)(this.stubDir, stub), newFilePath, this.params);
         return fs;
     }
     getExposed(_paths, _paramProvider) {
@@ -38,7 +38,7 @@ class BaseStubStep {
     }
     async compileParams(fs, paths, io) {
         const params = await this.precompileParams(fs, paths, io);
-        const paramDefs = this.schema.params.filter(param => !this.implicitParams.includes(param.name) && !Object.keys(params).includes(param.name));
+        const paramDefs = this.schema.params.filter((param) => !this.implicitParams.includes(param.name) && !Object.keys(params).includes(param.name));
         for (const paramDef of paramDefs) {
             // eslint-disable-next-line no-await-in-loop
             params[paramDef.name] = await io.getParam(paramDef);

package/lib/boilersmith/utils/clone-and-fill.js

@@ -11,7 +11,7 @@ function cloneAndFill(obj, params) {
         if (typeof obj === 'string')
             return fill(obj, params);
         if (Array.isArray(obj))
-            return obj.map(v => recursiveCopyAndFill(v, params));
+            return obj.map((v) => recursiveCopyAndFill(v, params));
         // eslint-disable-next-line no-new-object
         if (obj !== new Object(obj))
             return obj;

package/lib/boilersmith/utils/commit-async.d.ts

@@ -0,0 +1,2 @@
+import { Store } from 'mem-fs';
+export declare function commitAsync(fs: Store): Promise<boolean>;

package/lib/boilersmith/utils/commit-async.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.commitAsync = void 0;
+const mem_fs_editor_1 = require("mem-fs-editor");
+async function commitAsync(fs) {
+    return new Promise((resolve, _reject) => {
+        (0, mem_fs_editor_1.create)(fs).commit((err) => {
+            if (err) {
+                throw new Error(err);
+            }
+            resolve(true);
+        });
+    });
+}
+exports.commitAsync = commitAsync;

package/lib/boilersmith/utils/read-tpl.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readTpl = void 0;
 const ejs_1 = require("ejs");
-const node_fs_1 = require("node:fs");
+const fs_1 = require("fs");
 function readTpl(path, data, options) {
-    const template = (0, node_fs_1.readFileSync)(path, 'utf8');
+    const template = (0, fs_1.readFileSync)(path, 'utf8');
     return (0, ejs_1.render)(template, data, Object.assign(Object.assign({ filename: path }, options), { async: false }));
 }
 exports.readTpl = readTpl;

package/lib/commands/audit/infra.d.ts

@@ -11,6 +11,6 @@ export default class AuditInfra extends BaseCommand {
         name: string;
         description: string;
     }[];
-    protected steps(stepManager: StepManager<FlarumProviders>): StepManager<FlarumProviders>;
+    protected steps(stepManager: StepManager<FlarumProviders>, extRoot: string): StepManager<FlarumProviders>;
     protected additionalPreRunChecks(extRoot: string): Promise<void>;
 }

package/lib/commands/audit/infra.js

@@ -4,16 +4,38 @@ const tslib_1 = require("tslib");
 const base_command_1 = (0, tslib_1.__importDefault)(require("../../base-command"));
 const gen_ext_scaffolder_1 = require("../../steps/gen-ext-scaffolder");
 const core_1 = require("@oclif/core");
+const yarn_1 = require("../../steps/misc/yarn");
+const composer_1 = require("../../steps/misc/composer");
+const npm_1 = require("../../steps/misc/npm");
 class AuditInfra extends base_command_1.default {
-    steps(stepManager) {
+    steps(stepManager, extRoot) {
         this.dry = !this.flags.fix;
-        const mapPaths = this.flags.monorepo ? this.monorepoPaths({
-            includeCore: true,
-            includeExtensions: true,
-            includePhpPackages: false,
-            includeJSPackages: false,
-        }) : [];
-        stepManager.step((0, gen_ext_scaffolder_1.genExtScaffolder)().genAuditStep(!this.flags.fix), {}, [], {}, mapPaths);
+        const mapPaths = this.flags.monorepo
+            ? this.monorepoPaths({
+                includeCore: true,
+                includeExtensions: true,
+                includePhpPackages: false,
+                includeJSPackages: false,
+            })
+            : [];
+        stepManager.namedStep('audit', (0, gen_ext_scaffolder_1.genExtScaffolder)().genAuditStep(!this.flags.fix), {}, [], {}, mapPaths);
+        if (!this.flags.monorepo && !this.dry) {
+            const packageManager = this.jsPackageManager(extRoot);
+            stepManager.step(packageManager === 'npm' ? new npm_1.NpmInstall() : new yarn_1.YarnInstall(), { optional: true, confirmationMessage: `Run \`${packageManager !== null && packageManager !== void 0 ? packageManager : 'yarn'}\`? (recommended)`, default: true }, [
+                {
+                    sourceStep: 'audit',
+                    exposedName: '__succeeded',
+                    dontRunIfFalsy: true,
+                },
+            ]);
+            stepManager.step(new composer_1.ComposerInstall(), { optional: true, confirmationMessage: 'Run `composer update`? (recommended)', default: true }, [
+                {
+                    sourceStep: 'audit',
+                    exposedName: '__succeeded',
+                    dontRunIfFalsy: true,
+                },
+            ]);
+        }
         return stepManager;
     }
     async additionalPreRunChecks(extRoot) {

package/lib/commands/flarum/change.d.ts

@@ -0,0 +1,16 @@
+import { Command } from '@oclif/core';
+export default class Info extends Command {
+    static description: string;
+    /**
+     * Should only need to keep two registered at all times.
+     */
+    static map: {
+        cli: string | number;
+        flarum: string | number;
+    }[];
+    run(): Promise<void>;
+    install(cli: number | string, flarum: number | string, sudo?: boolean): void;
+    isWindows(): boolean;
+    binPath(bin: string): null | string;
+    protected execRetryingAsSudo(command: string): void;
+}

package/lib/commands/flarum/change.js

@@ -0,0 +1,103 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const io_1 = require("boilersmith/io");
+const errors_1 = require("@oclif/errors");
+const child_process_1 = require("child_process");
+const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+class Info extends core_1.Command {
+    async run() {
+        const jsonPath = path_1.default.resolve(__dirname, '../../../package.json');
+        const json = require(jsonPath);
+        const currentFlarumVersion = Number(json.flarum.split('.')[0]);
+        const currentCliVersion = Number(json.version.split('.')[0]);
+        const other = Info.map.find((i) => i.cli !== currentCliVersion);
+        if (!other) {
+            this.error('No other versions to switch to.');
+        }
+        const otherCliVersion = other.cli;
+        const otherFlarumVersion = other.flarum;
+        const io = new io_1.PromptsIO({}, [], false, errors_1.exit);
+        const currentCli = chalk_1.default.bold.yellow(`CLI ${currentCliVersion}.x`);
+        const currentFlarum = chalk_1.default.bold.green(`Flarum ${currentFlarumVersion}.x`);
+        const otherCli = chalk_1.default.bold.yellow(`CLI ${otherCliVersion}.x`);
+        const otherFlarum = chalk_1.default.bold.green(`Flarum ${otherFlarumVersion}.x`);
+        // Show current versions
+        this.log(`Currently using ${currentCli} compatible with ${currentFlarum}\n\n`);
+        // confirm the switch to the other cli version
+        const yes = await io.getParam({
+            name: 'verify',
+            type: 'confirm',
+            message: `Switch to ${otherCli} compatible with ${otherFlarum}?`,
+            initial: true,
+        });
+        if (!yes) {
+            return;
+        }
+        // CLI v3 will have a fl2 bin
+        // CLI v2 will have a fl1 bin
+        // We need to replace the default fl bin with the now installed fl2 or fl1 bin
+        const otherBin = `fl${otherFlarumVersion}`;
+        let otherBinPath = this.binPath(otherBin);
+        if (!otherBinPath) {
+            this.install(otherCliVersion, otherFlarumVersion);
+            otherBinPath = this.binPath(otherBin);
+            if (!otherBinPath) {
+                this.error('Could not install the other version.');
+            }
+        }
+        const defaultBinPath = otherBinPath.split('/').slice(0, -1).join('/') + '/fl';
+        if (!this.isWindows()) {
+            // replace the default fl bin with the now installed fl2 or fl1 bin
+            // the path to the fl bin is the same as the path to the fl2 or fl1 bin, just without the 2 or 1
+            this.execRetryingAsSudo(`cp -f ${otherBinPath} ${defaultBinPath}`);
+        }
+        else {
+            (0, child_process_1.execSync)(`copy /Y ${otherBinPath} ${defaultBinPath}`, { stdio: 'inherit' });
+        }
+    }
+    install(cli, flarum, sudo = false) {
+        try {
+            (0, child_process_1.execSync)((sudo ? 'sudo ' : '') + `npm install -g fl${flarum}@npm:@flarum/cli@${cli} --force`, { stdio: 'inherit' });
+        }
+        catch (error) {
+            if (error.stderr && error.stderr.toString().includes('Permission denied') && !sudo && !this.isWindows()) {
+                this.log(chalk_1.default.red('Permission denied. Running with sudo.'));
+                this.install(cli, flarum, true);
+            }
+        }
+    }
+    isWindows() {
+        return process.platform === 'win32';
+    }
+    binPath(bin) {
+        try {
+            return this.isWindows() ? (0, child_process_1.execSync)('where ' + bin, { encoding: 'utf8' }).trim() : (0, child_process_1.execSync)('which ' + bin, { encoding: 'utf8' }).trim();
+        }
+        catch (_a) {
+            return null;
+        }
+    }
+    execRetryingAsSudo(command) {
+        try {
+            (0, child_process_1.execSync)(command, { stdio: 'inherit' });
+        }
+        catch (error) {
+            if (error.stderr && error.stderr.toString().includes('Permission denied')) {
+                this.log(chalk_1.default.red('Permission denied. Running with sudo.'));
+                (0, child_process_1.execSync)('sudo ' + command, { stdio: 'inherit' });
+            }
+        }
+    }
+}
+exports.default = Info;
+Info.description = 'Related Flarum version information.';
+/**
+ * Should only need to keep two registered at all times.
+ */
+Info.map = [
+    { cli: 3, flarum: 2 },
+    { cli: 2, flarum: 1 },
+];

package/lib/commands/flarum/info.d.ts

@@ -0,0 +1,5 @@
+import { Command } from '@oclif/core';
+export default class Info extends Command {
+    static description: string;
+    run(): Promise<void>;
+}

package/lib/commands/flarum/info.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
+class Info extends core_1.Command {
+    async run() {
+        const jsonPath = path_1.default.resolve(__dirname, '../../../package.json');
+        const json = require(jsonPath);
+        const flarumVersion = json.flarum;
+        const cliVersion = json.version;
+        this.log(`Flarum version: ${flarumVersion}`);
+        this.log(`CLI version: ${cliVersion}`);
+    }
+}
+exports.default = Info;
+Info.description = 'Related Flarum version information.';

package/lib/commands/infra.d.ts

@@ -13,8 +13,8 @@ export default class Infra extends BaseCommand {
         name: string;
         description: string;
         required: boolean;
-        options: ("core" | "icon" | "js" | "jsCommon" | "css" | "locale" | "gitConf" | "githubActions" | "prettier" | "typescript" | "bundlewatch" | "backendTesting" | "editorConfig" | "styleci")[];
+        options: ("core" | "js" | "icon" | "admin" | "forum" | "jsCommon" | "css" | "locale" | "gitConf" | "githubActions" | "prettier" | "typescript" | "bundlewatch" | "backendTesting" | "editorConfig" | "styleci")[];
     })[];
-    protected steps(stepManager: StepManager<FlarumProviders>): StepManager<FlarumProviders>;
+    protected steps(stepManager: StepManager<FlarumProviders>, extRoot: string): StepManager<FlarumProviders>;
     protected additionalPreRunChecks(extRoot: string): Promise<void>;
 }

package/lib/commands/infra.js

@@ -4,23 +4,26 @@ const tslib_1 = require("tslib");
 const composer_1 = require("../steps/misc/composer");
 const base_command_1 = (0, tslib_1.__importDefault)(require("../base-command"));
 const gen_ext_scaffolder_1 = require("../steps/gen-ext-scaffolder");
+const npm_1 = require("../steps/misc/npm");
 const yarn_1 = require("../steps/misc/yarn");
 const core_1 = require("@oclif/core");
 class Infra extends base_command_1.default {
-    steps(stepManager) {
+    steps(stepManager, extRoot) {
         const module = this.args.module;
-        const mapPaths = this.flags.monorepo ? this.monorepoPaths({
-            includeCore: true,
-            includeExtensions: true,
-            includePhpPackages: false,
-            includeJSPackages: false,
-        }) : [];
-        stepManager
-            .namedStep('infra', (0, gen_ext_scaffolder_1.genExtScaffolder)().genInfraStep(this.args.module), {}, [], {}, mapPaths);
+        const mapPaths = this.flags.monorepo
+            ? this.monorepoPaths({
+                includeCore: true,
+                includeExtensions: true,
+                includePhpPackages: false,
+                includeJSPackages: false,
+            })
+            : [];
+        stepManager.namedStep('infra', (0, gen_ext_scaffolder_1.genExtScaffolder)().genInfraStep(this.args.module), {}, [], {}, mapPaths);
         const JS_MODULES = ['js', 'prettier', 'typescript'];
         const PHP_MODULES = ['backendTesting'];
+        const packageManager = this.jsPackageManager(extRoot);
         if (!this.flags.monorepo && JS_MODULES.includes(module)) {
-            stepManager.step(new yarn_1.YarnInstall(), { optional: true, confirmationMessage: 'Run `yarn`? (recommended)', default: true }, [
+            stepManager.step(packageManager === 'npm' ? new npm_1.NpmInstall() : new yarn_1.YarnInstall(), { optional: true, confirmationMessage: `Run \`${packageManager !== null && packageManager !== void 0 ? packageManager : 'yarn'}\`? (recommended)`, default: true }, [
                 {
                     sourceStep: 'infra',
                     exposedName: '__succeeded',
@@ -47,9 +50,12 @@ class Infra extends base_command_1.default {
 exports.default = Infra;
 Infra.description = 'Add/Update infrastructure to the latest scaffolding for some module in an extension. For example, you can use this to add/update TypeScript, backend testing, GitHub Actions, and other features.';
 Infra.flags = Object.assign({ monorepo: core_1.Flags.boolean({ char: 'm', default: false }) }, base_command_1.default.flags);
-Infra.args = [{
+Infra.args = [
+    {
         name: 'module',
         description: 'The name of the module to enable/update.',
         required: true,
         options: [...gen_ext_scaffolder_1.EXTENSION_MODULES],
-    }, ...base_command_1.default.args];
+    },
+    ...base_command_1.default.args,
+];