From 40f8d2ef99a2612aa4c1523f93225bb531202f5c Mon Sep 17 00:00:00 2001 From: Nicola Krumschmidt Date: Fri, 27 Aug 2021 16:27:14 +0200 Subject: [PATCH] Fix extension CLI not executing any command (#7667) --- packages/extension-sdk/cli.js | 2 +- packages/extension-sdk/src/cli/index.ts | 27 ------------------------- packages/extension-sdk/src/cli/run.ts | 23 +++++++++++++++++++++ 3 files changed, 24 insertions(+), 28 deletions(-) create mode 100644 packages/extension-sdk/src/cli/run.ts diff --git a/packages/extension-sdk/cli.js b/packages/extension-sdk/cli.js index f797b5e4f1..982682388a 100755 --- a/packages/extension-sdk/cli.js +++ b/packages/extension-sdk/cli.js @@ -1,2 +1,2 @@ #!/usr/bin/env node -require('./dist/cjs/cli/index.js'); +require('./dist/cjs/cli/run.js'); diff --git a/packages/extension-sdk/src/cli/index.ts b/packages/extension-sdk/src/cli/index.ts index dda3bd4ad4..daf1c26eb9 100644 --- a/packages/extension-sdk/src/cli/index.ts +++ b/packages/extension-sdk/src/cli/index.ts @@ -1,31 +1,4 @@ -import { Command } from 'commander'; import create from './commands/create'; import build from './commands/build'; -const pkg = require('../../../package.json'); - -if (require.main === module) { - run(); -} - -function run() { - const program = new Command(); - - program.name('directus-extension').usage('[command] [options]'); - program.version(pkg.version, '-v, --version'); - - program.command('create').arguments(' ').description('Scaffold a new Directus extension').action(create); - - program - .command('build') - .description('Bundle a Directus extension to a single entrypoint') - .option('-t, --type ', 'overwrite the extension type read from package manifest') - .option('-i, --input ', 'overwrite the entrypoint read from package manifest') - .option('-o, --output ', 'overwrite the output file read from package manifest') - .option('-f, --force', 'ignore the package manifest') - .action(build); - - program.parse(process.argv); -} - export { create, build }; diff --git a/packages/extension-sdk/src/cli/run.ts b/packages/extension-sdk/src/cli/run.ts new file mode 100644 index 0000000000..a49e2993af --- /dev/null +++ b/packages/extension-sdk/src/cli/run.ts @@ -0,0 +1,23 @@ +import { Command } from 'commander'; +import create from './commands/create'; +import build from './commands/build'; + +const pkg = require('../../../package.json'); + +const program = new Command(); + +program.name('directus-extension').usage('[command] [options]'); +program.version(pkg.version, '-v, --version'); + +program.command('create').arguments(' ').description('Scaffold a new Directus extension').action(create); + +program + .command('build') + .description('Bundle a Directus extension to a single entrypoint') + .option('-t, --type ', 'overwrite the extension type read from package manifest') + .option('-i, --input ', 'overwrite the entrypoint read from package manifest') + .option('-o, --output ', 'overwrite the output file read from package manifest') + .option('-f, --force', 'ignore the package manifest') + .action(build); + +program.parse(process.argv);