yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-27 09:25:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: make generate command work (#22443)

Browse Source
This commit is contained in:
Bassel Kanso 2024-12-19 15:20:50 +02:00 committed by GitHub
parent 75bf07970a
commit 40d132bcf8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/generators/generators/src/index.ts
View File

@ -11,7 +11,13 @@ export const runCLI = async () => {
}, },
(env) => { (env) => {
const argv = process.argv.slice(2); // Extract command-line arguments const argv = process.argv.slice(2); // Extract command-line arguments
Plop.execute(env, argv, (env, argv) => run(env, argv, true)); // Pass the third argument 'true' for passArgsBeforeDashes Plop.execute(env, argv, (env, argv) => {
const options = {
...env,
dest: join(process.cwd(), 'src'), // this will make the destination path to be based on the cwd when calling the wrapper
};
return run(options, argv, true); // Pass the third argument 'true' for passArgsBeforeDashes
});
} }
); );
}; };

2
packages/generators/generators/src/plopfile.ts
View File

@ -12,7 +12,7 @@ import generateService from './plops/service';
export default (plop: NodePlopAPI) => { export default (plop: NodePlopAPI) => {
// Plop config // Plop config
plop.setWelcomeMessage('Strapi Generators'); plop.setWelcomeMessage('Strapi Generators');
plop.addHelper('pluralize', (text: string) => pluralize(text)); plop.setHelper('pluralize', (text: string) => pluralize(text));
// Generators // Generators
generateApi(plop); generateApi(plop);

3
packages/generators/generators/src/plops/api.ts
View File

@ -29,7 +29,6 @@ export default (plop: NodePlopAPI) => {
async choices() { async choices() {
const pluginsPath = join(plop.getDestBasePath(), 'plugins'); const pluginsPath = join(plop.getDestBasePath(), 'plugins');
const exists = await fs.pathExists(pluginsPath); const exists = await fs.pathExists(pluginsPath);
if (!exists) { if (!exists) {
throw Error('Couldn\'t find a "plugins" directory'); throw Error('Couldn\'t find a "plugins" directory');
} }
@ -51,7 +50,7 @@ export default (plop: NodePlopAPI) => {
} }
const filePath = const filePath =
answers.isPluginApi && answers.plugin ? 'plugins/{{ plugin }}' : 'api/{{ id }}'; answers.isPluginApi && answers.plugin ? 'plugins/{{ plugin }}/server' : 'api/{{ id }}';
const currentDir = process.cwd(); const currentDir = process.cwd();
const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js'; const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js';

1
packages/generators/generators/src/plops/content-type.ts
View File

@ -81,7 +81,6 @@ export default (plop: NodePlopAPI) => {
}, {}); }, {});
const filePath = getFilePath(answers.destination); const filePath = getFilePath(answers.destination);
// TODO: use basePath instead
const currentDir = process.cwd(); const currentDir = process.cwd();
const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js'; const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js';

2
packages/generators/generators/src/plops/policy.ts
View File

@ -23,8 +23,8 @@ export default (plop: NodePlopAPI) => {
return []; return [];
} }
const filePath = getFilePath(answers.destination);
const currentDir = process.cwd(); const currentDir = process.cwd();
const filePath = getFilePath(answers.destination);
const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js'; const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js';
return [ return [