@strapi/generators 4.2.0-beta.0 → 4.2.0-beta.1

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

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

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

@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = require('./server');
+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/plops/api.js

@@ -49,7 +49,7 @@ module.exports = plop => {
     actions(answers) {
       const filePath = answers.isPluginApi && answers.plugin ? 'plugins/{{plugin}}' : 'api/{{id}}';
       const currentDir = process.cwd();
-      const language = tsUtils.isTypeScriptProjectSync(currentDir) ? 'ts' : 'js';
+      const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js';
 
       const baseActions = [
         {

package/lib/plops/content-type.js

@@ -83,7 +83,7 @@ module.exports = plop => {
 
       const filePath = getFilePath(answers.destination);
       const currentDir = process.cwd();
-      const language = tsUtils.isTypeScriptProjectSync(currentDir) ? 'ts' : 'js';
+      const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js';
 
       const baseActions = [
         {

package/lib/plops/controller.js

@@ -22,7 +22,7 @@ module.exports = plop => {
     actions(answers) {
       const filePath = getFilePath(answers.destination);
       const currentDir = process.cwd();
-      const language = tsUtils.isTypeScriptProjectSync(currentDir) ? 'ts' : 'js';
+      const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js';
 
       return [
         {

package/lib/plops/middleware.js

@@ -20,7 +20,7 @@ module.exports = plop => {
     actions(answers) {
       const filePath = getFilePath(answers.destination);
       const currentDir = process.cwd();
-      const language = tsUtils.isTypeScriptProjectSync(currentDir) ? 'ts' : 'js';
+      const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js';
 
       return [
         {

package/lib/plops/plugin.js

@@ -9,12 +9,14 @@ const logInstructions = (pluginName, { language }) => {
     .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.${language}`
   )}
 ${separator}
-module.exports = {
+${exportInstruction} {
   ${chalk.gray('// ...')}
   ${chalk.green(`'${pluginName}'`)}: {
     enabled: ${chalk.yellow(true)},
@@ -39,7 +41,7 @@ module.exports = plop => {
     ],
     actions(answers) {
       const currentDir = process.cwd();
-      const language = tsUtils.isTypeScriptProjectSync(currentDir) ? 'ts' : 'js';
+      const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js';
 
       // TODO: Adds tsconfig & build command for TS plugins?
 

package/lib/plops/policy.js

@@ -20,7 +20,7 @@ module.exports = plop => {
     actions(answers) {
       const filePath = getFilePath(answers.destination);
       const currentDir = process.cwd();
-      const language = tsUtils.isTypeScriptProjectSync(currentDir) ? 'ts' : 'js';
+      const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js';
 
       return [
         {

package/lib/plops/service.js

@@ -20,7 +20,7 @@ module.exports = plop => {
     actions(answers) {
       const filePath = getFilePath(answers.destination);
       const currentDir = process.cwd();
-      const language = tsUtils.isTypeScriptProjectSync(currentDir) ? 'ts' : 'js';
+      const language = tsUtils.isUsingTypeScriptSync(currentDir) ? 'ts' : 'js';
 
       return [
         {

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

@@ -8,6 +8,10 @@
     "kind": "plugin"
   },
   "dependencies": {},
+  "devDependencies": {
+    "typescript": "4.6.3",
+    "@strapi/strapi": "4.1.8"
+  },
   "author": {
     "name": "A Strapi developer"
   },
@@ -20,5 +24,9 @@
     "node": ">=12.x.x <=16.x.x",
     "npm": ">=6.0.0"
   },
+  "scripts": {
+    "develop": "tsc -w",
+    "build": "tsc"
+  },
   "license": "MIT"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/generators",
-  "version": "4.2.0-beta.0",
+  "version": "4.2.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.2.0-beta.0",
-    "@strapi/utils": "4.2.0-beta.0",
+    "@strapi/typescript-utils": "4.2.0-beta.1",
+    "@strapi/utils": "4.2.0-beta.1",
     "chalk": "4.1.2",
     "fs-extra": "10.0.0",
     "node-plop": "0.26.3",
@@ -42,5 +42,5 @@
     "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "db70f0de7cc73fb469c8a076b89530729cf14142"
+  "gitHead": "4fa2804f35e15ed72dfd309fb5bb1c4dba18932f"
 }