@strapi/generators 4.9.0-alpha.0 → 4.9.0-beta.1

package/lib/files/js/plugin/admin/src/components/PluginIcon/index.js

@@ -5,7 +5,7 @@
  */
 
 import React from 'react';
-import Puzzle from '@strapi/icons/Puzzle';
+import { Puzzle } from '@strapi/icons';
 
 const PluginIcon = () => <Puzzle />;
 

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

@@ -4,7 +4,7 @@
  *
  */
 
-import React, { useEffect, useRef } from 'react';
+import { useEffect, useRef } from 'react';
 import pluginId from '../../pluginId';
 
 type InitializerProps = {

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

@@ -7,6 +7,6 @@
 import React from 'react';
 import { Puzzle } from '@strapi/icons';
 
-const PluginIcon: React.VoidFunctionComponent = () => <Puzzle />;
+const PluginIcon = () => <Puzzle />;
 
 export default PluginIcon;

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

@@ -1,5 +1,5 @@
-import React from 'react';
 import { prefixPluginTranslations } from '@strapi/helper-plugin';
+
 import pluginPkg from '../../package.json';
 import pluginId from './pluginId';
 import Initializer from './components/Initializer';
@@ -8,7 +8,7 @@ import PluginIcon from './components/PluginIcon';
 const name = pluginPkg.strapi.name;
 
 export default {
-  register(app) {
+  register(app: any) {
     app.addMenuLink({
       to: `/plugins/${pluginId}`,
       icon: PluginIcon,
@@ -39,12 +39,13 @@ export default {
     app.registerPlugin(plugin);
   },
 
-  bootstrap(app) {},
-  async registerTrads(app) {
+  bootstrap(app: any) {},
+
+  async registerTrads(app: any) {
     const { locales } = app;
 
     const importedTrads = await Promise.all(
-      locales.map(locale => {
+      (locales as any[]).map((locale) => {
         return import(`./translations/${locale}.json`)
           .then(({ default: data }) => {
             return {

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

@@ -11,7 +11,7 @@ import { NotFound } from '@strapi/helper-plugin';
 import pluginId from '../../pluginId';
 import HomePage from '../HomePage';
 
-const App: React.VoidFunctionComponent = () => {
+const App = () => {
   return (
     <div>
       <Switch>

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

@@ -7,7 +7,7 @@
 import React from 'react';
 import pluginId from '../../pluginId';
 
-const HomePage: React.VoidFunctionComponent = () => {
+const HomePage = () => {
   return (
     <div>
       <h1>{pluginId}&apos;s HomePage</h1>

package/lib/files/ts/plugin/custom.d.ts

@@ -0,0 +1,5 @@
+declare module '@strapi/design-system/*';
+declare module '@strapi/design-system';
+declare module '@strapi/icons';
+declare module '@strapi/icons/*';
+declare module '@strapi/helper-plugin';

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

@@ -1,24 +1,19 @@
 {
-  "extends": "@strapi/typescript-utils/tsconfigs/server",
+  "extends": "@strapi/typescript-utils/tsconfigs/admin",
 
   "compilerOptions": {
-    "outDir": "dist",
-    "rootDir": "."
+    "target": "ESNext",
+    "strict": true
   },
 
-  "include": [
-    // Include the root directory
-    "server",
-    // Force the JSON files in the src folder to be included
-    "server/**/*.json"
-  ],
+  "include": ["admin", "custom.d.ts"],
 
   "exclude": [
     "node_modules/",
     "dist/",
 
-    // Do not include admin files in the server compilation
-    "admin/",
+    // Do not include server files in the server compilation
+    "server/",
     // Do not include test files
     "**/*.test.ts"
   ]

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

@@ -0,0 +1,25 @@
+{
+  "extends": "@strapi/typescript-utils/tsconfigs/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/plopfile.js

@@ -8,6 +8,7 @@ const generateContentType = require('./plops/content-type');
 const generatePlugin = require('./plops/plugin');
 const generatePolicy = require('./plops/policy');
 const generateMiddleware = require('./plops/middleware');
+const generateMigration = require('./plops/migration');
 const generateService = require('./plops/service');
 
 module.exports = (plop) => {
@@ -22,5 +23,6 @@ module.exports = (plop) => {
   generatePlugin(plop);
   generatePolicy(plop);
   generateMiddleware(plop);
+  generateMigration(plop);
   generateService(plop);
 };

package/lib/plops/migration.js

@@ -0,0 +1,33 @@
+'use strict';
+
+const tsUtils = require('@strapi/typescript-utils');
+const validateFileNameInput = require('./utils/validate-file-name-input');
+const getFormattedDate = require('./utils/get-formatted-date');
+
+module.exports = (plop) => {
+  // Migration generator
+  plop.setGenerator('migration', {
+    description: 'Generate a migration',
+    prompts: [
+      {
+        type: 'input',
+        name: 'name',
+        message: 'Migration name',
+        validate: (input) => validateFileNameInput(input),
+      },
+    ],
+    actions() {
+      const currentDir = process.cwd();
+      const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js';
+      const timestamp = getFormattedDate();
+
+      return [
+        {
+          type: 'add',
+          path: `${currentDir}/database/migrations/${timestamp}.{{ name }}.${language}`,
+          templateFile: `templates/${language}/migration.${language}.hbs`,
+        },
+      ];
+    },
+  });
+};

package/lib/plops/utils/get-formatted-date.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = (date = new Date()) => {
+  return new Date(date.getTime() - date.getTimezoneOffset() * 60000)
+    .toJSON()
+    .replace(/[-:]/g, '.')
+    .replace(/\....Z/, '');
+};

package/lib/plops/utils/validate-file-name-input.js

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

package/lib/templates/js/migration.js.hbs

@@ -0,0 +1,15 @@
+'use strict';
+
+/**
+ * Migration `{{ name }}`
+ */
+
+module.exports = {
+  /**
+   *
+   * @param {import('knex').Knex} knex
+   */
+  async up(knex) {
+
+  },
+};

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

@@ -8,7 +8,24 @@
     "kind": "plugin",
     "displayName": "{{titleCase pluginName }}"
   },
-  "dependencies": {},
+  "dependencies": {
+    "@strapi/design-system": "^1.6.3",
+    "@strapi/helper-plugin": "^4.6.0",
+    "@strapi/icons": "^1.6.3",
+    "prop-types": "^15.7.2"
+  },
+  "devDependencies": {
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-router-dom": "^5.3.4",
+    "styled-components": "^5.3.6"
+  },
+  "peerDependencies": {
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-router-dom": "^5.3.4",
+    "styled-components": "^5.3.6"
+  },
   "author": {
     "name": "A Strapi developer"
   },

package/lib/templates/ts/migration.ts.hbs

@@ -0,0 +1,11 @@
+import type { Knex } from 'knex';
+
+/**
+ * Migration `{{ name }}`
+ */
+
+export default {
+  up: async (knex: Knex) => {
+
+  },
+};

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

@@ -8,11 +8,29 @@
     "kind": "plugin"
   },
   "dependencies": {
-    "@strapi/icons": "^1.3.1"
+    "@strapi/design-system": "^1.6.3",
+    "@strapi/helper-plugin": "^4.6.0",
+    "@strapi/icons": "^1.6.3",
+    "prop-types": "^15.7.2"
   },
   "devDependencies": {
+    "@strapi/typescript-utils": "^4.6.0",
+    "@types/react": "^17.0.53",
+    "@types/react-dom": "^17.0.18",
+    "@types/react-router-dom": "^5.3.3",
+    "@types/styled-components": "^5.1.26",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-router-dom": "^5.3.4",
+    "styled-components": "^5.3.6",
     "typescript": "4.6.3"
   },
+  "peerDependencies": {
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-router-dom": "^5.3.4",
+    "styled-components": "^5.3.6"
+  },
   "author": {
     "name": "A Strapi developer"
   },
@@ -26,8 +44,8 @@
     "npm": ">=6.0.0"
   },
   "scripts": {
-    "develop": "tsc -w",
-    "build": "tsc"
+    "develop": "tsc -p tsconfig.server.json -w",
+    "build": "tsc -p tsconfig.server.json"
   },
   "license": "MIT"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/generators",
-  "version": "4.9.0-alpha.0",
+  "version": "4.9.0-beta.1",
   "description": "Interactive API generator.",
   "keywords": [
     "strapi",
@@ -30,8 +30,8 @@
   "main": "lib/index.js",
   "dependencies": {
     "@sindresorhus/slugify": "1.1.0",
-    "@strapi/typescript-utils": "4.9.0-alpha.0",
-    "@strapi/utils": "4.9.0-alpha.0",
+    "@strapi/typescript-utils": "4.9.0-beta.1",
+    "@strapi/utils": "4.9.0-beta.1",
     "chalk": "4.1.2",
     "fs-extra": "10.0.0",
     "node-plop": "0.26.3",
@@ -42,5 +42,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "35f783d0dc07db101e7e62cb4d682f751551f452"
+  "gitHead": "ff37d666d0634fc84827e3d6419d916618275572"
 }

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

@@ -1,42 +0,0 @@
-/**
- * axios with a custom config.
- */
-
-import axios from 'axios';
-import { auth, wrapAxiosInstance } 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;
-  }
-);
-
-const wrapper = wrapAxiosInstance(instance);
-
-export default wrapper;

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

@@ -1,42 +0,0 @@
-/**
- * axios with a custom config.
- */
-
-import axios from 'axios';
-import { auth, wrapAxiosInstance } 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;
-  }
-);
-
-const wrapper = wrapAxiosInstance(instance);
-
-export default wrapper;