fixup! update CLI templates

Signed-off-by: Miroslav Bajtoš <[email protected]>

Author: bajtos

packages/cli/generators/app/templates/index.js.ejs

@@ -21,6 +21,8 @@ import {
 import path from 'path';
 import {MySequence} from './sequence';
 
+export {ApplicationConfig};
+
 <% if (project.appClassWithMixins) { -%>
 export class <%= project.applicationName %> extends BootMixin(
   <%= project.appClassWithMixins %>,

packages/cli/generators/app/templates/src/application.ts.ejs

@@ -1,7 +1,6 @@
-import {<%= project.applicationName %>} from './application';
-import {ApplicationConfig} from '@loopback/core';
+import {ApplicationConfig, <%= project.applicationName %>} from './application';
 
-export {<%= project.applicationName %>};
+export * from './application';
 
 export async function main(options: ApplicationConfig = {}) {
   const app = new <%= project.applicationName %>(options);
@@ -14,3 +13,27 @@ export async function main(options: ApplicationConfig = {}) {
 
   return app;
 }
+
+if (require.main === module) {
+  // Run the application
+  const config = {
+    rest: {
+      port: +(process.env.PORT ?? 3000),
+      host: process.env.HOST,
+      // The `gracePeriodForClose` provides a graceful close for http/https
+      // servers with keep-alive clients. The default value is `Infinity`
+      // (don't force-close). If you want to immediately destroy all sockets
+      // upon stop, set its value to `0`.
+      // See https://www.npmjs.com/package/stoppable
+      gracePeriodForClose: 5000, // 5 seconds
+      openApiSpec: {
+        // useful when used with OpenAPI-to-GraphQL to locate your application
+        setServersFromRequest: true,
+      },
+    },
+  };
+  main(config).catch(err => {
+    console.error('Cannot start the application.', err);
+    process.exit(1);
+  });
+}

packages/cli/generators/app/templates/src/index.ts.ejs

@@ -6,7 +6,8 @@
     "loopback-<%= project.projectType -%>",
     "loopback"
   ],
-  "main": "index.js",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "engines": {
     "node": ">=10"
   },
@@ -65,8 +66,6 @@
   "license": "",
   "files": [
     "README.md",
-    "index.js",
-    "index.d.ts",
     "dist",
     "src",
     "!*/__tests__"

packages/cli/generators/extension/templates/index.d.ts.ejs

@@ -6,7 +6,8 @@
     "loopback-<%= project.projectType -%>",
     "loopback"
   ],
-  "main": "index.js",
+  "main": "dist/index.js",
+  "main": "types/index.d.ts",
   "engines": {
     "node": ">=10"
   },
@@ -65,8 +66,6 @@
   "license": "",
   "files": [
     "README.md",
-    "index.js",
-    "index.d.ts",
     "dist",
     "src",
     "!*/__tests__"

packages/cli/generators/extension/templates/index.js.ejs

@@ -20,6 +20,8 @@ import {ServiceMixin} from '@loopback/service-proxy';
 import path from 'path';
 import {MySequence} from './sequence';
 
+export {ApplicationConfig};
+
 export class MyAppApplication extends BootMixin(
   ServiceMixin(RepositoryMixin(RestApplication)),
 ) {
@@ -55,15 +57,27 @@ export class MyAppApplication extends BootMixin(
 
 
 exports[`app-generator specific files generates all the proper files 2`] = `
-const application = require('./dist');
+import {ApplicationConfig, MyAppApplication} from './application';
+
+export * from './application';
 
-module.exports = application;
+export async function main(options: ApplicationConfig = {}) {
+  const app = new MyAppApplication(options);
+  await app.boot();
+  await app.start();
+
+  const url = app.restServer.url;
+  console.log(\`Server is running at \${url}\`);
+  console.log(\`Try \${url}/ping\`);
+
+  return app;
+}
 
 if (require.main === module) {
   // Run the application
   const config = {
     rest: {
-      port: +(process.env.PORT || 3000),
+      port: +(process.env.PORT ?? 3000),
       host: process.env.HOST,
       // The \`gracePeriodForClose\` provides a graceful close for http/https
       // servers with keep-alive clients. The default value is \`Infinity\`
@@ -77,7 +91,7 @@ if (require.main === module) {
       },
     },
   };
-  application.main(config).catch(err => {
+  main(config).catch(err => {
     console.error('Cannot start the application.', err);
     process.exit(1);
   });
@@ -87,27 +101,6 @@ if (require.main === module) {
 
 
 exports[`app-generator specific files generates all the proper files 3`] = `
-import {MyAppApplication} from './application';
-import {ApplicationConfig} from '@loopback/core';
-
-export {MyAppApplication};
-
-export async function main(options: ApplicationConfig = {}) {
-  const app = new MyAppApplication(options);
-  await app.boot();
-  await app.start();
-
-  const url = app.restServer.url;
-  console.log(\`Server is running at \${url}\`);
-  console.log(\`Try \${url}/ping\`);
-
-  return app;
-}
-
-`;
-
-
-exports[`app-generator specific files generates all the proper files 4`] = `
 import {Request, RestBindings, get, ResponseObject} from '@loopback/rest';
 import {inject} from '@loopback/context';
 
@@ -164,7 +157,7 @@ export class PingController {
 `;
 
 
-exports[`app-generator specific files generates all the proper files 5`] = `
+exports[`app-generator specific files generates all the proper files 4`] = `
 import {Client, expect} from '@loopback/testlab';
 import {MyAppApplication} from '../..';
 import {setupApplication} from './test-helper';
@@ -190,7 +183,7 @@ describe('PingController', () => {
 `;
 
 
-exports[`app-generator specific files generates all the proper files 6`] = `
+exports[`app-generator specific files generates all the proper files 5`] = `
 import {Client} from '@loopback/testlab';
 import {MyAppApplication} from '../..';
 import {setupApplication} from './test-helper';
@@ -226,7 +219,7 @@ describe('HomePage', () => {
 `;
 
 
-exports[`app-generator specific files generates all the proper files 7`] = `
+exports[`app-generator specific files generates all the proper files 6`] = `
 import {MyAppApplication} from '../..';
 import {
   createRestAppClient,
@@ -349,6 +342,8 @@ import {
 import path from 'path';
 import {MySequence} from './sequence';
 
+export {ApplicationConfig};
+
 export class MyAppApplication extends BootMixin(
   ServiceMixin(RepositoryMixin(RestApplication)),
 ) {
@@ -403,6 +398,8 @@ import {ServiceMixin} from '@loopback/service-proxy';
 import path from 'path';
 import {MySequence} from './sequence';
 
+export {ApplicationConfig};
+
 export class MyApp extends BootMixin(
   ServiceMixin(RepositoryMixin(RestApplication)),
 ) {
@@ -450,6 +447,8 @@ import {ServiceMixin} from '@loopback/service-proxy';
 import path from 'path';
 import {MySequence} from './sequence';
 
+export {ApplicationConfig};
+
 export class MyApp extends BootMixin(
   ServiceMixin(RepositoryMixin(RestApplication)),
 ) {

packages/cli/generators/project/templates/index.ts.ejs

@@ -42,7 +42,6 @@ describe('app-generator specific files', () => {
     assertFilesToMatchSnapshot(
       {},
       'src/application.ts',
-      'index.js',
       'src/index.ts',
       'src/controllers/ping.controller.ts',
       'src/__tests__/acceptance/ping.controller.acceptance.ts',

packages/cli/generators/project/templates/package.json.ejs

@@ -365,7 +365,6 @@ module.exports = function (projGenerator, props, projectType) {
           ['.eslintrc.js', "extends: '@loopback/eslint-config'"],
           ['tsconfig.json', '"compilerOptions"'],
           ['tsconfig.json', '"resolveJsonModule": true'],
-          ['index.js', "require('./dist')"],
         ]);
       });
     });