@flarum/cli 2.0.0-beta.1 → 2.0.0-beta.13

package/README.md

@@ -37,7 +37,7 @@ $ npm install -g @flarum/cli
 $ flarum-cli COMMAND
 running command...
 $ flarum-cli (-v|--version|version)
-@flarum/cli/2.0.0-beta.1 linux-x64 node-v16.13.0
+@flarum/cli/2.0.0-beta.13 linux-x64 node-v16.13.0
 $ flarum-cli --help [COMMAND]
 USAGE
   $ flarum-cli COMMAND
@@ -61,8 +61,9 @@ flarum-cli --help
 
 # Commands
 * `flarum-cli help [COMMAND]`
-* `flarum-cli infra backend-testing [PATH]`
 * `flarum-cli init [PATH]`
+* `flarum-cli infra [MODULE] [PATH]`
+* `flarum-cli audit infra [--monorepo] [--fix]`
 * `flarum-cli make backend api-controller [PATH]`
 * `flarum-cli make backend api-serializer [PATH]`
 * `flarum-cli make backend api-serializer-attributes [PATH]`
@@ -83,6 +84,8 @@ flarum-cli --help
 * `flarum-cli make frontend model [PATH]`
 * `flarum-cli update js-imports [PATH]`
 
+All commands can use a `--no-interaction` flag to proceed with defaults when possible.
+
 ## For Maintainers
 
 This section is for maintainers of the flarum-cli codebase.
@@ -99,7 +102,7 @@ The base command is implemented at [src/base-command.ts](https://github.com/flar
 3. Confirm we are in the right directory
 4. Confirm that files will be overwritten / clear files as needed
 5. Run a set of registered steps
-6. Tell the user which steps ran
+6. Tell the user which steps ran, or display any errors
 7. Show a goodbye message
 
 Actual functionality is implemented at the step layer.
@@ -117,7 +120,7 @@ More documentation (and functionality!) will be added later.
 
 #### What are steps?
 
-Steps represent granular operations. Some are bigger and some are smaller, but they include:
+Steps represent meaningful, granular operations. Some are bigger and some are smaller, but they include:
 
 - Initializing an extension from boilerplate
 - Updating some part of an extension from boilerplate (like adding backend testing)
@@ -132,9 +135,10 @@ If some subtask might be needed by multiple commands, that should be a step too.
 The actual logic of a step is implemented in the async `run` method. This method takes:
 
 - An in-memory filesystem object (through `mem-fs`)
-- A path provider, which is a class that can be used to get paths relative to the extension root, the working directory, the requested directory, and the CLI's boilerplate directory
-- A param provider, which can be used to prompt the user for parameters. We'll discuss this more soon.
-- A "php provider", which can be used to interact with the PHP subsystem to add extenders to extend.php.
+- A paths object, which is a class that can be used to get paths relative to the extension root, the working directory, the requested directory (if the command was run with the `path` arg specified), and the monorepo directory (if in a subdirectory of a monorepo).
+- An `io` instance, which can be used to prompt the user for input or display outputs / errors.
+- An object of "providers", which represent additional functionality. For Flarum commands, these are:
+  - A "php provider", which can be used to interact with the PHP subsystem to add extenders to extend.php.
 
 Steps should modify the in-memory filesystem with their changes and return it.
 
@@ -214,8 +218,6 @@ Steps for generating extenders should use `src/steps/extenders/base`, where all
 
 Steps for generating templates from php stubs should use `src/steps/stubs/php-base`, where they just need to describe what stub file they use, which params they need, and a recommended namespace where the generated file should be placed.
 
-Steps for `infra` operations (copying over some portion of the default skeleton, for operations like adding/updating backend testing or TypeScript config) shouls use `src/steps/infra/base`, where all they need to indicate is a list of files from the boilerplate they copy over, and an object describing which JSON config keys should be copied from the boilerplate to the extension for various JSON files.
-
 ### Testing
 
 Most of this architecture was driven by TDD and BDD development, allowing for a highly decoupled system.
@@ -225,3 +227,37 @@ Any additions of steps, modifications of providers, or changes of functionality
 The 3 base step types actually provide a simple interface to generate test cases. See the relevant test files for more info.
 
 Since commands directly affect the filesystem, unit tests for them aren't really possible. It would also be quite complex to unit test all commands in addition to all steps. For this reason, commands should be manually tested, but unit tests are not currently required.
+
+### Monorepo Support
+
+Flarum CLI was designed with monorepos in mind.
+When registering a step, you can provide it an array of subdirectories to run it in.
+For each of these subdirectories, an instance of the step will run with the `paths` object returning the subdirectory as `package()`, and the original root directory as `monorepo()`.
+
+A monorepo should have a `flarum-monorepo.json` file in the root directory with the following (optional) keys:
+
+- `packages.core`: a path to Flarum Core, if present.
+- `packages.extensions`: an array of paths to Flarum extensions.
+- `packages.composer`: an array of paths to non-extension PHP Composer packages published on Packagist.
+- `packages.npm`: an array of paths to non-extension JS/TS packages published on NPM.
+
+### Scaffolding Generation
+
+One powerful use-case of Flarum CLI is creating new extensions, and keeping infrastructure in sync for existing extensions.
+For example, if managing 100 extensions, making sure the prettier config is consistent for all of them can be very tedious. Additionally, it can be annoying to have to add TypeScript config to every extension, and it's easy to make mistakes.
+
+For this purpose, Flarum CLI's `Scaffolder` system formalizes the concepts of initializing and updating extension infrastructure.
+
+At the core level, there's a boilerplate directory (`boilerplate/skeleton/extension`) that contains the scaffolding for a new extension.
+
+The scaffolder receives a set of modules, which represent some aspect of infrastructure (e.g. JS, TypeScript, Backend Testing, etc).
+Modules can be updatable (e.g. TypeScript) or not (e.g. the core setup of an `extend.php` file).
+They can also be togglable (e.g. JS), or not, in which case they are always on.
+
+Modules own files in the scaffolding directory, as well as keys in JSON config files. Every file and key must belong to at least one module. If any keys in a JSON config file belong to a module, all keys must belong to a module; if no keys are owned, the config file is treated like any other file.
+
+Modules also have template params, which are used as variables in the scaffolding.
+
+There's a lot more features and guaruntees than that, see the `Module` interface for more information.
+
+The main benefit to this system is that given this scaffolding / module setup, it is possible to generate steps to initialize a new extension, update/add a module to an existing extension, or audit an extension for any outdated infrastructure. This is how the `init`, `infra`, and `audit infra` commands are implemented.

package/boilerplate/skeleton/extension/.gitattributes

@@ -13,5 +13,6 @@ tests export-ignore
 js/dist/* -diff
 js/dist/* linguist-generated
 js/dist-typings/* linguist-generated
+js/yarn.lock -diff
 
 * text=auto eol=lf

package/boilerplate/skeleton/extension/.github/workflows/backend.yml

@@ -1,4 +1,4 @@
-name: PHP
+name: <%= params.extensionName %> PHP
 
 on: [workflow_dispatch, push, pull_request]
 

package/boilerplate/skeleton/extension/.github/workflows/frontend.yml

@@ -1,4 +1,4 @@
-name: JS
+name: <%= params.extensionName %> JS
 
 on: [workflow_dispatch, push, pull_request]
 

package/boilerplate/skeleton/extension/extend.php

@@ -14,10 +14,10 @@ namespace <%= params.packageNamespace %>;
 use Flarum\Extend;
 
 return [
-    <% if (modules.js || modules.css) { %>(new Extend\Frontend('forum'))
+    <% if (modules.forum) { %>(new Extend\Frontend('forum'))
         <% if (modules.js) { %>->js(__DIR__.'/js/dist/forum.js')<% if (!modules.css) { %>,<% } %><% } %>
         <% if (modules.css) { %>->css(__DIR__.'/less/forum.less'),<% } %><% } %>
-    <% if (modules.js || modules.css) { %>(new Extend\Frontend('admin'))
+    <% if (modules.admin) { %>(new Extend\Frontend('admin'))
         <% if (modules.js) { %>->js(__DIR__.'/js/dist/admin.js')<% if (!modules.css) { %>,<% } %><% } %>
         <% if (modules.css) { %>->css(__DIR__.'/less/admin.less'),<% } %><% } %>
     <% if (modules.locale) { %>new Extend\Locales(__DIR__.'/locale'),<% } %>

package/boilerplate/skeleton/extension/gitignore

@@ -0,0 +1,12 @@
+/vendor
+composer.lock
+composer.phar
+
+.DS_Store
+Thumbs.db
+tests/.phpunit.result.cache
+/tests/integration/tmp
+.vagrant
+.idea/*
+.vscode
+js/coverage-ts

package/boilerplate/skeleton/extension/js/.bundlewatch.config.json

@@ -0,0 +1,8 @@
+{
+    "files": [
+        {
+            "path": "./dist/*.js"
+        }
+    ],
+    "defaultCompression": "gzip"
+}

package/boilerplate/skeleton/extension/js/admin.ts

@@ -0,0 +1,2 @@
+<% if (modules.jsCommon) { %>export * from './src/common';
+<% } %>export * from './src/admin';

package/boilerplate/skeleton/extension/js/forum.ts

@@ -0,0 +1,2 @@
+<% if (modules.jsCommon) { %>export * from './src/common';
+<% } %>export * from './src/forum';

package/boilerplate/skeleton/extension/js/gitignore

@@ -0,0 +1,9 @@
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+node_modules

package/boilerplate/skeleton/extension/js/package.json

@@ -8,10 +8,10 @@
     "@flarum/prettier-config": "^1.0.0",
     "flarum-tsconfig": "^1.0.2",
     "flarum-webpack-config": "^2.0.0",
-    "prettier": "^2.4.1",
-    "typescript": "^4.4.4",
+    "prettier": "^2.5.1",
+    "typescript": "^4.5.4",
     "typescript-coverage-report": "^0.6.1",
-    "webpack": "^5.61.0",
+    "webpack": "^5.65.0",
     "webpack-cli": "^4.9.1"
   },
   "scripts": {

package/boilerplate/skeleton/extension/js/src/admin/index.ts

@@ -0,0 +1,5 @@
+import app from 'flarum/admin/app';
+
+app.initializers.add('<%= params.packageName %>', () => {
+  console.log('[<%= params.packageName %>] Hello, admin!');
+});

package/boilerplate/skeleton/extension/js/src/common/index.ts

@@ -0,0 +1,5 @@
+import app from 'flarum/common/app';
+
+app.initializers.add('<%= params.packageName %>', () => {
+  console.log('[<%= params.packageName %>] Hello, forum and admin!');
+});

package/boilerplate/skeleton/extension/js/src/forum/index.ts

@@ -0,0 +1,5 @@
+import app from 'flarum/forum/app';
+
+app.initializers.add('<%= params.packageName %>', () => {
+  console.log('[<%= params.packageName %>] Hello, forum!');
+});

package/lib/base-command.d.ts

@@ -1,4 +1,5 @@
 import { Command, Interfaces } from '@oclif/core';
+import { IO } from 'boilersmith/io';
 import { StepManager } from 'boilersmith/step-manager';
 import { FlarumProviders } from './providers';
 export declare enum LocationType {
@@ -23,6 +24,7 @@ export default abstract class BaseCommand extends Command {
     protected goodbyeMessage(): string;
     protected additionalPreRunChecks(_extRoot: string): Promise<void>;
     protected abstract steps(stepManager: StepManager<FlarumProviders>): StepManager<FlarumProviders>;
+    protected genIO(): IO;
     protected monorepoPaths(options: {
         includeCore: boolean;
         includeExtensions: boolean;

package/lib/base-command.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const cli_ux_1 = (0, tslib_1.__importDefault)(require("cli-ux"));
 const node_path_1 = require("node:path");
-const prompts_1 = (0, tslib_1.__importDefault)(require("prompts"));
 const globby_1 = (0, tslib_1.__importDefault)(require("globby"));
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
@@ -14,6 +13,7 @@ const step_manager_1 = require("boilersmith/step-manager");
 const paths_1 = require("boilersmith/paths");
 const php_provider_1 = require("./providers/php-provider");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const errors_1 = require("@oclif/errors");
 var LocationType;
 (function (LocationType) {
     LocationType[LocationType["FLARUM_EXTENSION"] = 0] = "FLARUM_EXTENSION";
@@ -41,9 +41,7 @@ class BaseCommand extends core_1.Command {
             const rootData = await this.getFlarumExtensionRoot(path || process.cwd());
             extRoot = rootData.path;
             this.locationType = rootData.type;
-            if (!this.flags.defaults) {
-                await this.confirmExtDir(extRoot);
-            }
+            await this.confirmExtDir(extRoot);
         }
         else {
             extRoot = path || process.cwd();
@@ -55,7 +53,7 @@ class BaseCommand extends core_1.Command {
         });
         const phpProvider = new php_provider_1.PhpSubsystemProvider((0, node_path_1.resolve)(__dirname, '../php-subsystem/index.php'));
         const out = await this.steps(new step_manager_1.StepManager())
-            .run(paths, new io_1.PromptsIO(), { php: phpProvider }, this.dry);
+            .run(paths, this.genIO(), { php: phpProvider }, this.dry);
         const errorMessages = out.messages.filter(m => m.type === 'error');
         this.log('\n\n');
         if (out.succeeded && errorMessages.length === 0) {
@@ -116,6 +114,9 @@ class BaseCommand extends core_1.Command {
     // ----------------------------------------------------------------
     // Confirmation
     // ----------------------------------------------------------------
+    genIO() {
+        return new io_1.PromptsIO({}, [], this.flags['no-interaction'], errors_1.exit);
+    }
     monorepoPaths(options) {
         try {
             const monorepoConfig = (0, node_fs_1.readFileSync)((0, node_path_1.resolve)(process.cwd(), 'flarum-monorepo.json'));
@@ -161,30 +162,26 @@ class BaseCommand extends core_1.Command {
 - Flarum monorepos must have a valid 'flarum-monorepo.json' file`);
     }
     async confirmExtDir(extRoot) {
-        const response = await (0, prompts_1.default)([
-            {
-                name: 'verify',
-                type: 'confirm',
-                message: `Work in Flarum package located at ${(0, node_path_1.resolve)(extRoot)}?`,
-                initial: true,
-            },
-        ], io_1.PROMPTS_OPTIONS);
-        if (!response.verify)
+        const verify = await this.genIO().getParam({
+            name: 'verify',
+            type: 'confirm',
+            message: `Work in Flarum package located at ${(0, node_path_1.resolve)(extRoot)}?`,
+            initial: true,
+        });
+        if (!verify)
             this.exit();
     }
     async ensureComposerInstallRan(extRoot) {
         if ((0, node_fs_1.existsSync)((0, node_path_1.resolve)(extRoot, 'vendor/flarum/core/composer.json')))
             return;
         this.log("This command requires `composer install` to have been ran in your extension's root directory.");
-        const response = await (0, prompts_1.default)([
-            {
-                name: 'composer',
-                type: 'confirm',
-                message: 'Would you like me to take care of that for you?',
-                initial: true,
-            },
-        ], io_1.PROMPTS_OPTIONS);
-        if (response.composer) {
+        const composer = await this.genIO().getParam({
+            name: 'composer',
+            type: 'confirm',
+            message: 'Would you like me to take care of that for you?',
+            initial: true,
+        });
+        if (composer) {
             cli_ux_1.default.action.start('Installing composer packages');
             (0, node_child_process_1.execSync)('composer install', { cwd: extRoot });
             cli_ux_1.default.action.stop();
@@ -204,14 +201,13 @@ class BaseCommand extends core_1.Command {
         const empty = files.length === 0 || (files.length === 1 && files[0] === '.git');
         if (empty)
             return false;
-        const response = await (0, prompts_1.default)([
-            {
-                name: 'overwrite',
-                type: 'confirm',
-                message: confirmationMessage,
-            },
-        ], io_1.PROMPTS_OPTIONS);
-        if (response.overwrite === false)
+        const overwrite = await this.genIO().getParam({
+            name: 'overwrite',
+            type: 'confirm',
+            message: confirmationMessage,
+            initial: true,
+        });
+        if (overwrite === false)
             this.exit();
         return true;
     }
@@ -222,7 +218,7 @@ class BaseCommand extends core_1.Command {
 }
 exports.default = BaseCommand;
 BaseCommand.flags = {
-    defaults: core_1.Flags.boolean({ char: 'd', description: 'Assume default responses to prompts where possible.', default: false }),
+    'no-interaction': core_1.Flags.boolean({ char: 'n', description: 'Do not ask any interactive questions, assume defaults. When impossible, error.', default: false }),
     help: core_1.Flags.help({ char: 'h' }),
 };
 BaseCommand.args = [

package/lib/boilersmith/io.d.ts

@@ -1,4 +1,4 @@
-import { Options, PromptObject } from 'prompts';
+import { PromptObject } from 'prompts';
 export declare type ParamDef<N extends string = string> = Omit<PromptObject<N>, 'name'> & {
     name: N;
 };
@@ -29,12 +29,15 @@ export interface IO {
     getOutput(): Message[];
     newInstance(cache: Record<string, unknown>, messages: Message[]): IO;
 }
-export declare const PROMPTS_OPTIONS: Options;
+declare type OnCancel = () => void;
 export declare class PromptsIO implements IO {
     supportsAnsiColor: boolean;
     private cache;
     private messages;
-    constructor(initial?: Record<string, unknown>, messages?: Message[]);
+    private noInteraction;
+    private onCancel?;
+    private prev?;
+    constructor(initial?: Record<string, unknown>, messages?: Message[], noInteraction?: boolean, onCancel?: OnCancel);
     getParam<T>(paramDef: ParamDef): Promise<T>;
     hasCached(name: string): boolean;
     /**
@@ -44,7 +47,8 @@ export declare class PromptsIO implements IO {
     info(message: string, immediate: boolean): void;
     warning(message: string, immediate: boolean): void;
     error(message: string, immediate: false): void;
-    error(message: string, immediate: true): void;
+    error(message: string, immediate: true): never;
     getOutput(): Message[];
     newInstance(cache: Record<string, unknown>, messages: Message[]): PromptsIO;
 }
+export {};

package/lib/boilersmith/io.js

@@ -1,27 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PromptsIO = exports.PROMPTS_OPTIONS = void 0;
+exports.PromptsIO = void 0;
 const tslib_1 = require("tslib");
 const prompts_1 = (0, tslib_1.__importDefault)(require("prompts"));
-const errors_1 = require("@oclif/errors");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
-exports.PROMPTS_OPTIONS = { onCancel: () => (0, errors_1.exit)() };
 class PromptsIO {
-    constructor(initial = {}, messages = []) {
+    constructor(initial = {}, messages = [], noInteraction = false, onCancel = () => {
+        throw new Error('EEXIT: 0');
+    }) {
         this.supportsAnsiColor = true;
         this.cache = new Map();
-        this.messages = [];
         this.cache = new Map(Object.entries(initial));
         this.messages = messages;
+        this.noInteraction = noInteraction;
+        this.onCancel = onCancel;
     }
     async getParam(paramDef) {
+        var _a, _b, _c;
         const paramName = paramDef.name;
         if (this.cache.has(paramName)) {
             return this.cache.get(paramName);
         }
-        const res = (await (0, prompts_1.default)(paramDef, exports.PROMPTS_OPTIONS));
-        const resValue = res[paramName];
+        let resValue;
+        if (this.noInteraction) {
+            if (paramDef.initial && paramDef.initial instanceof Function) {
+                resValue = paramDef.initial((_a = this.prev) === null || _a === void 0 ? void 0 : _a.val, this.cache, (_b = this.prev) === null || _b === void 0 ? void 0 : _b.prompt);
+            }
+            else if (paramDef.type === 'confirm' || paramDef.type === 'toggle') {
+                resValue = ((_c = paramDef.initial) !== null && _c !== void 0 ? _c : false);
+            }
+            else if ('initial' in paramDef) {
+                resValue = paramDef.initial;
+            }
+            else {
+                return this.error(`No-Interaction mode is on, but input is required for param "${paramName}".`, true);
+            }
+        }
+        else {
+            const res = (await (0, prompts_1.default)(paramDef, {
+                onCancel: this.onCancel,
+            }));
+            resValue = res[paramName];
+        }
         this.cache.set(paramName, resValue);
+        this.prev = {
+            val: resValue,
+            prompt: paramDef,
+        };
         return resValue;
     }
     hasCached(name) {
@@ -66,7 +91,7 @@ class PromptsIO {
         return this.messages;
     }
     newInstance(cache, messages) {
-        return new PromptsIO(cache, messages);
+        return new PromptsIO(cache, messages, this.noInteraction, this.onCancel);
     }
 }
 exports.PromptsIO = PromptsIO;

package/lib/boilersmith/scaffolding/audit-step-factory.js

@@ -43,6 +43,13 @@ function auditStepFactory(dry, scaffoldDir, modules, templateParams, excludeScaf
                     }
                 }
             }
+            if (!dry) {
+                for (const m of modules) {
+                    if (moduleStatusCache && m.updatable && (actionableModules.includes(m) || m.togglable)) {
+                        (0, module_1.setModuleValue)(m, actionableModules.includes(m), _fs, paths, moduleStatusCache);
+                    }
+                }
+            }
             return _fs;
         },
         exposes: modules.map(m => `modules.${m.name}`),

package/lib/boilersmith/scaffolding/infra-step-factory.js

@@ -19,7 +19,7 @@ function infraStepFactory(scaffoldDir, moduleName, modules, templateParams, excl
             }
             const excludeScaffolding = excludeScaffoldingFunc ? excludeScaffoldingFunc(fs, paths) : [];
             const initializing = !modulesEnabled[module.name];
-            (0, module_1.applyModule)(module, modulesEnabled, paramVals, scaffoldDir, fs, paths, excludeScaffolding, initializing);
+            (0, module_1.applyModule)(module, Object.assign(Object.assign({}, modulesEnabled), { [module.name]: true }), paramVals, scaffoldDir, fs, paths, excludeScaffolding, initializing);
             if (moduleStatusCache) {
                 (0, module_1.setModuleValue)(module, true, fs, paths, moduleStatusCache);
             }

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

@@ -7,11 +7,19 @@ interface FileOwnership {
      */
     path: string;
     /**
-     * If any of the needed modules aren't enabled, the file won't be updated.
+     * Where the file should go. Defaults to path.
      */
-    needsOtherModules?: string[];
+    destPath?: string;
     /**
-     * If in a monorepo, should the file be placed relative to the monorepo root?
+     * Depends on other modules being enabled (or disabled).
+     */
+    moduleDeps?: (string | {
+        module: string;
+        enabled: boolean;
+    })[];
+    /**
+     * If in a monorepo, should the file be placed relative to the monorepo root, and if so, where?
+     * If provided, takes priority over destPath.
      */
     monorepoPath?: string;
 }
@@ -55,6 +63,12 @@ interface TogglableModule<N extends string> extends CommonModule<N> {
      * Can only be enabled if these other modules are enabled.
      */
     dependsOn: string[];
+    /**
+     * On an existing installation, if no information about whether this
+     * module is enabled or disabled is cached, infer whether it's enabled
+     * based on the current installation's state.
+     */
+    inferEnabled?: (fs: Store, paths: Paths) => Promise<boolean | undefined>;
 }
 export declare type Module<N extends string = string> = UntoggleableModule<N> | TogglableModule<N>;
 export declare type ModuleStatusCache<N extends string> = {

package/lib/boilersmith/scaffolding/module.js

@@ -43,12 +43,13 @@ async function promptModulesEnabled(modules, io) {
 }
 exports.promptModulesEnabled = promptModulesEnabled;
 async function currModulesEnabled(modules, fs, paths, cache) {
+    var _a, _b;
     const modulesEnabled = {};
     for (const m of modules) {
         if (m.togglable) {
             // eslint-disable-next-line no-await-in-loop
-            const cacheVal = await (cache === null || cache === void 0 ? void 0 : cache.get(m, fs, paths));
-            modulesEnabled[m.name] = cacheVal !== null && cacheVal !== void 0 ? cacheVal : m.defaultEnabled;
+            const isEnabled = (_a = await (cache === null || cache === void 0 ? void 0 : cache.get(m, fs, paths))) !== null && _a !== void 0 ? _a : await ((_b = m.inferEnabled) === null || _b === void 0 ? void 0 : _b.call(m, fs, paths));
+            modulesEnabled[m.name] = isEnabled !== null && isEnabled !== void 0 ? isEnabled : m.defaultEnabled;
         }
         else {
             modulesEnabled[m.name] = true;
@@ -91,10 +92,14 @@ async function applyModule(module, modulesEnabled, paramVals, scaffoldDir, fs, p
     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}`));
     for (const file of module.filesToReplace) {
         const path = typeof file === 'string' ? file : file.path;
-        const needsOtherModules = typeof file === 'string' ? [] : (_a = file.needsOtherModules) !== null && _a !== void 0 ? _a : [];
-        if (!excludeFiles.includes(path) && !needsOtherModules.some(dep => !modulesEnabled[dep])) {
+        const moduleDeps = typeof file === 'string' ? [] : (_a = file.moduleDeps) !== null && _a !== void 0 ? _a : [];
+        if (!excludeFiles.includes(path) && !moduleDeps.some(dep => {
+            const depName = typeof dep === 'string' ? dep : dep.module;
+            const enabled = modulesEnabled[depName];
+            return typeof dep === 'string' || dep.enabled ? !enabled : enabled;
+        })) {
             const copyToIfMonorepo = typeof file !== 'string' && file.monorepoPath ? paths.monorepo((0, clone_and_fill_1.cloneAndFill)(file.monorepoPath, tplDataFlat)) : undefined;
-            const copyTo = copyToIfMonorepo !== null && copyToIfMonorepo !== void 0 ? copyToIfMonorepo : paths.package(path);
+            const copyTo = copyToIfMonorepo !== null && copyToIfMonorepo !== void 0 ? copyToIfMonorepo : paths.package(typeof file !== 'string' && file.destPath ? (0, clone_and_fill_1.cloneAndFill)(file.destPath, tplDataFlat) : path);
             fsEditor.copyTpl((0, node_path_1.resolve)(scaffoldDir, path), copyTo, tplData);
         }
     }

package/lib/commands/infra.d.ts

@@ -13,7 +13,7 @@ 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" | "icon" | "admin" | "forum" | "js" | "jsCommon" | "css" | "locale" | "gitConf" | "githubActions" | "prettier" | "typescript" | "bundlewatch" | "backendTesting" | "editorConfig" | "styleci")[];
     })[];
     protected steps(stepManager: StepManager<FlarumProviders>): StepManager<FlarumProviders>;
     protected additionalPreRunChecks(extRoot: string): Promise<void>;

package/lib/steps/gen-ext-scaffolder.d.ts

@@ -1,6 +1,6 @@
 import { Scaffolder } from 'boilersmith/scaffolding/scaffolder';
 export declare const EXTENSION_PARAMS: readonly ["packageName", "packageDescription", "packageNamespace", "authorName", "authorEmail", "extensionName", "licenseType", "mainGitBranch", "licenseText", "packageNamespaceEscapedSlash", "extensionId", "year", "backendDirectory", "frontendDirectory"];
 export declare type ExtensionParams = typeof EXTENSION_PARAMS[number];
-export declare const EXTENSION_MODULES: readonly ["core", "icon", "js", "jsCommon", "css", "locale", "gitConf", "githubActions", "prettier", "typescript", "bundlewatch", "backendTesting", "editorConfig", "styleci"];
+export declare const EXTENSION_MODULES: readonly ["core", "icon", "admin", "forum", "js", "jsCommon", "css", "locale", "gitConf", "githubActions", "prettier", "typescript", "bundlewatch", "backendTesting", "editorConfig", "styleci"];
 export declare type ExtensionModules = typeof EXTENSION_MODULES[number];
 export declare function genExtScaffolder(): Scaffolder<ExtensionParams, ExtensionModules>;

package/lib/steps/gen-ext-scaffolder.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const scaffolder_1 = require("boilersmith/scaffolding/scaffolder");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const mem_fs_editor_1 = require("mem-fs-editor");
+const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const simple_git_1 = (0, tslib_1.__importDefault)(require("simple-git"));
 const simple_1 = (0, tslib_1.__importDefault)(require("spdx-license-list/simple"));
@@ -119,6 +120,8 @@ function paramNamesToDef(name) {
                 getCurrVal: async (fs, paths) => {
                     var _a, _b, _c;
                     const json = (0, composer_1.getComposerJson)(fs, paths);
+                    if (json.name === 'flarum/core')
+                        return 'Core';
                     return (_c = (_b = (_a = json === null || json === void 0 ? void 0 : json.extra) === null || _a === void 0 ? void 0 : _a['flarum-extension']) === null || _b === void 0 ? void 0 : _b.title) !== null && _c !== void 0 ? _c : '';
                 },
             };
@@ -199,6 +202,8 @@ function paramNamesToDef(name) {
 exports.EXTENSION_MODULES = [
     'core',
     'icon',
+    'admin',
+    'forum',
     'js',
     'jsCommon',
     'css',
@@ -224,9 +229,12 @@ function moduleNameToDef(name) {
                     'extend.php',
                     'README.md',
                     'LICENSE.md',
-                    { path: 'js/src/admin/index.js', needsOtherModules: ['js'] },
-                    { path: 'js/src/forum/index.js', needsOtherModules: ['js'] },
-                    { path: 'js/src/common/index.js', needsOtherModules: ['js', 'jsCommon'] },
+                    { path: 'js/src/admin/index.js', moduleDeps: ['js', 'admin', { module: 'typescript', enabled: false }] },
+                    { path: 'js/src/forum/index.js', moduleDeps: ['js', 'forum', { module: 'typescript', enabled: false }] },
+                    { path: 'js/src/common/index.js', moduleDeps: ['js', 'jsCommon', { module: 'typescript', enabled: false }] },
+                    { path: 'js/src/admin/index.ts', moduleDeps: ['js', 'admin', { module: 'typescript', enabled: true }] },
+                    { path: 'js/src/forum/index.ts', moduleDeps: ['js', 'forum', { module: 'typescript', enabled: true }] },
+                    { path: 'js/src/common/index.ts', moduleDeps: ['js', 'jsCommon', { module: 'typescript', enabled: true }] },
                 ],
                 jsonToAugment: {
                     'composer.json': [
@@ -268,6 +276,46 @@ function moduleNameToDef(name) {
                 },
                 needsTemplateParams: [],
             };
+        case 'admin':
+            return {
+                name,
+                updatable: true,
+                defaultEnabled: true,
+                dependsOn: [],
+                togglable: true,
+                shortDescription: 'Admin Frontend',
+                filesToReplace: [
+                    { path: 'js/admin.js', moduleDeps: ['js', { module: 'typescript', enabled: false }] },
+                    { path: 'js/admin.ts', moduleDeps: ['js', { module: 'typescript', enabled: true }] },
+                ],
+                jsonToAugment: {},
+                needsTemplateParams: [],
+                inferEnabled: async (_fs, paths) => {
+                    if (!(0, node_fs_1.existsSync)(paths.package('js')))
+                        undefined;
+                    return (0, node_fs_1.existsSync)(paths.package('js/src/admin'));
+                },
+            };
+        case 'forum':
+            return {
+                name,
+                updatable: true,
+                defaultEnabled: true,
+                dependsOn: [],
+                togglable: true,
+                shortDescription: 'Forum Frontend',
+                filesToReplace: [
+                    { path: 'js/forum.js', moduleDeps: ['js', { module: 'typescript', enabled: false }] },
+                    { path: 'js/forum.ts', moduleDeps: ['js', { module: 'typescript', enabled: true }] },
+                ],
+                jsonToAugment: {},
+                needsTemplateParams: [],
+                inferEnabled: async (_fs, paths) => {
+                    if (!(0, node_fs_1.existsSync)(paths.package('js')))
+                        undefined;
+                    return (0, node_fs_1.existsSync)(paths.package('js/src/forum'));
+                },
+            };
         case 'js':
             return {
                 name,
@@ -277,7 +325,13 @@ function moduleNameToDef(name) {
                 shortDescription: 'Javascript',
                 longDescription: "Files, tools, and scripts to build Flarum's frontend.",
                 dependsOn: [],
-                filesToReplace: ['js/webpack.config.js', 'js/admin.js', 'js/forum.js'],
+                filesToReplace: [
+                    'js/webpack.config.js',
+                    { path: 'js/admin.js', moduleDeps: ['admin', { module: 'typescript', enabled: false }] },
+                    { path: 'js/forum.js', moduleDeps: ['forum', { module: 'typescript', enabled: false }] },
+                    { path: 'js/admin.ts', moduleDeps: ['admin', { module: 'typescript', enabled: true }] },
+                    { path: 'js/forum.ts', moduleDeps: ['forum', { module: 'typescript', enabled: true }] },
+                ],
                 jsonToAugment: {
                     'js/package.json': [
                         'name',
@@ -291,19 +345,30 @@ function moduleNameToDef(name) {
                     ],
                 },
                 needsTemplateParams: ['packageName'],
+                inferEnabled: async (_fs, paths) => {
+                    return (0, node_fs_1.existsSync)(paths.package('js'));
+                },
             };
         case 'jsCommon':
             return {
                 name,
-                updatable: false,
+                updatable: true,
                 togglable: true,
                 defaultEnabled: true,
                 shortDescription: 'JS common code',
                 longDescription: 'Shared code between the forum and the admin frontends',
                 dependsOn: ['js'],
-                filesToReplace: [],
+                filesToReplace: [
+                    { path: 'js/admin.js', moduleDeps: ['admin', { module: 'typescript', enabled: false }] },
+                    { path: 'js/forum.js', moduleDeps: ['forum', { module: 'typescript', enabled: false }] },
+                    { path: 'js/admin.ts', moduleDeps: ['admin', { module: 'typescript', enabled: true }] },
+                    { path: 'js/forum.ts', moduleDeps: ['forum', { module: 'typescript', enabled: true }] },
+                ],
                 jsonToAugment: {},
                 needsTemplateParams: [],
+                inferEnabled: async (_fs, paths) => {
+                    return (0, node_fs_1.existsSync)(paths.package('js/src/common'));
+                },
             };
         case 'css':
             return {
@@ -317,6 +382,9 @@ function moduleNameToDef(name) {
                 filesToReplace: ['less/admin.less', 'less/forum.less'],
                 jsonToAugment: {},
                 needsTemplateParams: [],
+                inferEnabled: async (_fs, paths) => {
+                    return (0, node_fs_1.existsSync)(paths.package('less'));
+                },
             };
         case 'locale':
             return {
@@ -330,6 +398,9 @@ function moduleNameToDef(name) {
                 filesToReplace: ['locale/en.yml'],
                 jsonToAugment: {},
                 needsTemplateParams: [],
+                inferEnabled: async (_fs, paths) => {
+                    return (0, node_fs_1.existsSync)(paths.package('locale'));
+                },
             };
         case 'gitConf':
             return {
@@ -340,7 +411,7 @@ function moduleNameToDef(name) {
                 shortDescription: 'Git Configuration',
                 longDescription: 'Git config files (e.g. .gitignore, .gitattributes).',
                 dependsOn: [],
-                filesToReplace: ['.gitignore', '.gitattributes'],
+                filesToReplace: [{ path: 'gitignore', destPath: '.gitignore' }, { path: 'js/gitignore', moduleDeps: ['js'], destPath: 'js/.gitignore' }, '.gitattributes'],
                 jsonToAugment: {},
                 needsTemplateParams: [],
             };
@@ -358,7 +429,7 @@ function moduleNameToDef(name) {
                     { path: '.github/workflows/backend.yml', monorepoPath: '.github/workflows/${params.extensionId}-backend.yml' },
                 ],
                 jsonToAugment: {},
-                needsTemplateParams: ['frontendDirectory', 'backendDirectory', 'mainGitBranch', 'extensionId'],
+                needsTemplateParams: ['frontendDirectory', 'backendDirectory', 'mainGitBranch', 'extensionId', 'extensionName'],
             };
         case 'prettier':
             return {
@@ -373,6 +444,12 @@ function moduleNameToDef(name) {
                     'js/package.json': ['prettier', 'devDependencies.prettier', 'devDependencies.@flarum/prettier-config', 'scripts.format', 'scripts.format-check'],
                 },
                 needsTemplateParams: [],
+                inferEnabled: async (_fs, paths) => {
+                    if (!(0, node_fs_1.existsSync)(paths.package('js/package.json'))) {
+                        return false;
+                    }
+                    return (0, node_fs_1.readFileSync)('js/package.json').includes('prettier');
+                },
             };
         case 'typescript':
             return {
@@ -394,6 +471,9 @@ function moduleNameToDef(name) {
                     ],
                 },
                 needsTemplateParams: [],
+                inferEnabled: async (_fs, paths) => {
+                    return (0, node_fs_1.existsSync)(paths.package('js/tsconfig.json'));
+                },
             };
         case 'bundlewatch':
             return {
@@ -403,9 +483,12 @@ function moduleNameToDef(name) {
                 defaultEnabled: false,
                 shortDescription: 'Enable Bundlewatch Checks',
                 dependsOn: ['js'],
-                filesToReplace: [],
+                filesToReplace: ['js/.bundlewatch.config.json'],
                 jsonToAugment: {},
                 needsTemplateParams: [],
+                inferEnabled: async (_fs, paths) => {
+                    return (0, node_fs_1.existsSync)(paths.package('js/.bundlewatch.config.json'));
+                },
             };
         case 'backendTesting':
             return {
@@ -437,6 +520,9 @@ function moduleNameToDef(name) {
                     ],
                 },
                 needsTemplateParams: ['packageNamespaceEscapedSlash'],
+                inferEnabled: async (_fs, paths) => {
+                    return (0, node_fs_1.existsSync)(paths.package('tests'));
+                },
             };
         case 'editorConfig':
             return {
@@ -473,9 +559,9 @@ function genExtScaffolder() {
         return cached;
     const moduleStatusCache = {
         get: async (module, fs, paths) => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c;
             const json = (0, composer_1.getComposerJson)(fs, paths);
-            return !module.togglable || ((_d = (_c = (_b = (_a = json === null || json === void 0 ? void 0 : json.extra) === null || _a === void 0 ? void 0 : _a['flarum-cli']) === null || _b === void 0 ? void 0 : _b.modules) === null || _c === void 0 ? void 0 : _c[module.name]) !== null && _d !== void 0 ? _d : module.defaultEnabled);
+            return !module.togglable || ((_c = (_b = (_a = json === null || json === void 0 ? void 0 : json.extra) === null || _a === void 0 ? void 0 : _a['flarum-cli']) === null || _b === void 0 ? void 0 : _b.modules) === null || _c === void 0 ? void 0 : _c[module.name]);
         },
         set: async (module, enabled, fs, paths) => {
             const json = {

package/lib/steps/js/base.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseJsStep = void 0;
-const glob_1 = require("glob");
+const tslib_1 = require("tslib");
+const globby_1 = (0, tslib_1.__importDefault)(require("globby"));
 const mem_fs_editor_1 = require("mem-fs-editor");
 const IMPORTS_REGEX = /((^import\s+(?:([\s\w*,{}]+)\s+from)?\s*["']?([\s\w./@\\-]+)\3?["']?\s*;?\s*)*)(.*)/m;
 const INIT_REGEX = /^(app\.initializers\.add\('[^']+',\s*\(\)\s*=>\s*{)$/m;
@@ -18,7 +19,7 @@ class BaseJsStep {
             frontends = ['admin', 'forum'];
         }
         for (const frontend of frontends) {
-            const fsSrcFilePaths = glob_1.glob.sync(paths.package(`js/src/${frontend}/*.{js,jsx,ts,tsx}`));
+            const fsSrcFilePaths = globby_1.default.sync(paths.package(`js/src/${frontend}/*.{js,jsx,ts,tsx}`));
             fsSrcFilePaths.forEach(async (match) => {
                 /**
                  * @TODO look into using https://esprima.org/ instead

package/lib/steps/update/js-imports.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdateJSImports = void 0;
-const glob_1 = require("glob");
+const tslib_1 = require("tslib");
+const globby_1 = (0, tslib_1.__importDefault)(require("globby"));
 const mem_fs_editor_1 = require("mem-fs-editor");
 const CORE_JS_NAMESPACES = ['admin', 'common', 'forum'];
 const CORE_NAMESPACE_REGEX = new RegExp(`^(${CORE_JS_NAMESPACES.join('|')})/`);
@@ -18,7 +19,7 @@ class UpdateJSImports {
         const jsSrcDir = paths.package('vendor/flarum/core/js/src');
         const vendorRegex = new RegExp(`${jsSrcDir}/.*(js|jsx|ts|tsx)`);
         const fsVendorFilePaths = fs.all().map(file => file.path).filter(path => path && vendorRegex.test(path));
-        const persistedVendorFilePaths = glob_1.glob.sync(`${jsSrcDir}/**/*.{js,jsx,ts,tsx}`);
+        const persistedVendorFilePaths = globby_1.default.sync(`${jsSrcDir}/**/*.{js,jsx,ts,tsx}`);
         for (const currPath of [...fsVendorFilePaths, ...persistedVendorFilePaths]) {
             const withNamespace = currPath.slice(jsSrcDir.length + 1).replace(/\.(js|jsx|ts|tsx)$/, '');
             const noNamespace = withNamespace.replace(CORE_NAMESPACE_REGEX, '');
@@ -26,7 +27,7 @@ class UpdateJSImports {
         }
         const srcRegex = new RegExp(`${paths.package('js/src')}/.*(js|jsx|ts|tsx)`);
         const fsSrcFilePaths = fs.all().map(file => file.path).filter(path => path && srcRegex.test(path));
-        const persistedSrcFilePaths = glob_1.glob.sync(paths.package('js/src/**/*.{js,jsx,ts,tsx}'));
+        const persistedSrcFilePaths = globby_1.default.sync(paths.package('js/src/**/*.{js,jsx,ts,tsx}'));
         for (const match of [...fsSrcFilePaths, ...persistedSrcFilePaths]) {
             let fileCounted = false;
             const currContents = fsEditor.read(match);

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"2.0.0-beta.1","commands":{"infra":{"id":"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.","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"monorepo":{"name":"monorepo","type":"boolean","char":"m","allowNo":false},"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"module","description":"The name of the module to enable/update.","required":true,"options":["core","icon","js","jsCommon","css","locale","gitConf","githubActions","prettier","typescript","bundlewatch","backendTesting","editorConfig","styleci"]},{"name":"path","description":"Where should this command be executed?"}]},"init":{"id":"init","description":"Create a new Flarum extension","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"audit:infra":{"id":"audit:infra","description":"Check for outdated config files, infrastructure, setup, etc.","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"fix":{"name":"fix","type":"boolean","char":"f","allowNo":false},"monorepo":{"name":"monorepo","type":"boolean","char":"m","allowNo":false},"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"update:js-imports":{"id":"update:js-imports","description":"Updates JS imports from core to use proper namespaces","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:api-controller":{"id":"make:backend:api-controller","description":"Generate an API controller class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:api-serializer-attributes":{"id":"make:backend:api-serializer-attributes","description":"Generate an API serializer attributes extender","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:api-serializer":{"id":"make:backend:api-serializer","description":"Generate an API serializer class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:command":{"id":"make:backend:command","description":"Generate a console command class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:event-listener":{"id":"make:backend:event-listener","description":"Generate an event listener class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:handler":{"id":"make:backend:handler","description":"Generate a domain logic handler class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:integration-test":{"id":"make:backend:integration-test","description":"Generate an integration test class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:job":{"id":"make:backend:job","description":"Generate a job class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:migration":{"id":"make:backend:migration","description":"Generate a migration","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:model":{"id":"make:backend:model","description":"Generate a model class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:policy":{"id":"make:backend:policy","description":"Generate a policy class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:repository":{"id":"make:backend:repository","description":"Generate a repository class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:route":{"id":"make:backend:route","description":"Generate a routes extender","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:service-provider":{"id":"make:backend:service-provider","description":"Generate a service provider class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:validator":{"id":"make:backend:validator","description":"Generate a validator class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:frontend:component":{"id":"make:frontend:component","description":"Generate a frontend component","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:frontend:modal":{"id":"make:frontend:modal","description":"Generate a modal component","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:frontend:model":{"id":"make:frontend:model","description":"Generate a model class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","char":"d","description":"Assume default responses to prompts where possible.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]}}}
+{"version":"2.0.0-beta.13","commands":{"infra":{"id":"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.","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"monorepo":{"name":"monorepo","type":"boolean","char":"m","allowNo":false},"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"module","description":"The name of the module to enable/update.","required":true,"options":["core","icon","admin","forum","js","jsCommon","css","locale","gitConf","githubActions","prettier","typescript","bundlewatch","backendTesting","editorConfig","styleci"]},{"name":"path","description":"Where should this command be executed?"}]},"init":{"id":"init","description":"Create a new Flarum extension","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"audit:infra":{"id":"audit:infra","description":"Check for outdated config files, infrastructure, setup, etc.","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"fix":{"name":"fix","type":"boolean","char":"f","allowNo":false},"monorepo":{"name":"monorepo","type":"boolean","char":"m","allowNo":false},"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"update:js-imports":{"id":"update:js-imports","description":"Updates JS imports from core to use proper namespaces","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:api-controller":{"id":"make:backend:api-controller","description":"Generate an API controller class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:api-serializer-attributes":{"id":"make:backend:api-serializer-attributes","description":"Generate an API serializer attributes extender","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:api-serializer":{"id":"make:backend:api-serializer","description":"Generate an API serializer class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:command":{"id":"make:backend:command","description":"Generate a console command class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:event-listener":{"id":"make:backend:event-listener","description":"Generate an event listener class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:handler":{"id":"make:backend:handler","description":"Generate a domain logic handler class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:integration-test":{"id":"make:backend:integration-test","description":"Generate an integration test class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:job":{"id":"make:backend:job","description":"Generate a job class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:migration":{"id":"make:backend:migration","description":"Generate a migration","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:model":{"id":"make:backend:model","description":"Generate a model class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:policy":{"id":"make:backend:policy","description":"Generate a policy class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:repository":{"id":"make:backend:repository","description":"Generate a repository class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:route":{"id":"make:backend:route","description":"Generate a routes extender","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:service-provider":{"id":"make:backend:service-provider","description":"Generate a service provider class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:backend:validator":{"id":"make:backend:validator","description":"Generate a validator class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:frontend:component":{"id":"make:frontend:component","description":"Generate a frontend component","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:frontend:modal":{"id":"make:frontend:modal","description":"Generate a modal component","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]},"make:frontend:model":{"id":"make:frontend:model","description":"Generate a model class","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"no-interaction":{"name":"no-interaction","type":"boolean","char":"n","description":"Do not ask any interactive questions, assume defaults. When impossible, error.","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"Show CLI help.","allowNo":false}},"args":[{"name":"path","description":"Where should this command be executed?"}]}}}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@flarum/cli",
   "description": "A CLI for developing Flarum extensions",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.13",
   "author": "Flarum Team",
   "bin": {
     "fl": "bin/run",
@@ -9,7 +9,8 @@
   },
   "bugs": "https://github.com/flarum/cli/issues",
   "devDependencies": {
-    "@babel/core": "^7",
+    "@babel/core": "^7.0.0",
+    "@babel/preset-env": "^7.14.2",
     "@oclif/dev-cli": "^1.26.0",
     "@oclif/test": "^1.2.8",
     "@types/chai": "^4.2.20",
@@ -32,7 +33,6 @@
     "eslint-import-resolver-babel-module": "^5.3.1",
     "eslint-import-resolver-typescript": "^2.5.0",
     "eslint-plugin-import": "^2.25.3",
-    "globby": "^10.0.2",
     "jest": "^27.4.5",
     "jest-extended": "^1.2.0",
     "ts-jest": "^27.1.2",
@@ -81,11 +81,13 @@
       },
       "audit": {
         "description": "Checks for potential errors / updatable parts of a Flarum extension."
+      },
+      "update": {
+        "description": "Helper commands to update extensions for new versions of Flarum Core."
       }
     },
     "plugins": [
       "@oclif/plugin-help",
-      "@oclif/plugin-plugins",
       "@oclif/plugin-version"
     ]
   },
@@ -101,20 +103,16 @@
   },
   "types": "lib/index.d.ts",
   "dependencies": {
-    "@babel/preset-env": "^7.14.2",
     "@oclif/core": "^1.0.11",
     "@oclif/errors": "^1.3.5",
     "@oclif/plugin-help": "^5",
-    "@oclif/plugin-plugins": "^2.0.11",
     "@oclif/plugin-version": "^1",
     "chalk": "^2.4.2",
     "cli-ux": "^6.0.6",
     "ejs": "^3.1.6",
-    "glob": "^7.1.6",
-    "just-safe-get": "^2.1.2",
+    "globby": "^10.0.2",
     "mem-fs": "^2.2.1",
     "mem-fs-editor": "^8.0.0",
-    "modern-async": "^1.0.2",
     "module-alias": "^2.2.2",
     "pick-deep": "^1.0.0",
     "pluralize": "^8.0.0",