@strapi/generators 4.2.0-alpha.O → 4.2.0-beta.2

package/lib/files/{plugin → js/plugin}/admin/src/pages/HomePage/index.js

@@ -4,7 +4,7 @@
  *
  */
 
-import React, { memo } from 'react';
+import React from 'react';
 // import PropTypes from 'prop-types';
 import pluginId from '../../pluginId';
 
@@ -17,4 +17,4 @@ const HomePage = () => {
   );
 };
 
-export default memo(HomePage);
+export default HomePage;

package/lib/files/js/plugin/admin/src/pluginId.js

@@ -0,0 +1,5 @@
+import pluginPkg from '../../package.json';
+
+const pluginId = pluginPkg.name.replace(/^(@[^-,.][\w,-]+\/|strapi-)plugin-/i, '');
+
+export default pluginId;

package/lib/files/{plugin → js/plugin}/server/controllers/my-controller.js.hbs

@@ -1,10 +1,10 @@
 'use strict';
 
-module.exports = {
+module.exports = ({ strapi }) => ({
   index(ctx) {
     ctx.body = strapi
       .plugin('{{ pluginName }}')
       .service('myService')
       .getWelcomeMessage();
   },
-};
+});

package/lib/files/ts/plugin/admin/src/components/Initializer/index.tsx

@@ -0,0 +1,25 @@
+/**
+ *
+ * Initializer
+ *
+ */
+
+import React, { useEffect, useRef } from 'react';
+import pluginId from '../../pluginId';
+
+type InitializerProps = {
+  setPlugin: (id: string) => void;
+};
+
+const Initializer: React.FC<InitializerProps> = ({ setPlugin }) => {
+  const ref = useRef<(id: string) => void | null>(null);
+  ref.current = setPlugin;
+
+  useEffect(() => {
+    ref.current(pluginId);
+  }, []);
+
+  return null;
+};
+
+export default Initializer;

package/lib/files/ts/plugin/admin/src/components/PluginIcon/index.tsx

@@ -0,0 +1,12 @@
+/**
+ *
+ * PluginIcon
+ *
+ */
+
+import React from 'react';
+import Puzzle from '@strapi/icons/Puzzle';
+
+const PluginIcon: React.VoidFunctionComponent = () => <Puzzle />;
+
+export default PluginIcon;

package/lib/files/ts/plugin/admin/src/index.tsx

@@ -0,0 +1,66 @@
+import React from 'react';
+import { prefixPluginTranslations } from '@strapi/helper-plugin';
+import pluginPkg from '../../package.json';
+import pluginId from './pluginId';
+import Initializer from './components/Initializer';
+import PluginIcon from './components/PluginIcon';
+
+const name = pluginPkg.strapi.name;
+
+export default {
+  register(app) {
+    app.addMenuLink({
+      to: `/plugins/${pluginId}`,
+      icon: PluginIcon,
+      intlLabel: {
+        id: `${pluginId}.plugin.name`,
+        defaultMessage: name,
+      },
+      Component: async () => {
+        const component = await import(/* webpackChunkName: "[request]" */ './pages/App');
+
+        return component;
+      },
+      permissions: [
+        // Uncomment to set the permissions of the plugin here
+        // {
+        //   action: '', // the action name should be plugin::plugin-name.actionType
+        //   subject: null,
+        // },
+      ],
+    });
+    const plugin = {
+      id: pluginId,
+      initializer: Initializer,
+      isReady: false,
+      name,
+    };
+
+    app.registerPlugin(plugin);
+  },
+
+  bootstrap(app) {},
+  async registerTrads(app) {
+    const { locales } = app;
+
+    const importedTrads = await Promise.all(
+      locales.map(locale => {
+        return import(`./translations/${locale}.json`)
+          .then(({ default: data }) => {
+            return {
+              data: prefixPluginTranslations(data, pluginId),
+              locale,
+            };
+          })
+          .catch(() => {
+            return {
+              data: {},
+              locale,
+            };
+          });
+      })
+    );
+
+    return Promise.resolve(importedTrads);
+  },
+};

package/lib/files/ts/plugin/admin/src/pages/App/index.tsx

@@ -0,0 +1,25 @@
+/**
+ *
+ * This component is the skeleton around the actual pages, and should only
+ * contain code that should be seen on all pages. (e.g. navigation bar)
+ *
+ */
+
+import React from 'react';
+import { Switch, Route } from 'react-router-dom';
+import { NotFound } from '@strapi/helper-plugin';
+import pluginId from '../../pluginId';
+import HomePage from '../HomePage';
+
+const App: React.VoidFunctionComponent = () => {
+  return (
+    <div>
+      <Switch>
+        <Route path={`/plugins/${pluginId}`} component={HomePage} exact />
+        <Route component={NotFound} />
+      </Switch>
+    </div>
+  );
+};
+
+export default App;

package/lib/files/ts/plugin/admin/src/pages/HomePage/index.tsx

@@ -0,0 +1,19 @@
+/*
+ *
+ * HomePage
+ *
+ */
+
+import React from 'react';
+import pluginId from '../../pluginId';
+
+const HomePage: React.VoidFunctionComponent = () => {
+  return (
+    <div>
+      <h1>{pluginId}&apos;s HomePage</h1>
+      <p>Happy coding</p>
+    </div>
+  );
+};
+
+export default HomePage;

package/lib/files/ts/plugin/admin/src/pluginId.ts

@@ -0,0 +1,5 @@
+import pluginPkg from '../../package.json';
+
+const pluginId = pluginPkg.name.replace(/^(@[^-,.][\w,-]+\/|strapi-)plugin-/i, '');
+
+export default pluginId;

package/lib/files/ts/plugin/admin/src/translations/en.json

@@ -0,0 +1 @@
+{}

package/lib/files/ts/plugin/admin/src/translations/fr.json

@@ -0,0 +1 @@
+{}

package/lib/files/ts/plugin/admin/src/utils/axiosInstance.ts

@@ -0,0 +1,40 @@
+/**
+ * axios with a custom config.
+ */
+
+import axios from 'axios';
+import { auth } from '@strapi/helper-plugin';
+
+const instance = axios.create({
+  baseURL: process.env.STRAPI_ADMIN_BACKEND_URL,
+});
+
+instance.interceptors.request.use(
+  async (config) => {
+    config.headers = {
+      Authorization: `Bearer ${auth.getToken()}`,
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+    };
+
+    return config;
+  },
+  (error) => {
+    Promise.reject(error);
+  }
+);
+
+instance.interceptors.response.use(
+  (response) => response,
+  (error) => {
+    // whatever you want to do with the error
+    if (error.response?.status === 401) {
+      auth.clearAppStorage();
+      window.location.reload();
+    }
+
+    throw error;
+  }
+);
+
+export default instance;

package/lib/files/ts/plugin/admin/src/utils/getTrad.ts

@@ -0,0 +1,5 @@
+import pluginId from '../pluginId';
+
+const getTrad = (id: string) => `${pluginId}.${id}`;
+
+export default getTrad;

package/lib/files/ts/plugin/server/bootstrap.ts

@@ -0,0 +1,3 @@
+export default ({ strapi }) => {
+  // bootstrap phase
+};

package/lib/files/ts/plugin/server/config/index.ts

@@ -0,0 +1,4 @@
+export default {
+  default: {},
+  validator() {},
+};

package/lib/files/ts/plugin/server/content-types/index.ts

@@ -0,0 +1 @@
+export default {};

package/lib/files/ts/plugin/server/controllers/index.ts

@@ -0,0 +1,5 @@
+import myController from './my-controller';
+
+export default {
+  myController,
+};

package/lib/files/ts/plugin/server/controllers/my-controller.ts.hbs

@@ -0,0 +1,8 @@
+export default ({ strapi }) => ({
+  index(ctx) {
+    ctx.body = strapi
+      .plugin('{{ pluginName }}')
+      .service('myService')
+      .getWelcomeMessage();
+  },
+});

package/lib/files/ts/plugin/server/destroy.ts

@@ -0,0 +1,3 @@
+export default ({ strapi }) => {
+  // destroy phase
+};

package/lib/files/ts/plugin/server/index.ts

@@ -0,0 +1,23 @@
+import register from './register';
+import bootstrap from './bootstrap';
+import destroy from './destroy';
+import config from './config';
+import contentTypes from './content-types';
+import controllers from './controllers';
+import routes from './routes';
+import middlewares from './middlewares';
+import policies from './policies';
+import services from './services';
+
+export default {
+  register,
+  bootstrap,
+  destroy,
+  config,
+  controllers,
+  routes,
+  services,
+  contentTypes,
+  policies,
+  middlewares,
+};

package/lib/files/ts/plugin/server/middlewares/index.ts

@@ -0,0 +1 @@
+export default {};

package/lib/files/ts/plugin/server/policies/index.ts

@@ -0,0 +1 @@
+export default {};

package/lib/files/ts/plugin/server/register.ts

@@ -0,0 +1,3 @@
+export default ({ strapi }) => {
+  // registeration phase
+};

package/lib/files/ts/plugin/server/routes/index.ts

@@ -0,0 +1,10 @@
+export default [
+  {
+    method: 'GET',
+    path: '/',
+    handler: 'myController.index',
+    config: {
+      policies: [],
+    },
+  },
+];

package/lib/files/ts/plugin/server/services/index.ts

@@ -0,0 +1,5 @@
+import myService from './my-service';
+
+export default {
+  myService,
+};

package/lib/files/ts/plugin/server/services/my-service.ts

@@ -0,0 +1,5 @@
+export default ({ strapi }) => ({
+  getWelcomeMessage() {
+    return 'Welcome to Strapi 🚀';
+  },
+});

package/lib/files/ts/plugin/strapi-admin.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('./admin/src').default;

package/lib/files/ts/plugin/strapi-server.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('./dist/server');

package/lib/files/ts/plugin/tsconfig.json

@@ -0,0 +1,25 @@
+{
+  "extends": "@strapi/typescript-utils/lib/configs/server",
+
+  "compilerOptions": {
+    "outDir": "dist",
+    "rootDir": "."
+  },
+
+  "include": [
+    // Include the root directory
+    "server",
+    // Force the JSON files in the src folder to be included
+    "server/**/*.json"
+  ],
+
+  "exclude": [
+    "node_modules/",
+    "dist/",
+
+    // Do not include admin files in the server compilation
+    "admin/",
+    // Do not include test files
+    "**/*.test.ts"
+  ]
+}

package/lib/index.js

@@ -7,7 +7,7 @@ const nodePlop = require('node-plop');
 /**
  * Starts the Plop CLI programmatically
  */
-const runCLI = () => {
+const runCLI = async () => {
   Plop.launch({ configPath: join(__dirname, 'plopfile.js') }, env =>
     run({ ...env, dest: join(process.cwd(), 'src') }, undefined, true)
   );

package/lib/plops/api.js

@@ -2,6 +2,8 @@
 
 const { join } = require('path');
 const fs = require('fs-extra');
+const tsUtils = require('@strapi/typescript-utils');
+
 const validateInput = require('./utils/validate-input');
 
 module.exports = plop => {
@@ -46,17 +48,19 @@ module.exports = plop => {
     ],
     actions(answers) {
       const filePath = answers.isPluginApi && answers.plugin ? 'plugins/{{plugin}}' : 'api/{{id}}';
+      const currentDir = process.cwd();
+      const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js';
 
       const baseActions = [
         {
           type: 'add',
-          path: `${filePath}/controllers/{{id}}.js`,
-          templateFile: 'templates/controller.js.hbs',
+          path: `${filePath}/controllers/{{id}}.${language}`,
+          templateFile: `templates/${language}/controller.${language}.hbs`,
         },
         {
           type: 'add',
-          path: `${filePath}/services/{{id}}.js`,
-          templateFile: 'templates/service.js.hbs',
+          path: `${filePath}/services/{{id}}.${language}`,
+          templateFile: `templates/${language}/service.${language}.hbs`,
         },
       ];
 
@@ -67,8 +71,8 @@ module.exports = plop => {
       return [
         {
           type: 'add',
-          path: `${filePath}/routes/{{id}}.js`,
-          templateFile: `templates/single-route.js.hbs`,
+          path: `${filePath}/routes/{{id}}.${language}`,
+          templateFile: `templates/${language}/single-route.${language}.hbs`,
         },
         ...baseActions,
       ];

package/lib/plops/content-type.js

@@ -4,6 +4,7 @@ const { join } = require('path');
 const slugify = require('@sindresorhus/slugify');
 const fs = require('fs-extra');
 const { isKebabCase } = require('@strapi/utils');
+const tsUtils = require('@strapi/typescript-utils');
 
 const getDestinationPrompts = require('./prompts/get-destination-prompts');
 const getFilePath = require('./utils/get-file-path');
@@ -81,12 +82,14 @@ module.exports = plop => {
       }, {});
 
       const filePath = getFilePath(answers.destination);
+      const currentDir = process.cwd();
+      const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js';
 
       const baseActions = [
         {
           type: 'add',
           path: `${filePath}/content-types/{{ singularName }}/schema.json`,
-          templateFile: 'templates/content-type.schema.json.hbs',
+          templateFile: `templates/${language}/content-type.schema.json.hbs`,
           data: {
             collectionName: slugify(answers.pluralName, { separator: '_' }),
           },
@@ -120,20 +123,20 @@ module.exports = plop => {
         baseActions.push(
           {
             type: 'add',
-            path: `${filePath}/controllers/{{singularName}}.js`,
-            templateFile: 'templates/core-controller.js.hbs',
+            path: `${filePath}/controllers/{{singularName}}.${language}`,
+            templateFile: `templates/${language}/core-controller.${language}.hbs`,
             data: { uid },
           },
           {
             type: 'add',
-            path: `${filePath}/services/{{singularName}}.js`,
-            templateFile: 'templates/core-service.js.hbs',
+            path: `${filePath}/services/{{singularName}}.${language}`,
+            templateFile: `templates/${language}/core-service.${language}.hbs`,
             data: { uid },
           },
           {
             type: 'add',
-            path: `${filePath}/routes/{{singularName}}.js`,
-            templateFile: `templates/core-router.js.hbs`,
+            path: `${filePath}/routes/{{singularName}}.${language}`,
+            templateFile: `templates/${language}/core-router.${language}.hbs`,
             data: { uid },
           }
         );

package/lib/plops/controller.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const tsUtils = require('@strapi/typescript-utils');
+
 const getDestinationPrompts = require('./prompts/get-destination-prompts');
 const getFilePath = require('./utils/get-file-path');
 const validateInput = require('./utils/validate-input');
@@ -19,12 +21,14 @@ module.exports = plop => {
     ],
     actions(answers) {
       const filePath = getFilePath(answers.destination);
+      const currentDir = process.cwd();
+      const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js';
 
       return [
         {
           type: 'add',
-          path: `${filePath}/controllers/{{ id }}.js`,
-          templateFile: 'templates/controller.js.hbs',
+          path: `${filePath}/controllers/{{ id }}.${language}`,
+          templateFile: `templates/${language}/controller.${language}.hbs`,
         },
       ];
     },

package/lib/plops/middleware.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const tsUtils = require('@strapi/typescript-utils');
+
 const getDestinationPrompts = require('./prompts/get-destination-prompts');
 const getFilePath = require('./utils/get-file-path');
 
@@ -17,11 +19,14 @@ module.exports = plop => {
     ],
     actions(answers) {
       const filePath = getFilePath(answers.destination);
+      const currentDir = process.cwd();
+      const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js';
+
       return [
         {
           type: 'add',
-          path: `${filePath}/middlewares/{{ name }}.js`,
-          templateFile: 'templates/middleware.js.hbs',
+          path: `${filePath}/middlewares/{{ name }}.${language}`,
+          templateFile: `templates/${language}/middleware.${language}.hbs`,
         },
       ];
     },

package/lib/plops/plugin.js

@@ -1,17 +1,22 @@
 'use strict';
 
 const chalk = require('chalk');
+const { isUsingTypeScriptSync } = require('@strapi/typescript-utils');
 
-const logInstructions = pluginName => {
+const logInstructions = (pluginName, { language }) => {
   const maxLength = `    resolve: './src/plugins/${pluginName}'`.length;
   const separator = Array(maxLength)
     .fill('─')
     .join('');
 
+  const exportInstruction = language === 'js' ? 'module.exports =' : 'export default';
+
   return `
-You can now enable your plugin by adding the following in ${chalk.yellow('./config/plugins.js')}.
+You can now enable your plugin by adding the following in ${chalk.yellow(
+    `./config/plugins.${language}`
+  )}
 ${separator}
-module.exports = {
+${exportInstruction} {
   ${chalk.gray('// ...')}
   ${chalk.green(`'${pluginName}'`)}: {
     enabled: ${chalk.yellow(true)},
@@ -33,26 +38,39 @@ module.exports = plop => {
         name: 'pluginName',
         message: 'Plugin name',
       },
+      {
+        type: 'list',
+        name: 'language',
+        message: 'Choose your preferred language',
+        choices: ['Javascript', 'Typescript'],
+        default: 'Javascript',
+      },
     ],
     actions(answers) {
+      const isTypescript = answers.language === 'Typescript';
+      const language = isTypescript ? 'ts' : 'js';
+      const projectLanguage = isUsingTypeScriptSync(process.cwd()) ? 'ts' : 'js';
+
+      // TODO: Adds tsconfig & build command for TS plugins?
+
       return [
         {
           type: 'addMany',
           destination: 'plugins/{{ pluginName }}',
-          base: 'files/plugin',
-          templateFiles: 'files/plugin/**',
+          base: `files/${language}/plugin`,
+          templateFiles: `files/${language}/plugin/**`,
         },
         {
           type: 'add',
           path: 'plugins/{{ pluginName }}/README.md',
-          templateFile: 'templates/README.md.hbs',
+          templateFile: `templates/${language}/README.md.hbs`,
         },
         {
           type: 'add',
           path: 'plugins/{{ pluginName }}/package.json',
-          templateFile: 'templates/plugin-package.json.hbs',
+          templateFile: `templates/${language}/plugin-package.json.hbs`,
         },
-        () => plop.renderString(logInstructions(answers.pluginName)),
+        () => plop.renderString(logInstructions(answers.pluginName, { language: projectLanguage })),
       ];
     },
   });

package/lib/plops/policy.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const tsUtils = require('@strapi/typescript-utils');
+
 const getDestinationPrompts = require('./prompts/get-destination-prompts');
 const getFilePath = require('./utils/get-file-path');
 
@@ -17,12 +19,14 @@ module.exports = plop => {
     ],
     actions(answers) {
       const filePath = getFilePath(answers.destination);
+      const currentDir = process.cwd();
+      const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js';
 
       return [
         {
           type: 'add',
-          path: `${filePath}/policies/{{id}}.js`,
-          templateFile: 'templates/policy.js.hbs',
+          path: `${filePath}/policies/{{id}}.${language}`,
+          templateFile: `templates/${language}/policy.${language}.hbs`,
         },
       ];
     },

package/lib/plops/prompts/get-attributes-prompts.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const validateInput = require('../utils/validate-input');
+const validateAttributeInput = require('../utils/validate-attribute-input');
 
 const DEFAULT_TYPES = [
   // advanced types
@@ -50,7 +50,7 @@ module.exports = async inquirer => {
         type: 'input',
         name: 'attributeName',
         message: 'Name of attribute',
-        validate: input => validateInput(input),
+        validate: input => validateAttributeInput(input),
       },
       {
         type: 'list',
@@ -72,7 +72,10 @@ module.exports = async inquirer => {
         type: 'list',
         name: 'multiple',
         message: 'Choose media type',
-        choices: [{ name: 'Multiple', value: true }, { name: 'Single', value: false }],
+        choices: [
+          { name: 'Multiple', value: true },
+          { name: 'Single', value: false },
+        ],
       },
       {
         type: 'confirm',

package/lib/plops/service.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const tsUtils = require('@strapi/typescript-utils');
+
 const getDestinationPrompts = require('./prompts/get-destination-prompts');
 const getFilePath = require('./utils/get-file-path');
 
@@ -17,12 +19,14 @@ module.exports = plop => {
     ],
     actions(answers) {
       const filePath = getFilePath(answers.destination);
+      const currentDir = process.cwd();
+      const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js';
 
       return [
         {
           type: 'add',
-          path: `${filePath}/services/{{ id }}.js`,
-          templateFile: 'templates/service.js.hbs',
+          path: `${filePath}/services/{{ id }}.${language}`,
+          templateFile: `templates/${language}/service.${language}.hbs`,
         },
       ];
     },

package/lib/plops/utils/validate-attribute-input.js

@@ -0,0 +1,11 @@
+'use strict';
+
+module.exports = input => {
+  const regex = /^[A-Za-z-|_]+$/g;
+
+  if (!input) {
+    return 'You must provide an input';
+  }
+
+  return regex.test(input) || "Please use only letters, '-', '_',  and no spaces";
+};

package/lib/templates/{single-type-routes.js.hbs → js/single-type-routes.js.hbs}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   routes: [
     {
       method: 'GET',

package/lib/templates/ts/README.md.hbs

@@ -0,0 +1,3 @@
+# Strapi plugin {{ pluginName }}
+
+A quick description of {{ pluginName }}.

package/lib/templates/ts/collection-type-routes.ts.hbs

@@ -0,0 +1,49 @@
+module.exports = {
+  routes: [
+    {
+      method: 'GET',
+      path: '/{{pluralize id}}',
+      handler: '{{id}}.find',
+      config: {
+        policies: [],
+        middlewares: [],
+      },
+    },
+    {
+      method: 'GET',
+      path: '/{{pluralize id}}/:id',
+      handler: '{{id}}.findOne',
+      config: {
+        policies: [],
+        middlewares: [],
+      },
+    },
+    {
+      method: 'POST',
+      path: '/{{pluralize id}}',
+      handler: '{{id}}.create',
+      config: {
+        policies: [],
+        middlewares: [],
+      },
+    },
+    {
+      method: 'PUT',
+      path: '/{{pluralize id}}/:id',
+      handler: '{{id}}.update',
+      config: {
+        policies: [],
+        middlewares: [],
+      },
+    },
+    {
+      method: 'DELETE',
+      path: '/{{pluralize id}}/:id',
+      handler: '{{id}}.delete',
+      config: {
+        policies: [],
+        middlewares: [],
+      },
+    },
+  ],
+};

package/lib/templates/ts/content-type.schema.json.hbs

@@ -0,0 +1,15 @@
+
+{
+  "kind": "{{kind}}",
+  "collectionName": "{{ collectionName }}",
+  "info": {
+    "singularName": "{{ singularName }}",
+    "pluralName": "{{ pluralName }}",
+    "displayName": "{{ displayName }}"
+  },
+  "options": {
+    "draftAndPublish": {{ useDraftAndPublish }},
+    "comment": ""
+  },
+  "attributes": {}
+}

package/lib/templates/ts/controller.ts.hbs

@@ -0,0 +1,13 @@
+/**
+ * A set of functions called "actions" for `{{id}}`
+ */
+
+export default {
+  // exampleAction: async (ctx, next) => {
+  //   try {
+  //     ctx.body = 'ok';
+  //   } catch (err) {
+  //     ctx.body = err;
+  //   }
+  // }
+};

package/lib/templates/ts/core-controller.ts.hbs

@@ -0,0 +1,7 @@
+/**
+ *  {{ id }} controller
+ */
+
+import { factories } from '@strapi/strapi'
+
+export default factories.createCoreController('{{ uid }}');

package/lib/templates/ts/core-router.ts.hbs

@@ -0,0 +1,7 @@
+/**
+ * {{ id }} router.
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreRouter('{{ uid }}');

package/lib/templates/ts/core-service.ts.hbs

@@ -0,0 +1,7 @@
+/**
+ * {{ id }} service.
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreService('{{ uid }}');

package/lib/templates/ts/middleware.js.hbs

@@ -0,0 +1,12 @@
+/**
+ * `{{ name }}` middleware.
+ */
+
+export default (config, { strapi }) => {
+  // Add your own logic here.
+  return async (ctx, next) => {
+    strapi.log.info('In {{ name }} middleware.');
+
+    await next();
+  };
+};

package/lib/templates/ts/plugin-package.json.hbs

@@ -0,0 +1,32 @@
+{
+  "name": "{{ pluginName }}",
+  "version": "0.0.0",
+  "description": "This is the description of the plugin.",
+  "strapi": {
+    "name": "{{ pluginName }}",
+    "description": "Description of {{ pluginName }} plugin",
+    "kind": "plugin"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "typescript": "4.6.3",
+    "@strapi/strapi": "4.1.8"
+  },
+  "author": {
+    "name": "A Strapi developer"
+  },
+  "maintainers": [
+    {
+      "name": "A Strapi developer"
+    }
+  ],
+  "engines": {
+    "node": ">=12.x.x <=16.x.x",
+    "npm": ">=6.0.0"
+  },
+  "scripts": {
+    "develop": "tsc -w",
+    "build": "tsc"
+  },
+  "license": "MIT"
+}

package/lib/templates/ts/policy.ts.hbs

@@ -0,0 +1,16 @@
+/**
+ * `{{id}}` policy.
+ */
+
+export default (policyContext, config, { strapi }) => {
+    // Add your own logic here.
+    strapi.log.info('In {{id}} policy.');
+
+    const canDoSomething = true;
+
+    if (canDoSomething) {
+      return true;
+    }
+
+    return false;
+};

package/lib/templates/ts/service.ts.hbs

@@ -0,0 +1,5 @@
+/**
+ * {{id}} service.
+ */
+
+export default () => ({});

package/lib/templates/ts/single-route.ts.hbs

@@ -0,0 +1,13 @@
+export default {
+  routes: [
+    // {
+    //  method: 'GET',
+    //  path: '/{{id}}',
+    //  handler: '{{id}}.exampleAction',
+    //  config: {
+    //    policies: [],
+    //    middlewares: [],
+    //  },
+    // },
+  ],
+};

package/lib/templates/ts/single-type-routes.ts.hbs

@@ -0,0 +1,31 @@
+export default {
+  routes: [
+    {
+      method: 'GET',
+      path: '/{{id}}',
+      handler: '{{id}}.find',
+      config: {
+        policies: [],
+        middlewares: [],
+      },
+    },
+    {
+      method: 'PUT',
+      path: '/{{id}}',
+      handler: '{{id}}.update',
+      config: {
+        policies: [],
+        middlewares: [],
+      },
+    },
+    {
+      method: 'DELETE',
+      path: '/{{id}}',
+      handler: '{{id}}.delete',
+      config: {
+        policies: [],
+        middlewares: [],
+      },
+    },
+  ],
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/generators",
-  "version": "4.2.0-alpha.O",
+  "version": "4.2.0-beta.2",
   "description": "Interactive API generator.",
   "keywords": [
     "strapi",
@@ -30,7 +30,8 @@
   "main": "lib/index.js",
   "dependencies": {
     "@sindresorhus/slugify": "1.1.0",
-    "@strapi/utils": "4.2.0-alpha.O",
+    "@strapi/typescript-utils": "4.2.0-beta.2",
+    "@strapi/utils": "4.2.0-beta.2",
     "chalk": "4.1.2",
     "fs-extra": "10.0.0",
     "node-plop": "0.26.3",
@@ -41,5 +42,5 @@
     "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "0e1f1ae08565a5f2427753582f37645a43c00cb2"
+  "gitHead": "bff73257e7695d6f361c91dda8cc810a2bb70b6e"
 }

package/lib/files/plugin/admin/src/pluginId.js

@@ -1,5 +0,0 @@
-const pluginPkg = require('../../package.json');
-
-const pluginId = pluginPkg.name.replace(/^@strapi\/plugin-/i, '');
-
-module.exports = pluginId;