@travetto/scaffold 6.0.0-rc.3 → 6.0.1

package/README.md

@@ -25,7 +25,7 @@ $ npx @travetto/scaffold@<version-or-tag>
 The generator will ask about enabling the following features:
 
 ## Web Application
-The [Web API](https://github.com/travetto/travetto/tree/main/module/web#readme "Declarative api for Web Applications with support for the dependency injection.") provides the necessary integration for exposing web apis.  When selecting the `web` feature, you will need to specify which backend you want to include with your application, the default being [express](https://expressjs.com).  Currently you can select from:
+The [Web API](https://github.com/travetto/travetto/tree/main/module/web#readme "Declarative support for creating Web Applications") provides the necessary integration for exposing web apis.  When selecting the `web` feature, you will need to specify which backend you want to include with your application, the default being [express](https://expressjs.com).  Currently you can select from:
    *  [express](https://expressjs.com)
    *  [koa](https://koajs.com/)
    *  [fastify](https://www.fastify.io/)

package/bin/trv-scaffold.js

@@ -2,7 +2,7 @@
 // @ts-check
 
 async function getScaffoldCwd() {
-  if (process.env.npm_lifecycle_script === 'trv-scaffold') { // Is npx  run
+  if (process.env.npm_lifecycle_script?.includes('trv-scaffold')) { // Is npx  run
     const { delimiter } = await import('node:path');
     const parts = process.env.PATH?.split(delimiter) ?? [];
     const loc = parts.find(p => p.includes('npx') && p.includes('.bin'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/scaffold",
-  "version": "6.0.0-rc.3",
+  "version": "6.0.1",
   "description": "App Scaffold for the Travetto framework",
   "keywords": [
     "generator",
@@ -27,14 +27,14 @@
     "trv-scaffold": "bin/trv-scaffold.js"
   },
   "dependencies": {
-    "@travetto/cli": "^6.0.0-rc.3",
-    "@travetto/runtime": "^6.0.0-rc.2",
+    "@travetto/cli": "^6.0.1",
+    "@travetto/runtime": "^6.0.1",
     "enquirer": "^2.4.1",
     "mustache": "^4.2.0"
   },
   "devDependencies": {
-    "@travetto/model": "^6.0.0-rc.2",
-    "@types/mustache": "^4.2.5"
+    "@travetto/model": "^6.0.1",
+    "@types/mustache": "^4.2.6"
   },
   "travetto": {
     "displayName": "App Scaffold"

package/resources/templates/todo/listing.json

@@ -34,11 +34,6 @@
       "@travetto/auth-web"
     ]
   },
-  "src/web/primary.ts": {
-    "requires": [
-      "@travetto/web"
-    ]
-  },
   "test/model/todo.ts": {
     "requires": [
       "@travetto/model",

package/resources/templates/todo/resources/application.yml

@@ -1,7 +1,7 @@
 # {{#modules.web}}
 web:
-  ssl:
-    active: false
+  http:
+    tls: false
   context:
     active: true
   cors:

package/resources/templates/todo/src/web/auth.ts

@@ -1,4 +1,4 @@
-import { Controller, Get, Post, Redirect, ContextParam } from '@travetto/web';
+import { Controller, Get, Post, WebResponse, ContextParam } from '@travetto/web';
 import { Login, Authenticated, Logout } from '@travetto/auth-web';
 import { Principal } from '@travetto/auth';
 
@@ -15,8 +15,8 @@ export class ApiController {
 
   @Post('/login')
   @Login(BasicAuthSymbol)
-  async getAll(): Promise<Redirect> {
-    return new Redirect('/auth/self', 301);
+  async getAll(): Promise<WebResponse> {
+    return WebResponse.redirect('/auth/self');
   }
 
   @Get('/self')
@@ -27,7 +27,7 @@ export class ApiController {
 
   @Get('/logout')
   @Logout()
-  async logout(): Promise<Redirect> {
-    return new Redirect('/auth/self', 301);
+  async logout(): Promise<WebResponse> {
+    return WebResponse.redirect('/auth/self');
   }
 }

package/support/bin/context.ts

@@ -57,7 +57,6 @@ export class Context {
     const proc = spawn(cmd, args, {
       cwd: this.destination(),
       stdio: [0, 'pipe', 'pipe'],
-      shell: false,
       env: { PATH: process.env.PATH },
     });
 

package/support/bin/features.ts

@@ -25,15 +25,12 @@ export const FEATURES: Feature[] = [
   {
     title: 'Web Framework',
     package: '@travetto/web',
-    choices: [
-      { title: 'Node', package: '@travetto/web-node' },
-      { title: 'AWS Lambda', package: '@travetto/web-aws-lambda' },
-    ],
     addons: [
+      { title: 'Web Node', package: '@travetto/web-node' },
+      { title: 'Web Http Server', package: '@travetto/web-http-server' },
       { title: 'OpenAPI', package: '@travetto/openapi' },
       { title: 'Logging', package: '@travetto/log' }
-    ],
-    default: 'Express.js'
+    ]
   },
   { title: 'Test Framework', package: '@travetto/test' },
   { title: 'ESLint Support', package: '@travetto/eslint' },

package/resources/templates/todo/src/web/primary.ts

@@ -1,10 +0,0 @@
-import { Controller, Get, QueryParam } from '@travetto/web';
-
-@Controller('/')
-export class SimpleController {
-
-  @Get('/')
-  async hello(@QueryParam() name = 'world'): Promise<{ hello: string }> {
-    return { hello: name };
-  }
-}