@strapi/generators 4.0.0 → 4.0.4

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

@@ -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/plops/__tests__/content-type.test.js

@@ -0,0 +1,179 @@
+'use strict';
+
+const path = require('path');
+const { readFile, rm, stat } = require('fs-extra');
+const strapiGenerators = require('../../index');
+
+describe('Content Type Generator', () => {
+  const outputDirectory = path.join(__dirname, 'output');
+
+  afterEach(async () => {
+    await rm(outputDirectory, { recursive: true, force: true });
+  });
+
+  test('it generates the schema', async () => {
+    await strapiGenerators.generate(
+      'content-type',
+      {
+        displayName: 'testContentType',
+        singularName: 'testContentType',
+        pluralName: 'testContentTypes',
+        kind: 'singleType',
+        id: 'testContentType',
+        useDraftAndPublish: false,
+        destination: 'new',
+        bootstrapApi: false,
+        attributes: [],
+      },
+      { dir: outputDirectory }
+    );
+
+    const generatedSchemaPath = path.join(
+      outputDirectory,
+      'src/api/testContentType',
+      'content-types/testContentType/schema.json'
+    );
+
+    expect((await stat(generatedSchemaPath)).isFile()).toBeTruthy();
+
+    const fileContent = await readFile(generatedSchemaPath, 'utf-8');
+
+    expect(fileContent).not.toBeNull();
+
+    const schema = JSON.parse(fileContent.toString());
+
+    expect(schema).toStrictEqual({
+      kind: 'singleType',
+      collectionName: 'test_content_types',
+      info: {
+        singularName: 'testContentType',
+        pluralName: 'testContentTypes',
+        displayName: 'testContentType',
+      },
+      options: {
+        draftAndPublish: false,
+        comment: '',
+      },
+      attributes: {},
+    });
+  });
+
+  test('it scaffolds a new API', async () => {
+    await strapiGenerators.generate(
+      'content-type',
+      {
+        displayName: 'testContentType',
+        singularName: 'testContentType',
+        pluralName: 'testContentTypes',
+        kind: 'singleType',
+        id: 'testContentType',
+        useDraftAndPublish: false,
+        destination: 'new',
+        bootstrapApi: true,
+        attributes: [],
+      },
+      { dir: outputDirectory }
+    );
+    const generatedApiPath = path.join(outputDirectory, 'src/api/testContentType');
+
+    expect((await stat(generatedApiPath)).isDirectory()).toBeTruthy();
+    expect(
+      (await stat(path.join(generatedApiPath, 'controllers/testContentType.js'))).isFile()
+    ).toBeTruthy();
+    expect(
+      (await stat(path.join(generatedApiPath, 'services/testContentType.js'))).isFile()
+    ).toBeTruthy();
+    expect(
+      (await stat(path.join(generatedApiPath, 'routes/testContentType.js'))).isFile()
+    ).toBeTruthy();
+
+    const controller = await readFile(
+      path.join(generatedApiPath, 'controllers/testContentType.js')
+    );
+    const router = await readFile(path.join(generatedApiPath, 'routes/testContentType.js'));
+    const service = await readFile(path.join(generatedApiPath, 'services/testContentType.js'));
+
+    expect(controller.toString()).toMatchInlineSnapshot(`
+      "'use strict';
+
+      /**
+       *  testContentType controller
+       */
+
+      const { createCoreController } = require('@strapi/strapi').factories;
+
+      module.exports = createCoreController('api::testContentType.testContentType');
+      "
+    `);
+    expect(router.toString()).toMatchInlineSnapshot(`
+      "'use strict';
+
+      /**
+       * testContentType router.
+       */
+
+      const { createCoreRouter } = require('@strapi/strapi').factories;
+
+      module.exports = createCoreRouter('api::testContentType.testContentType');
+      "
+    `);
+    expect(service.toString()).toMatchInlineSnapshot(`
+      "'use strict';
+
+      /**
+       * testContentType service.
+       */
+
+      const { createCoreService } = require('@strapi/strapi').factories;
+
+      module.exports = createCoreService('api::testContentType.testContentType');
+      "
+    `);
+  });
+
+  test('it generates the schema, then adds the attributes', async () => {
+    await strapiGenerators.generate(
+      'content-type',
+      {
+        displayName: 'testContentType',
+        singularName: 'testContentType',
+        pluralName: 'testContentTypes',
+        kind: 'singleType',
+        id: 'testContentType',
+        useDraftAndPublish: false,
+        destination: 'new',
+        bootstrapApi: false,
+        attributes: [
+          {
+            attributeName: 'name',
+            attributeType: 'string',
+          },
+          {
+            attributeName: 'email',
+            attributeType: 'string',
+          },
+        ],
+      },
+      { dir: outputDirectory }
+    );
+
+    const generatedSchemaPath = path.join(
+      outputDirectory,
+      'src/api/testContentType',
+      'content-types/testContentType/schema.json'
+    );
+
+    expect((await stat(generatedSchemaPath)).isFile()).toBeTruthy();
+
+    const fileContent = await readFile(generatedSchemaPath, 'utf-8');
+
+    expect(fileContent).not.toBeNull();
+
+    const schema = JSON.parse(fileContent.toString());
+
+    expect(schema.attributes).toStrictEqual({
+      email: { type: 'string' },
+      name: { type: 'string' },
+    });
+  });
+});

package/lib/plops/content-type.js

@@ -93,7 +93,7 @@ module.exports = plop => {
         },
       ];
 
-      if (attributes.lenght > 0) {
+      if (Object.entries(attributes).length > 0) {
         baseActions.push({
           type: 'modify',
           path: `${filePath}/content-types/{{ singularName }}/schema.json`,

package/lib/templates/policy.js.hbs

@@ -4,8 +4,7 @@
  * `{{id}}` policy.
  */
 
-module.exports = (config, { strapi }) => {
-  return policyCtx => {
+module.exports = (policyContext, config, { strapi }) => {
     // Add your own logic here.
     strapi.log.info('In {{id}} policy.');
 
@@ -16,5 +15,4 @@ module.exports = (config, { strapi }) => {
     }
 
     return false;
-  };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/generators",
-  "version": "4.0.0",
+  "version": "4.0.4",
   "description": "Interactive API generator.",
   "keywords": [
     "strapi",
@@ -30,7 +30,7 @@
   "main": "lib/index.js",
   "dependencies": {
     "@sindresorhus/slugify": "1.1.0",
-    "@strapi/utils": "4.0.0",
+    "@strapi/utils": "4.0.4",
     "chalk": "4.1.2",
     "fs-extra": "10.0.0",
     "node-plop": "0.26.3",
@@ -38,8 +38,8 @@
     "pluralize": "8.0.0"
   },
   "engines": {
-    "node": ">=12.x.x <=16.x.x",
+    "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "b181702f0202b2c6d645d42b195a831f25cd0b03"
+  "gitHead": "d81919ac2272948b3f5d3b25a4cf8cc7b6994460"
 }

package/lib/files/plugin/admin/src/containers/App/index.js

@@ -1,25 +0,0 @@
-/**
- *
- * 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 = () => {
-  return (
-    <div>
-      <Switch>
-        <Route path={`/plugins/${pluginId}`} component={HomePage} exact />
-        <Route component={NotFound} />
-      </Switch>
-    </div>
-  );
-};
-
-export default App;

package/lib/files/plugin/admin/src/containers/HomePage/index.js

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

package/lib/files/plugin/admin/src/containers/Initializer/index.js

@@ -1,26 +0,0 @@
-/**
- *
- * Initializer
- *
- */
-
-import { useEffect, useRef } from 'react';
-import PropTypes from 'prop-types';
-import pluginId from '../../pluginId';
-
-const Initializer = ({ setPlugin }) => {
-  const ref = useRef();
-  ref.current = setPlugin;
-
-  useEffect(() => {
-    ref.current(pluginId);
-  }, []);
-
-  return null;
-};
-
-Initializer.propTypes = {
-  setPlugin: PropTypes.func.isRequired,
-};
-
-export default Initializer;