@gasket/preset-api 7.0.0-next.56 → 7.0.0-next.58

package/README.md

@@ -14,7 +14,6 @@ To see complete the list of plugins configured in your app, and what commands, l
 
 ## Plugins
 
-- [@gasket/plugin-data](/packages/gasket-plugin-data/README.md)
 - [@gasket/plugin-swagger](/packages/gasket-plugin-swagger/README.md)
 - [@gasket/plugin-docs](/packages/gasket-plugin-docs/README.md)
 - [@gasket/plugin-docusaurus](/packages/gasket-plugin-docusaurus/README.md)

package/generator/server.js

@@ -1,2 +1,6 @@
 import gasket from './gasket.js';
+{{#if apiApp }}
+import './routes/index.js';
+{{/if}}
+
 gasket.actions.startServer();

package/lib/index.d.ts

@@ -1,7 +1,5 @@
-import '@gasket/plugin-data';
 import '@gasket/plugin-express';
 import '@gasket/plugin-fastify';
 import '@gasket/plugin-https';
 import '@gasket/plugin-lint';
-import '@gasket/plugin-swagger';
 import '@gasket/plugin-winston';

package/lib/preset-config.js

@@ -1,7 +1,5 @@
 import pluginHttps from '@gasket/plugin-https';
-import pluginData from '@gasket/plugin-data';
 import pluginWinston from '@gasket/plugin-winston';
-import pluginSwagger from '@gasket/plugin-swagger';
 import pluginLint from '@gasket/plugin-lint';
 
 /**
@@ -11,33 +9,36 @@ import pluginLint from '@gasket/plugin-lint';
  * @returns {Promise<CreateContext.presetConfig>} config
  */
 export default async function presetConfig(gasket, context) {
-  let typescriptPlugin;
-  const testPlugins = [];
+  const plugins = [
+    pluginHttps,
+    pluginWinston,
+    pluginLint
+  ];
+
   const frameworkPlugin = context.server === 'express'
     ? await import('@gasket/plugin-express')
     : await import('@gasket/plugin-fastify');
 
+  plugins.push(frameworkPlugin.default || frameworkPlugin);
+
   if ('testPlugins' in context && context.testPlugins.length > 0) {
     await Promise.all(context.testPlugins.map(async (testPlugin) => {
       const plugin = await import(testPlugin);
-      testPlugins.push(plugin ? plugin.default || plugin : null);
+      plugins.push(plugin ? plugin.default || plugin : null);
     }));
   }
 
   if (context.typescript) {
-    typescriptPlugin = await import('@gasket/plugin-typescript');
+    const typescriptPlugin = await import('@gasket/plugin-typescript');
+    plugins.push(typescriptPlugin.default || typescriptPlugin);
+  }
+
+  if (context.useSwagger) {
+    const swaggerPlugin = await import('@gasket/plugin-swagger');
+    plugins.push(swaggerPlugin.default || swaggerPlugin);
   }
 
   return {
-    plugins: [
-      pluginHttps,
-      pluginData,
-      pluginWinston,
-      pluginSwagger,
-      pluginLint,
-      frameworkPlugin.default || frameworkPlugin,
-      typescriptPlugin ? typescriptPlugin.default || typescriptPlugin : null,
-      ...testPlugins
-    ].filter(Boolean)
+    plugins: plugins.filter(Boolean)
   };
 }

package/lib/preset-prompt.js

@@ -1,4 +1,5 @@
 import typescriptPrompts from '@gasket/plugin-typescript/prompts';
+import swaggerPrompts from '@gasket/plugin-swagger/prompts';
 
 /**
  * presetPrompt hook
@@ -11,6 +12,7 @@ export default async function presetPrompt(gasket, context, { prompt }) {
   context.apiApp = true;
 
   await typescriptPrompts.promptTypescript(context, prompt);
+  await swaggerPrompts.promptSwagger(context, prompt);
 
   if (!('server' in context)) {
     const { server } = await prompt([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gasket/preset-api",
-  "version": "7.0.0-next.56",
+  "version": "7.0.0-next.58",
   "description": "Create Express-based API with Gasket",
   "type": "module",
   "main": "lib/index.js",
@@ -30,17 +30,16 @@
     "url": "https://github.com/godaddy/gasket/issues"
   },
   "dependencies": {
-    "@gasket/plugin-cypress": "7.0.0-next.56",
-    "@gasket/plugin-data": "7.0.0-next.56",
-    "@gasket/plugin-express": "7.0.0-next.56",
-    "@gasket/plugin-fastify": "7.0.0-next.56",
-    "@gasket/plugin-https": "7.0.0-next.56",
-    "@gasket/plugin-jest": "7.0.0-next.56",
-    "@gasket/plugin-lint": "7.0.0-next.56",
-    "@gasket/plugin-mocha": "7.0.0-next.56",
-    "@gasket/plugin-swagger": "7.0.0-next.56",
-    "@gasket/plugin-typescript": "7.0.0-next.56",
-    "@gasket/plugin-winston": "7.0.0-next.56"
+    "@gasket/plugin-cypress": "7.0.0-next.58",
+    "@gasket/plugin-express": "7.0.0-next.58",
+    "@gasket/plugin-fastify": "7.0.0-next.58",
+    "@gasket/plugin-https": "7.0.0-next.58",
+    "@gasket/plugin-jest": "7.0.0-next.58",
+    "@gasket/plugin-lint": "7.0.0-next.58",
+    "@gasket/plugin-mocha": "7.0.0-next.58",
+    "@gasket/plugin-swagger": "7.0.0-next.58",
+    "@gasket/plugin-typescript": "7.0.0-next.58",
+    "@gasket/plugin-winston": "7.0.0-next.58"
   },
   "devDependencies": {
     "cross-env": "^7.0.3",
@@ -64,10 +63,11 @@
     }
   },
   "eslintIgnore": [
-    "test/fixtures"
+    "test/fixtures",
+    "generator"
   ],
   "jest": {
     "transform": {}
   },
-  "gitHead": "129c2124d2ce7c744a59f1309e87e0032cf29fc7"
+  "gitHead": "800032d942a80eec38ae3cf80e738e73e411db7f"
 }