@flarum/cli 2.0.0-beta.9 → 2.0.1

package/lib/commands/init.d.ts

@@ -11,7 +11,7 @@ export default class Init extends BaseCommand {
         description: string;
     }[];
     protected requireExistingExtension: boolean;
-    protected steps(stepManager: StepManager<FlarumProviders>): StepManager<FlarumProviders>;
+    protected steps(stepManager: StepManager<FlarumProviders>, extRoot: string): StepManager<FlarumProviders>;
     protected welcomeMessage(): string;
     protected goodbyeMessage(): string;
     protected additionalPreRunChecks(extRoot: string): Promise<void>;

package/lib/commands/init.js

@@ -7,17 +7,19 @@ const base_command_1 = (0, tslib_1.__importDefault)(require("../base-command"));
 const yosay_1 = (0, tslib_1.__importDefault)(require("yosay"));
 const gen_ext_scaffolder_1 = require("../steps/gen-ext-scaffolder");
 const git_1 = require("../steps/misc/git");
+const npm_1 = require("../steps/misc/npm");
 class Init extends base_command_1.default {
     constructor() {
         super(...arguments);
         this.requireExistingExtension = false;
     }
-    steps(stepManager) {
+    steps(stepManager, extRoot) {
+        const packageManager = this.jsPackageManager(extRoot);
         return stepManager
             .namedStep('gitInit', new git_1.GitInit(), { optional: true, confirmationMessage: 'Run `git init`? (recommended)', default: true })
             .namedStep('skeleton', (0, gen_ext_scaffolder_1.genExtScaffolder)().genInitStep())
             .step(new composer_1.ComposerInstall(), { optional: true, confirmationMessage: 'Run `composer install`? (recommended)', default: true })
-            .step(new yarn_1.YarnInstall(), { optional: true, confirmationMessage: 'Run `yarn install`? (recommended)', default: true }, [
+            .step(packageManager === 'npm' ? new npm_1.NpmInstall() : new yarn_1.YarnInstall(), { optional: true, confirmationMessage: `Run \`${packageManager !== null && packageManager !== void 0 ? packageManager : 'yarn'}\`? (recommended)`, default: true }, [
             {
                 sourceStep: 'skeleton',
                 exposedName: 'modules.js',

package/lib/commands/make/backend/api-controller.js

@@ -7,8 +7,7 @@ const route_1 = require("../../../steps/extenders/route");
 const gen_ext_scaffolder_1 = require("../../../steps/gen-ext-scaffolder");
 class ApiController extends base_command_1.default {
     steps(stepManager) {
-        return stepManager
-            .atomicGroup(stepManager => {
+        return stepManager.atomicGroup((stepManager) => {
             stepManager
                 .namedStep('apiController', new api_controller_1.GenerateApiControllerStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()))
                 .step(new route_1.GenerateRoutesExtender(), { optional: true, confirmationMessage: 'Generate corresponding extender?', default: true }, [

package/lib/commands/make/backend/api-serializer-attributes.js

@@ -5,8 +5,7 @@ const base_command_1 = (0, tslib_1.__importDefault)(require("../../../base-comma
 const api_serializer_1 = require("../../../steps/extenders/api-serializer");
 class ApiSerializerAttribute extends base_command_1.default {
     steps(stepManager) {
-        return stepManager
-            .step(new api_serializer_1.GenerateApiSerializerAttributesExtender());
+        return stepManager.step(new api_serializer_1.GenerateApiSerializerAttributesExtender());
     }
 }
 exports.default = ApiSerializerAttribute;

package/lib/commands/make/backend/command.js

@@ -7,8 +7,7 @@ const console_command_1 = require("../../../steps/extenders/console-command");
 const gen_ext_scaffolder_1 = require("../../../steps/gen-ext-scaffolder");
 class Command extends base_command_1.default {
     steps(stepManager) {
-        return stepManager
-            .atomicGroup(stepManager => {
+        return stepManager.atomicGroup((stepManager) => {
             stepManager
                 .namedStep('command', new command_1.GenerateCommandStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()))
                 .step(new console_command_1.GenerateConsoleCommandExtender(), { optional: true, confirmationMessage: 'Generate corresponding extender?', default: true }, [

package/lib/commands/make/backend/event-listener.js

@@ -7,8 +7,7 @@ const event_1 = require("../../../steps/extenders/event");
 const gen_ext_scaffolder_1 = require("../../../steps/gen-ext-scaffolder");
 class EventListener extends base_command_1.default {
     steps(stepManager) {
-        return stepManager
-            .atomicGroup(stepManager => {
+        return stepManager.atomicGroup((stepManager) => {
             stepManager
                 .namedStep('listener', new event_listener_1.GenerateEventListenerStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()))
                 .step(new event_1.GenerateEventListenerExtender(), { optional: true, confirmationMessage: 'Generate corresponding extender?', default: true }, [

package/lib/commands/make/backend/handler.js

@@ -7,11 +7,8 @@ const handler_1 = require("../../../steps/stubs/backend/handler");
 const gen_ext_scaffolder_1 = require("../../../steps/gen-ext-scaffolder");
 class ApiController extends base_command_1.default {
     steps(stepManager) {
-        return stepManager
-            .atomicGroup(stepManager => {
-            stepManager
-                .namedStep('handlerCommand', new handler_command_1.GenerateHandlerCommandStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()))
-                .step(new handler_1.GenerateHandlerStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()), {}, [
+        return stepManager.atomicGroup((stepManager) => {
+            stepManager.namedStep('handlerCommand', new handler_command_1.GenerateHandlerCommandStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)())).step(new handler_1.GenerateHandlerStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()), {}, [
                 {
                     sourceStep: 'handlerCommand',
                     exposedName: 'className',

package/lib/commands/make/backend/integration-test.js

@@ -6,10 +6,8 @@ const base_command_1 = (0, tslib_1.__importDefault)(require("../../../base-comma
 const integration_test_1 = require("../../../steps/stubs/backend/integration-test");
 class IntegrationTest extends base_command_1.default {
     steps(stepManager) {
-        return stepManager
-            .atomicGroup(stepManager => {
-            stepManager
-                .namedStep('test', new integration_test_1.GenerateIntegrationTestStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()));
+        return stepManager.atomicGroup((stepManager) => {
+            stepManager.namedStep('test', new integration_test_1.GenerateIntegrationTestStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()));
         });
     }
 }

package/lib/commands/make/backend/migration.js

@@ -6,8 +6,7 @@ const base_command_1 = (0, tslib_1.__importDefault)(require("../../../base-comma
 const migration_1 = require("../../../steps/stubs/backend/migration");
 class Migration extends base_command_1.default {
     steps(stepManager) {
-        return stepManager
-            .step(new migration_1.GenerateMigrationStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()));
+        return stepManager.step(new migration_1.GenerateMigrationStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()));
     }
 }
 exports.default = Migration;

package/lib/commands/make/backend/model.js

@@ -18,8 +18,7 @@ const route_1 = require("../../../steps/extenders/route");
 const gen_ext_scaffolder_1 = require("../../../steps/gen-ext-scaffolder");
 class Model extends base_command_1.default {
     steps(stepManager) {
-        return stepManager
-            .atomicGroup(stepManager => {
+        return stepManager.atomicGroup((stepManager) => {
             stepManager
                 .namedStep('model', new model_1.GenerateModelStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()))
                 .step(new migration_1.GenerateMigrationStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()), { optional: true, confirmationMessage: 'Generate corresponding Migration?', default: true }, [

package/lib/commands/make/backend/policy.js

@@ -7,8 +7,7 @@ const policy_2 = require("../../../steps/extenders/policy");
 const gen_ext_scaffolder_1 = require("../../../steps/gen-ext-scaffolder");
 class Policy extends base_command_1.default {
     steps(stepManager) {
-        return stepManager
-            .atomicGroup(stepManager => {
+        return stepManager.atomicGroup((stepManager) => {
             stepManager
                 .namedStep('policy', new policy_1.GeneratePolicyStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()))
                 .step(new policy_2.GeneratePolicyExtender(), { optional: true, confirmationMessage: 'Generate corresponding extender?', default: true }, [

package/lib/commands/make/backend/route.js

@@ -5,8 +5,7 @@ const base_command_1 = (0, tslib_1.__importDefault)(require("../../../base-comma
 const route_1 = require("../../../steps/extenders/route");
 class Route extends base_command_1.default {
     steps(stepManager) {
-        return stepManager
-            .step(new route_1.GenerateRoutesExtender());
+        return stepManager.step(new route_1.GenerateRoutesExtender());
     }
 }
 exports.default = Route;

package/lib/commands/make/backend/service-provider.js

@@ -7,8 +7,7 @@ const service_provider_2 = require("../../../steps/extenders/service-provider");
 const gen_ext_scaffolder_1 = require("../../../steps/gen-ext-scaffolder");
 class ServiceProvider extends base_command_1.default {
     steps(stepManager) {
-        return stepManager
-            .atomicGroup(stepManager => {
+        return stepManager.atomicGroup((stepManager) => {
             stepManager
                 .namedStep('provider', new service_provider_1.GenerateServiceProviderStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()))
                 .step(new service_provider_2.GenerateServiceProviderExtender(), { optional: true, confirmationMessage: 'Generate corresponding extender?', default: true }, [

package/lib/commands/make/frontend/model.js

@@ -7,11 +7,8 @@ const model_2 = require("../../../steps/js/model");
 const gen_ext_scaffolder_1 = require("../../../steps/gen-ext-scaffolder");
 class Model extends base_command_1.default {
     steps(stepManager) {
-        return stepManager
-            .atomicGroup(stepManager => {
-            stepManager
-                .namedStep('model', new model_1.GenerateModelStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()))
-                .step(new model_2.GenerateModelDefinition(), {}, [
+        return stepManager.atomicGroup((stepManager) => {
+            stepManager.namedStep('model', new model_1.GenerateModelStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)())).step(new model_2.GenerateModelDefinition(), {}, [
                 {
                     sourceStep: 'model',
                     exposedName: 'frontend',

package/lib/commands/monorepo/create.d.ts

@@ -0,0 +1,15 @@
+import { StepManager } from 'boilersmith/step-manager';
+import BaseCommand from '../../base-command';
+import { FlarumProviders } from '../../providers';
+export default class Create extends BaseCommand {
+    static description: string;
+    static flags: {
+        config: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+    };
+    static args: {
+        name: string;
+        description: string;
+    }[];
+    protected requireExistingExtension: boolean;
+    protected steps(stepManager: StepManager<FlarumProviders>): StepManager<FlarumProviders>;
+}

package/lib/commands/monorepo/create.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const base_command_1 = (0, tslib_1.__importDefault)(require("../../base-command"));
+const core_1 = require("@oclif/core");
+const create_1 = require("../../steps/monorepo/create");
+const gen_ext_scaffolder_1 = require("../../steps/gen-ext-scaffolder");
+class Create extends base_command_1.default {
+    constructor() {
+        super(...arguments);
+        this.requireExistingExtension = false;
+    }
+    steps(stepManager) {
+        return stepManager.step(new create_1.MonorepoCreate((0, gen_ext_scaffolder_1.genExtScaffolder)(), this.flags.config));
+    }
+}
+exports.default = Create;
+Create.description = 'Create a monorepo of Flarum extensions.';
+Create.flags = Object.assign({ config: core_1.Flags.string({ char: 'c', required: false }) }, base_command_1.default.flags);
+Create.args = [...base_command_1.default.args];

package/lib/commands/monorepo/split.d.ts

@@ -0,0 +1,15 @@
+import { StepManager } from 'boilersmith/step-manager';
+import BaseCommand from '../../base-command';
+import { FlarumProviders } from '../../providers';
+export default class Split extends BaseCommand {
+    static description: string;
+    static flags: {
+        force: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    static args: {
+        name: string;
+        description: string;
+    }[];
+    protected requireExistingExtension: boolean;
+    protected steps(stepManager: StepManager<FlarumProviders>): StepManager<FlarumProviders>;
+}

package/lib/commands/monorepo/split.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const base_command_1 = (0, tslib_1.__importDefault)(require("../../base-command"));
+const core_1 = require("@oclif/core");
+const split_1 = require("../../steps/monorepo/split");
+class Split extends base_command_1.default {
+    constructor() {
+        super(...arguments);
+        this.requireExistingExtension = false;
+    }
+    steps(stepManager) {
+        return stepManager.step(new split_1.MonorepoSplit(this.flags.force));
+    }
+}
+exports.default = Split;
+Split.description = 'Split monorepo changes into subrepos.';
+Split.flags = Object.assign({ force: core_1.Flags.boolean({ char: 'f', required: false }) }, base_command_1.default.flags);
+Split.args = [...base_command_1.default.args];

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

@@ -5,8 +5,7 @@ const js_imports_1 = require("../../steps/update/js-imports");
 const base_command_1 = (0, tslib_1.__importDefault)(require("../../base-command"));
 class UpdateJsImports extends base_command_1.default {
     steps(stepManager) {
-        return stepManager
-            .step(new js_imports_1.UpdateJSImports());
+        return stepManager.step(new js_imports_1.UpdateJSImports());
     }
     async additionalPreRunChecks(extRoot) {
         await this.ensureComposerInstallRan(extRoot);

package/lib/help.js

@@ -12,7 +12,7 @@ function prepTopic(topic) {
     return Object.assign({}, topic, { name: chalk_1.default.green(topic.name.replace(COLON_REGEX, ' ')) });
 }
 function colorHeaders(text) {
-    return text.replace(/(TOPICS|TOPIC|DESCRIPTION|USAGE|COMMANDS|VERSION|ARGUMENTS|OPTIONS)/g, match => {
+    return text.replace(/(TOPICS|TOPIC|DESCRIPTION|USAGE|COMMANDS|VERSION|ARGUMENTS|OPTIONS)/g, (match) => {
         return chalk_1.default.yellow(match);
     });
 }

package/lib/providers/php-provider.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PhpSubsystemProvider = exports.ParamTypeType = exports.ExpressionType = void 0;
-const node_child_process_1 = require("node:child_process");
+const child_process_1 = require("child_process");
 var ExpressionType;
 (function (ExpressionType) {
     ExpressionType["SCALAR"] = "scalar";
@@ -24,7 +24,7 @@ class PhpSubsystemProvider {
             op: 'extender.add',
             params: extenderDef,
         });
-        const res = (0, node_child_process_1.execSync)(`php ${this.phpPath}`, { input });
+        const res = (0, child_process_1.execSync)(`php ${this.phpPath}`, { input });
         if (!res) {
             throw new Error(`The PHP subsystem returned an invalid value: ${res}`);
         }

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 const EXTENSION_PARAMS: readonly ["packageName", "packageDescription", "packageNamespace", "authorName", "authorEmail", "extensionName", "licenseType", "mainGitBranch", "jsPackageManager", "licenseText", "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>;