@flarum/cli 2.0.0-beta.8 → 2.0.0

package/lib/steps/stubs/backend/job.d.ts

@@ -13,7 +13,7 @@ export declare class GenerateJobStub extends BasePhpStubStep {
         } | {
             name: string;
             type: string;
-            message?: undefined;
+            message: string;
             validate?: undefined;
         })[];
     };

package/lib/steps/stubs/backend/job.js

@@ -20,6 +20,7 @@ class GenerateJobStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
             ],
         };

package/lib/steps/stubs/backend/migration.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenerateMigrationStub = void 0;
-const node_fs_1 = require("node:fs");
+const fs_1 = require("fs");
 const validation_1 = require("../../../utils/validation");
 const migration_1 = require("../../../utils/migration");
 const php_base_1 = require("../php-base");
@@ -36,12 +36,15 @@ class GenerateMigrationStub extends php_base_1.BasePhpStubStep {
     async getFileName(fs, paths, _paramProvider) {
         let persistedMigrations;
         try {
-            persistedMigrations = (0, node_fs_1.readdirSync)(paths.package('migrations'));
+            persistedMigrations = (0, fs_1.readdirSync)(paths.package('migrations'));
         }
         catch (_a) {
             persistedMigrations = [];
         }
-        const memMigrations = fs.all().map(f => f.path).filter(p => p.startsWith(paths.package('migrations')));
+        const memMigrations = fs
+            .all()
+            .map((f) => f.path)
+            .filter((p) => p.startsWith(paths.package('migrations')));
         return (0, migration_1.getNextMigrationName)([...persistedMigrations, ...memMigrations], this.params.name) + '.php';
     }
 }

package/lib/steps/stubs/backend/model.d.ts

@@ -19,7 +19,7 @@ export declare class GenerateModelStub extends BasePhpStubStep {
         } | {
             name: string;
             type: string;
-            message?: undefined;
+            message: string;
             validate?: undefined;
             optional?: undefined;
         } | {

package/lib/steps/stubs/backend/model.js

@@ -23,6 +23,7 @@ class GenerateModelStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
                 {
                     name: 'tableName',

package/lib/steps/stubs/backend/policy.d.ts

@@ -15,7 +15,7 @@ export declare class GeneratePolicyStub extends BasePhpStubStep {
         } | {
             name: string;
             type: string;
-            message?: undefined;
+            message: string;
             validate?: undefined;
         })[];
     };

package/lib/steps/stubs/backend/policy.js

@@ -24,6 +24,7 @@ class GeneratePolicyStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
                 {
                     name: 'modelClass',
@@ -34,6 +35,7 @@ class GeneratePolicyStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'modelClassName',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
             ],
         };

package/lib/steps/stubs/backend/repository.d.ts

@@ -15,7 +15,7 @@ export declare class GenerateRepositoryStub extends BasePhpStubStep {
         } | {
             name: string;
             type: string;
-            message?: undefined;
+            message: string;
             validate?: undefined;
         })[];
     };

package/lib/steps/stubs/backend/repository.js

@@ -24,6 +24,7 @@ class GenerateRepositoryStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
                 {
                     name: 'modelClass',
@@ -34,6 +35,7 @@ class GenerateRepositoryStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'modelClassName',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
             ],
         };

package/lib/steps/stubs/backend/service-provider.d.ts

@@ -13,7 +13,7 @@ export declare class GenerateServiceProviderStub extends BasePhpStubStep {
         } | {
             name: string;
             type: string;
-            message?: undefined;
+            message: string;
             validate?: undefined;
         })[];
     };

package/lib/steps/stubs/backend/service-provider.js

@@ -20,6 +20,7 @@ class GenerateServiceProviderStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
             ],
         };

package/lib/steps/stubs/backend/validator.d.ts

@@ -13,7 +13,7 @@ export declare class GenerateValidatorStub extends BasePhpStubStep {
         } | {
             name: string;
             type: string;
-            message?: undefined;
+            message: string;
             validate?: undefined;
         })[];
     };

package/lib/steps/stubs/backend/validator.js

@@ -20,6 +20,7 @@ class GenerateValidatorStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
             ],
         };

package/lib/steps/stubs/flarum-base.js

@@ -4,7 +4,7 @@ exports.FlarumBaseStubStep = void 0;
 const stub_base_1 = require("boilersmith/steps/stub-base");
 class FlarumBaseStubStep extends stub_base_1.BaseStubStep {
     async precompileParams(fs, paths, io) {
-        return Object.assign(Object.assign({}, await super.precompileParams(fs, paths, io)), { extensionId: this.scaffolder.templateParamVal('extensionId', fs, paths, io) });
+        return Object.assign(Object.assign({}, (await super.precompileParams(fs, paths, io))), { extensionId: await this.scaffolder.templateParamVal('extensionId', fs, paths, io) });
     }
 }
 exports.FlarumBaseStubStep = FlarumBaseStubStep;

package/lib/steps/stubs/frontend/component.d.ts

@@ -16,11 +16,6 @@ export declare class GenerateComponentStub extends BaseJsStubStep {
             type: string;
             message: string;
             validate: typeof Validator.className;
-        } | {
-            name: string;
-            type: string;
-            message?: undefined;
-            validate?: undefined;
         })[];
     };
 }

package/lib/steps/stubs/frontend/component.js

@@ -26,6 +26,7 @@ class GenerateComponentStub extends js_base_1.BaseJsStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
             ],
         };

package/lib/steps/stubs/frontend/modal.d.ts

@@ -16,11 +16,6 @@ export declare class GenerateModalStub extends BaseJsStubStep {
             type: string;
             message: string;
             validate: typeof Validator.className;
-        } | {
-            name: string;
-            type: string;
-            message?: undefined;
-            validate?: undefined;
         })[];
     };
 }

package/lib/steps/stubs/frontend/modal.js

@@ -26,6 +26,7 @@ class GenerateModalStub extends js_base_1.BaseJsStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
             ],
         };

package/lib/steps/stubs/frontend/model.d.ts

@@ -19,11 +19,6 @@ export declare class GenerateModelStub extends BaseJsStubStep {
             type: string;
             message: string;
             validate: typeof Validator.className;
-        } | {
-            name: string;
-            type: string;
-            message?: undefined;
-            validate?: undefined;
         })[];
     };
     protected compileParams(fs: Store, paths: Paths, io: IO): Promise<Record<string, unknown>>;

package/lib/steps/stubs/frontend/model.js

@@ -27,6 +27,7 @@ class GenerateModelStub extends js_base_1.BaseJsStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
             ],
         };

package/lib/steps/stubs/js-base.js

@@ -16,16 +16,19 @@ class BaseJsStubStep extends flarum_base_1.FlarumBaseStubStep {
     }
     async precompileParams(fs, paths, io) {
         const params = await super.precompileParams(fs, paths, io);
-        const paramDefs = this.schema.params.filter(param => !this.implicitParams.includes(param.name));
-        this.subdir = this.schema.forceRecommendedSubdir || paths.requestedDir() === null ? this.schema.recommendedSubdir : paths.requestedDir().slice(`${paths.package('js/src')}/`.length);
-        params.frontend = await io.getParam(paramDefs.find(param => param.name === 'frontend'));
-        params.className = await io.getParam(paramDefs.find(param => param.name === 'className'));
+        const paramDefs = this.schema.params.filter((param) => !this.implicitParams.includes(param.name));
+        this.subdir =
+            this.schema.forceRecommendedSubdir || paths.requestedDir() === null
+                ? this.schema.recommendedSubdir
+                : paths.requestedDir().slice(`${paths.package('js/src')}/`.length);
+        params.frontend = await io.getParam(paramDefs.find((param) => param.name === 'frontend'));
+        params.className = await io.getParam(paramDefs.find((param) => param.name === 'className'));
         this.subdir = (0, clone_and_fill_1.cloneAndFill)(this.subdir, params);
         params.classNamespace = `${this.subdir}/${params.className}`;
         return params;
     }
     async getFileName(_fs, _paths, io) {
-        return await io.getParam({ name: 'className', type: 'text' }) + '.js';
+        return (await io.getParam({ name: 'className', message: 'File name', type: 'text' })) + '.js';
     }
 }
 exports.BaseJsStubStep = BaseJsStubStep;

package/lib/steps/stubs/php-base.js

@@ -15,35 +15,37 @@ class BasePhpStubStep extends flarum_base_1.FlarumBaseStubStep {
         return [...super.implicitParams, 'classNamespace'];
     }
     async precompileParams(fs, paths, io) {
-        const params = Object.assign(Object.assign({}, await super.precompileParams(fs, paths, io)), { classNamespace: this.stubNamespace(await this.scaffolder.templateParamVal('packageNamespace', fs, paths, io), paths) });
-        let paramDefs = this.schema.params.filter(param => !this.implicitParams.includes(param.name));
+        const params = Object.assign(Object.assign({}, (await super.precompileParams(fs, paths, io))), { classNamespace: this.stubNamespace(await this.scaffolder.templateParamVal('packageNamespace', fs, paths, io), paths) });
+        let paramDefs = this.schema.params.filter((param) => !this.implicitParams.includes(param.name));
         const classParams = [...this.phpClassParams];
-        const classNameParam = paramDefs.find(param => param.name === 'className');
+        const classNameParam = paramDefs.find((param) => param.name === 'className');
         if (classNameParam) {
             params.className = await io.getParam(classNameParam);
             params.class = `${params.classNamespace}\\${params.className}`;
-            paramDefs = paramDefs.filter(param => param.name !== 'class' && param.name !== 'className');
+            paramDefs = paramDefs.filter((param) => param.name !== 'class' && param.name !== 'className');
         }
         else {
             classParams.push('class');
         }
         for (const classParam of classParams) {
-            const paramDef = this.schema.params.find(param => param.name === classParam);
+            const paramDef = this.schema.params.find((param) => param.name === classParam);
             if (!paramDef) {
                 continue;
             }
             // eslint-disable-next-line no-await-in-loop
             params[classParam] = await io.getParam(paramDef);
             params[`${classParam}Name`] = params[classParam].split('\\').pop();
-            paramDefs = paramDefs.filter(param => param.name !== classParam && param.name !== `${classParam}Name`);
+            paramDefs = paramDefs.filter((param) => param.name !== classParam && param.name !== `${classParam}Name`);
         }
         return params;
     }
     async getFileName(_fs, _paths, io) {
-        return await io.getParam({ name: 'className', type: 'text' }) + '.php';
+        return (await io.getParam({ name: 'className', message: 'Class Name', type: 'text' })) + '.php';
     }
     stubNamespace(packageNamespace, paths) {
-        const subdir = this.schema.forceRecommendedSubdir || paths.requestedDir() === null ? this.schema.recommendedSubdir.replace('\\', '.').replace('/', '.') : paths.requestedDir().slice(`${paths.package((this.schema.root || this.defaultRoot).replace('./', ''))}/`.length);
+        const subdir = this.schema.forceRecommendedSubdir || paths.requestedDir() === null
+            ? this.schema.recommendedSubdir.replace('\\', '.').replace('/', '.')
+            : paths.requestedDir().slice(`${paths.package((this.schema.root || this.defaultRoot).replace('./', ''))}/`.length);
         this.subdir = subdir.replace('.', '/');
         let namespace = packageNamespace;
         if (this.schema.root === './tests') {

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

@@ -18,7 +18,10 @@ class UpdateJSImports {
         const importMap = {};
         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 fsVendorFilePaths = fs
+            .all()
+            .map((file) => file.path)
+            .filter((path) => path && vendorRegex.test(path));
         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)$/, '');
@@ -26,7 +29,10 @@ class UpdateJSImports {
             importMap[`flarum/${noNamespace}`] = `flarum/${withNamespace}`;
         }
         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 fsSrcFilePaths = fs
+            .all()
+            .map((file) => file.path)
+            .filter((path) => path && srcRegex.test(path));
         const persistedSrcFilePaths = globby_1.default.sync(paths.package('js/src/**/*.{js,jsx,ts,tsx}'));
         for (const match of [...fsSrcFilePaths, ...persistedSrcFilePaths]) {
             let fileCounted = false;

package/lib/utils/composer.d.ts

@@ -47,6 +47,7 @@ export declare type ComposerJsonSchema = {
     extra?: {
         'flarum-cli'?: {
             excludeScaffolding?: string[];
+            excludeScaffoldingConfigKeys: Record<string, string[]>;
             mainGitBranch?: string;
             modules?: Record<ExtensionModules, boolean>;
         };

package/lib/utils/migration.js

@@ -10,7 +10,9 @@ function getNextMigrationName(currNames, name) {
         if (!match)
             continue;
         const now = new Date();
-        if (Number.parseInt(match[1], 10) === now.getFullYear() && Number.parseInt(match[2], 10) === now.getMonth() + 1 && Number.parseInt(match[3], 10) === now.getDate()) {
+        if (Number.parseInt(match[1], 10) === now.getFullYear() &&
+            Number.parseInt(match[2], 10) === now.getMonth() + 1 &&
+            Number.parseInt(match[3], 10) === now.getDate()) {
             number = Number.parseInt(match[4], 10) + 1;
             break;
         }

package/lib/utils/monorepo.d.ts

@@ -0,0 +1,24 @@
+import { Store } from 'mem-fs';
+import { Paths } from 'boilersmith/paths';
+export declare function npmPath(name: string): string;
+export declare function composerPath(name: string): string;
+export declare function extensionPath(name: string): string;
+export declare function corePath(_name: string): string;
+declare type PackageInfo = {
+    name: string;
+    gitRemote: string;
+    /**
+     * Defaults to `main`.
+     */
+    mainBranch?: string;
+};
+export declare type FlarumMonorepoJsonSchema = {
+    packages: {
+        core?: PackageInfo;
+        extensions: PackageInfo[];
+        composer?: PackageInfo[];
+        npm?: PackageInfo[];
+    };
+};
+export declare function getMonorepoConf(fs: Store, paths: Paths): FlarumMonorepoJsonSchema;
+export {};

package/lib/utils/monorepo.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMonorepoConf = exports.corePath = exports.extensionPath = exports.composerPath = exports.npmPath = void 0;
+const mem_fs_editor_1 = require("mem-fs-editor");
+function npmPath(name) {
+    return `js-packages/${name}`;
+}
+exports.npmPath = npmPath;
+function composerPath(name) {
+    return `php-packages/${name}`;
+}
+exports.composerPath = composerPath;
+function extensionPath(name) {
+    return `extensions/${name}`;
+}
+exports.extensionPath = extensionPath;
+function corePath(_name) {
+    return 'framework/core';
+}
+exports.corePath = corePath;
+function getMonorepoConf(fs, paths) {
+    return (0, mem_fs_editor_1.create)(fs).readJSON(paths.package('flarum-monorepo.json'));
+}
+exports.getMonorepoConf = getMonorepoConf;

package/lib/utils/validation.d.ts

@@ -8,5 +8,7 @@ export declare class Validator {
     static migrationName(s: string): ValidatorFunc;
     static tableName(s: string): ValidatorFunc;
     static modelType(s: string): ValidatorFunc;
+    static fileName(s: string): ValidatorFunc;
+    static gitRepo(s: string): ValidatorFunc;
 }
 export {};

package/lib/utils/validation.js

@@ -26,5 +26,11 @@ class Validator {
     static modelType(s) {
         return /^[\w-]+$/.test(s.trim()) || 'Field is required; alphanumerical characters, dashes, and underscores only!';
     }
+    static fileName(s) {
+        return /^[\w-]+$/.test(s.trim()) || 'Field is required; alphanumerical characters, dashes, and underscores only!';
+    }
+    static gitRepo(s) {
+        return /^((git|ssh|http(s)?)|(git@[\w.]+))(:(\/\/)?)([\w./:@~-]+)(\.git)(\/)?$/.test(s.trim()) || 'Invalid git repo URL.';
+    }
 }
 exports.Validator = Validator;

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"2.0.0-beta.8","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","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?"}]}}}
+{"version":"2.0.0","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?"}]},"monorepo:create":{"id":"monorepo:create","description":"Create a monorepo of Flarum extensions.","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"config":{"name":"config","type":"option","char":"c","required":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?"}]},"monorepo:split":{"id":"monorepo:split","description":"Split monorepo changes into subrepos.","pluginName":"@flarum/cli","pluginType":"core","aliases":[],"flags":{"force":{"name":"force","type":"boolean","char":"f","required":false,"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,16 +1,18 @@
 {
   "name": "@flarum/cli",
   "description": "A CLI for developing Flarum extensions",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0",
   "author": "Flarum Team",
   "bin": {
     "fl": "bin/run",
+    "fl1": "bin/run",
     "flarum-cli": "bin/run"
   },
   "bugs": "https://github.com/flarum/cli/issues",
   "devDependencies": {
     "@babel/core": "^7.0.0",
     "@babel/preset-env": "^7.14.2",
+    "@flarum/prettier-config": "^1.0.0",
     "@oclif/dev-cli": "^1.26.0",
     "@oclif/test": "^1.2.8",
     "@types/chai": "^4.2.20",
@@ -30,11 +32,13 @@
     "eslint": "^7.32.0",
     "eslint-config-oclif": "^4.0.0",
     "eslint-config-oclif-typescript": "1.0.2",
+    "eslint-config-prettier": "^8.3.0",
     "eslint-import-resolver-babel-module": "^5.3.1",
     "eslint-import-resolver-typescript": "^2.5.0",
     "eslint-plugin-import": "^2.25.3",
     "jest": "^27.4.5",
     "jest-extended": "^1.2.0",
+    "prettier": "^2.5.1",
     "ts-jest": "^27.1.2",
     "ts-node": "^8.10.2",
     "tsconfig-paths": "^3.12.0",
@@ -81,20 +85,23 @@
       },
       "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"
     ]
   },
   "repository": "flarum/cli",
+  "prettier": "@flarum/prettier-config",
   "scripts": {
     "oclif-dev": "node -r tsconfig-paths/register node_modules/.bin/oclif-dev",
-    "format": "eslint . --ext .ts --config .eslintrc --fix",
+    "format": "eslint . --ext .ts --config .eslintrc --fix && prettier --write .",
     "postpack": "rm -f oclif.manifest.json",
-    "posttest": "eslint . --ext .ts --config .eslintrc && tsc --build --dry",
+    "posttest": "prettier --check . && eslint . --ext .ts --config .eslintrc && tsc --build --dry",
     "prepack": "rm -rf lib && tsc --project tsconfig.build.json && yarn oclif-dev manifest && yarn oclif-dev readme",
     "test": "jest",
     "version": "yarn oclif-dev readme && git add README.md"
@@ -104,7 +111,6 @@
     "@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",

package/php-subsystem/composer.json

@@ -1,12 +1,12 @@
 {
-    "name": "flarum/cli-php-util",
-    "type": "library",
-    "require": {
-        "nikic/php-parser": "^4.10"
-    },
-    "autoload": {
-      "psr-4": {
-        "Flarum\\CliPhpSubsystem\\": "src/"
-      }
+  "name": "flarum/cli-php-util",
+  "type": "library",
+  "require": {
+    "nikic/php-parser": "^4.10"
+  },
+  "autoload": {
+    "psr-4": {
+      "Flarum\\CliPhpSubsystem\\": "src/"
     }
+  }
 }