@tremho/mist-lift 2.4.0 → 2.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tremho/mist-lift",
-  "version": "2.4.0",
+  "version": "2.5.1",
   "description": "lift command line utility for MistLift development",
   "main": "build/lift.js",
   "bin": {
@@ -20,7 +20,7 @@
     "indev:nix": "echo nix",
     "indev:windows": "echo windows",
     "postbuild": "run-script-os",
-    "postbuild:nix": "cp -r src/commands/builtin/prebuilt-zips build/commands/builtin",
+    "postbuild:nix": "cp -r src/commands/builtin/prebuilt-zips build/commands/builtin && chmod +x build/src/lift.js",
     "postbuild:windows": "robocopy src/commands/builtin/prebuilt-zips build/commands/builtin/prebuilt-zips /e > NUL 2>&1"
   },
   "files": [
@@ -74,7 +74,6 @@
     "@types/node": "^20.14.2",
     "@types/tap": "^15.0.11",
     "@types/ws": "^8.5.10",
-    "axios": "^1.7.2",
     "rimraf": "^5.0.7",
     "run-script-os": "^1.1.6",
     "tap": "^19.2.5",

package/src/commands/actions/updateDeployedPermissions.ts

@@ -28,7 +28,7 @@ export default async function updateDeployedPermissions (apiId: string): Promise
     return false
   })
 
-  const accountId: string = await getAccountId()
+  const accountId: string = await getAccountId() ?? ''
   const region: string = getSettings().awsPreferredRegion ?? ''
 
   const client = new LambdaClient(getAWSCredentials())

package/src/commands/builtin/ExportWebroot.ts

@@ -63,7 +63,7 @@ let basePath = ''
 /**
  * Exports the webroot according to configuration
  */
-export async function ExportWebroot (): Promise<any> {
+export async function ExportWebroot (): Promise<any> | never {
   const projectPaths = resolvePaths()
   basePath = projectPaths.basePath
   const webrootConfig = readWebrootConfig(path.join(basePath, 'webrootConfig.json'))
@@ -81,7 +81,7 @@ export async function ExportWebroot (): Promise<any> {
       await exportScript(fla, webrootConfig.options as WebrootScriptOptions)
       break
     default: {
-      throw new Error(`UNSUPPORTED WEBROOT EXPORT ${WebrootExportType[webrootConfig.type]}`)
+      throw new Error('UNSUPPORTED WEBROOT EXPORT TYPE (must be SELF, S3, or SCRIPT)')
     }
   }
 }
@@ -105,7 +105,7 @@ export async function getWebrootSettings (): Promise<{ webrootMethod: string, we
       break
     }
     default: {
-      const unreachable: never = webrootConfig.type
+      const unreachable: string = webrootConfig.type ?? '<none?'
       throw new Error(`UNSUPPORTED WEBROOT EXPORT ${unreachable}`)
     }
   }
@@ -144,7 +144,7 @@ async function exportSelf (): Promise<void> {
   await DeployRootFileserves()
 }
 
-async function exportScript (fla: string[], options: WebrootScriptOptions) {
+async function exportScript (fla: string[], options: WebrootScriptOptions): Promise<void> {
   // console.log(">> exportScript")
   // console.log("  >> DeployWebrootBuiltIn")
   // await DeployWebrootBuiltIn(true)
@@ -175,7 +175,7 @@ async function getUpdatedExportFileList (): Promise<string[]> {
   // enumerate at webroot and files from all non-root directories
   const folder = path.join(basePath, 'webroot')
   const rootpathsteps = folder.split(path.sep).length
-  const enumerating = true
+  // const enumerating = true
 
   function gatherFiles (filepath: string, stats: fs.Stats): boolean {
     // console.log(filepath, {steps:filepath.split(path.sep).length, rootpathsteps, isDir:stats.isDirectory()})

package/src/commands/builtin/webroot-export/s3webroot.ts

@@ -1,3 +1,5 @@
+/* eslint-disable */
+
 import { S3Client } from '@aws-sdk/client-s3'
 import { s3ListObjects, s3CreateBucket, s3UploadFile, s3Delete, S3ActionsLog } from '@tremho/basic-s3-actions'
 import * as fs from 'fs'
@@ -76,3 +78,5 @@ export function getS3Prefix () {
   const name = determineBucketName()
   return `https://${name}.s3.us-west-1.amazonaws.com/`
 }
+
+/* eslint-enable */

package/src/commands/help.ts

@@ -74,10 +74,12 @@ function helpHelp (): void {
 }
 export function helpInit (): void {
   printBanner('init')
-  console.log('use ' + ac.bold('lift init .') + ' from within a directory to init the current directory as a MistLift project')
-  console.log('use ' + ac.bold('lift init ' + ac.grey.dim('projectPath')) + ' to create a new directory at ' +
+  console.log('use ' + ac.bold('lift init ' + ac.grey.dim('projectPath') + ac.grey.dim('[, clientType]')) + ac.grey.italic(' where clientType is one of "js" or "react", default=js') +
+       ' to create a new directory at ' +
     ac.grey.dim('projectPath') + ' if it does not exist and init a MistLift project in that directory, if not already initialized')
   console.log('')
+  console.log('Paths are relative. Use ' + ac.bold('.') + ' to init the current directory')
+
   console.log('This will begin an interactive session where you will be asked questions about the project you are creating.')
   console.log('The project will be complete and ready to run right away.')
   console.log('You can then modify the application to your needs.')

package/src/commands/init.ts

@@ -22,12 +22,18 @@ import { addPackageScripts, installPackage, installDevPackage } from './actions/
 
 export async function doInit (
   folder?: string,
+  clientType?: string,
   defaults?: boolean
 ): Promise<void> {
   if (folder === undefined || folder === '') {
     helpInit()
     return
   }
+  if (clientType?.length === 0) clientType = 'js'
+  if (clientType?.toLowerCase() !== 'react' && clientType?.toLowerCase() !== 'js') {
+    helpInit()
+    return
+  }
   const cwd = process.cwd()
   const refPath = path.isAbsolute(folder) ? path.normalize(folder) : path.normalize(path.join(cwd, folder))
   if (!fs.existsSync(refPath)) {
@@ -62,14 +68,51 @@ export async function doInit (
     fs.copyFileSync(path.join(webrootSrcDir, 'app.css'), path.join(webroot, 'app.css'))
     fs.copyFileSync(path.join(webrootSrcDir, 'watcher.js'), path.join(webroot, 'watcher.js'))
 
-    fs.copyFileSync(path.join(swaggerSrcDir, 'localServerConfig.json'), path.join(refPath, 'localServerConfig.json'))
+    localConfig(clientType, refPath)
+
+    if (clientType === 'react') {
+      const appPath = path.join(refPath, 'app')
+      const appSrc = path.join(swaggerSrcDir, 'app')
+      if (!fs.existsSync(appPath)) {
+        fs.mkdirSync(appPath)
+        fs.copyFileSync(path.join(appSrc, 'app.tsx'), path.join(appPath, 'app.tsx'))
+        fs.copyFileSync(path.join(appSrc, 'MainPage.tsx'), path.join(appPath, 'MainPage.tsx'))
+      }
+    }
+
+    await interrogateUserForPackageJsonSettings(refPath, defaults)
+    await addPackageScripts(refPath)
+    if (clientType === 'react') {
+      await installPackage(refPath, 'react')
+      await installPackage(refPath, 'react-dom')
+      await installPackage(refPath, 'react-router-dom')
+      await installDevPackage(refPath, '@types/react')
+    }
+    await installDevPackage(refPath, '@types/node')
+    await installDevPackage(refPath, 'typescript')
+    await installDevPackage(refPath, 'tap')
+    await installDevPackage(refPath, '@tremho/tap-assert')
+    await installPackage(refPath, '@tremho/inverse-y')
   }
 
-  await interrogateUserForPackageJsonSettings(refPath, defaults)
-  await addPackageScripts(refPath)
-  await installDevPackage(refPath, '@types/node')
-  await installDevPackage(refPath, 'typescript')
-  await installDevPackage(refPath, 'tap')
-  await installDevPackage(refPath, '@tremho/tap-assert')
-  await installPackage(refPath, '@tremho/inverse-y')
+  function localConfig (clientType: string, refpath: string): void {
+    const config: any = {
+      port: 8081,
+      rebuildFunctionsOnChange: false,
+      refreshBrowserOnFunctionChange: false,
+      refreshBrowserOnWebrootChange: false
+    }
+    if (clientType === 'react') {
+      config.esbuild = {
+        watch: false,
+        entryPoints: [
+          'app/app.tsx'
+        ],
+        outdir: 'webroot'
+      }
+    }
+
+    const content = JSON.stringify(config, null, 2)
+    fs.writeFileSync(path.join(refpath, 'localServerConfig.json'), content)
+  }
 }

package/src/commands/package.ts

@@ -169,7 +169,9 @@ async function packageFunction (funcName: string): Promise<number> {
       }
       const publishUrl = pubInfo.url ?? '/'
 
-      const stage = publishUrl.substring(publishUrl.lastIndexOf('/') + 1)
+      /* eslint-disable */
+      const stage = publishUrl.substring(publishUrl.lastIndexOf('/')) + 1
+      /* eslint-enable */
       setWebroot(webrootExport.webrootMethod, webrootExport.webrootBaseUrl)
       setAws(stage, publishUrl)
       // console.log("getServiceSettings", getServiceSettings())

package/src/commands/publish.ts

@@ -25,7 +25,7 @@ import { resolvePaths } from '../lib/pathResolve'
 import { gatherFunctionDefinitions } from '../lib/openAPI/ApiBuildCollector'
 import { delay } from '../lib/utils'
 import { addBuiltInDefinitions, MakeBuiltinApiDoc } from './builtin/ApiDocMaker'
-import { DeployApiBuiltin, DeployRootFileserves, DeployWebrootBuiltIn } from './builtin/BuiltInHandler'
+import { DeployApiBuiltin /*, DeployRootFileserves, DeployWebrootBuiltIn */ } from './builtin/BuiltInHandler'
 import { esbuilder } from '../lib/ESBuild'
 import { getIdSrc, getIdDelimiter } from '../lib/IdSrc'
 import { ExportWebroot, getWebrootSettings } from './builtin/ExportWebroot'
@@ -35,9 +35,9 @@ import updateDeployedPermissions from './actions/updateDeployedPermissions'
 let projectPaths: any
 
 export async function doPublishAsync (args: string[] = []): Promise<number> {
-  const stageName = 'Dev'
-  const retCode = await doDeployAsync(args)
-  if (retCode) return retCode
+  const stageName: string = 'Dev'
+  const retCode: number | undefined = await doDeployAsync(args)
+  if (retCode !== undefined) return retCode
   // const retCode = 0
 
   projectPaths = resolvePaths()

package/src/expressRoutes/functionBinder.ts

@@ -7,7 +7,7 @@ import { resolvePaths } from '../lib/pathResolve'
 import express from 'express'
 import { gatherFunctionDefinitions } from '../lib/openAPI/ApiBuildCollector'
 import { buildOpenApi } from '../lib/openAPI/openApiConstruction'
-import { BadRequest, Log } from '@tremho/inverse-y'
+import { Log } from '@tremho/inverse-y'
 import { parseConstraints } from '../lib/TypeCheck'
 
 const clearModule = require('clear-module')
@@ -46,14 +46,16 @@ export function functionBinder (): void {
         if (n !== -1) entryRoot = entryRoot.substring(0, n) + '/*'
 
         const callHandler = (def: any, req: any, res: any): void => {
-          console.log('>>>>>>> YES WE ARE HERE<<<<<<<<<')
+          // console.log('>>>>>>> YES WE ARE HERE<<<<<<<<<')
           if (Buffer.isBuffer(req.body)) {
             const buffer: Buffer = req.body
+            /* eslint-disable */
             console.log('body is a buffer at callHandler. Length is ' + buffer.byteLength)
             console.log('First 16 bytes:', buffer.subarray(0, 16).toString('hex'))
+            /* eslint-enable */
           }
           const message = testPathRoute(def, req)
-          if (message) {
+          if (message !== '') {
             return handleResponse(res, { statusCode: 403, body: { error: message } })
           }
           const event = requestToEvent(def, req)
@@ -91,11 +93,11 @@ export function functionBinder (): void {
 }
 
 // compare request route to the definition of this function to see if it matches
-function testPathRoute (def: any, req: any) {
+function testPathRoute (def: any, req: any): string {
   let path = req.path
   let pathMap = def.pathMap
-  if (path.endsWith('/')) path = path.substring(0, path.length - 1)
-  if (pathMap.endsWith('/')) pathMap = pathMap.substring(0, path.length - 1)
+  if (path.endsWith('/') === true) path = path.substring(0, path.length - 1)
+  if (pathMap.endsWith('/') === true) pathMap = pathMap.substring(0, path.length - 1)
   const defParts = pathMap.split('/')
   const pathParts = path.split('/')
 
@@ -109,7 +111,7 @@ function testPathRoute (def: any, req: any) {
   return message
 }
 
-function performParameterTesting (def: any, event: any) {
+function performParameterTesting (def: any, event: any): void {
   // for every parameter defined in def
   // find the corresponding value in event.parameters (by name)
   // find the constraints for that parameter in def
@@ -118,7 +120,7 @@ function performParameterTesting (def: any, event: any) {
     const constraints = Array.isArray(pdef.constraints) ? parseConstraints(pdef.type, pdef.constraints.join('\n'), '\n') : undefined
     let value: any = event.parameters[pdef.name]
     if (value === undefined) {
-      if (!pdef.required) return // okay to be undefined
+      if (pdef.required !== true) return // okay to be undefined
     }
     if (pdef.type === 'number') value = Number(value) // TODO: Type coercion for all types
     constraints?.test(value)
@@ -126,13 +128,13 @@ function performParameterTesting (def: any, event: any) {
 }
 
 // returns 'text', 'json', or undefined
-function bodyTypeCollapse (type: string) {
+function bodyTypeCollapse (type: string): string | undefined {
   const options: any = {
     text: 'text',
     json: 'json',
     'application/json': 'json'
   }
-  if (type) {
+  if (type !== '') {
     type = type.toLowerCase().trim()
     if (type.substring(0, 5) === 'text/') return 'text'
     return options[type]
@@ -189,11 +191,13 @@ function requestToEvent (def: any, req: any): any {
       req.body = Buffer.from(req.body)
     }
   }
+  /* eslint-disable */
   if (Buffer.isBuffer(req.body)) {
     const buffer: Buffer = req.body
     console.log('body is buffer eventToRequest, Length = ' + buffer.byteLength)
     console.log('First 16 bytes:', buffer.subarray(0, 16).toString('hex'))
   }
+  /* eslint-enable */
   const template = def.pathMap
 
   // unpack weird choice of express when passed from curl.

package/src/integration-tests/quickstart-scenario.test.ts

@@ -23,7 +23,7 @@ async function test (t: any): Promise<void> {
     fs.rmSync('QSTest', { recursive: true })
   }
   // init
-  await doInit('QSTest', true)
+  await doInit('QSTest', '', true)
 
   // verify project got made
   assert.isTrue(fs.existsSync('QSTest'), 'created test project')

package/src/lib/IdSrc.ts

@@ -39,9 +39,9 @@ export function decoratedName (name: string): string {
   return dname
 }
 
-export async function getAccountId () {
+export async function getAccountId (): Promise<string | undefined> {
   const client = new STSClient({} as any)
   const command: any = new GetCallerIdentityCommand({})
   const response: any = await client.send(command)
-  return response.Account // This is your AWS account ID
+  return response.Account ?? '' // This is your AWS account ID
 }

package/src/lib/TypeCheck.ts

@@ -2,6 +2,7 @@
 Module for Constraint definitions and TypeCheck support
  */
 
+/* eslint-disable */ // too screwed up.  This file originated in an old JS project and was converted to TS quickly. TS-Standard is too restrictive for the style.
 /**
  * Enumeration of basic types
  *
@@ -1166,3 +1167,5 @@ export function validate (
   }
   return ok
 }
+
+/* eslint-enable */

package/src/lib/openAPI/openApiConstruction.ts

@@ -7,8 +7,8 @@ import path from 'path'
 import { resolvePaths } from '../pathResolve'
 import * as ac from 'ansi-colors'
 import { decoratedName, getAccountId } from '../IdSrc'
-import { getAWSCredentials, getSettings } from '../LiftConfig'
-import { parseConstraints, TypeConstraint } from '../TypeCheck'
+import { getSettings } from '../LiftConfig'
+import { parseConstraints } from '../TypeCheck'
 import yaml from 'js-yaml'
 
 export async function buildOpenApi (
@@ -117,14 +117,15 @@ export async function buildOpenApi (
 }
 
 function addTypeSchema (builder: any, schemaName: string, schema: any): void {
-  let primType = ''
-  let type = schema?.type ?? 'Empty'
+  let primType: string = ''
+  let type: string = schema?.type ?? 'Empty'
   if (type === 'empty') type = 'Empty' // fix case
-  const isArray = (type.endsWith('[]'))
+  const isArray: boolean = (type.endsWith('[]'))
   if (isArray) type = type.substring(0, type.length - 2)
   if (type === 'string' || type === 'number' || type === 'object') primType = type
-  const mime = schema?.mime ?? primType ? 'text/plain' : 'application/json'
-  const sref = primType ? { type: primType } : { $ref: '#/components/schemas/' + type }
+  // const sm: string = schema?.mime
+  // const mime: string = sm !== '' ?? primType !== '' ? 'text/plain' : 'application/json'
+  const sref: any = primType !== '' ? { type: primType } : { $ref: '#/components/schemas/' + type }
   let ref: any = {}
   if (isArray) {
     ref = { type: 'array', items: sref }
@@ -139,21 +140,22 @@ function addTypeSchema (builder: any, schemaName: string, schema: any): void {
   const constraints = schema.type !== 'object' && Array.isArray(schema?.constraints) ? parseConstraints(schema.type, schema.constraints.join('\n'), '\n') : undefined
 
   const cdesc = (constraints != null) ? '\n  - ' + (constraints.describe() ?? '').split('\n').join('\n  - ') : ''
-  let description = schema.description
-  if (cdesc) description += cdesc
+  let description: string = schema.description
+  if (cdesc !== '') description += cdesc
 
   ref.description = description
 
   const required: string[] = []
 
-  if (ref.properties) {
-    for (const [propName, propDef] of Object.entries(schema.properties || {})) {
+  if ((ref.properties as boolean)) {
+    const sp: any = schema.properties ?? {}
+    for (const [propName, propDef] of Object.entries(sp)) {
       const pda = propDef as any
       const constraints = Array.isArray(pda?.constraints) ? parseConstraints(pda.type, pda.constraints.join('\n'), '\n') : undefined
 
       const cdesc = (constraints != null) ? '\n  - ' + (constraints.describe() ?? '').split('\n').join('\n  - ') : ''
-      let description = (propDef as any).description
-      if (cdesc) description += cdesc
+      let description: string = (propDef as any).description
+      if (cdesc !== '') description += cdesc
 
       // if(constraints) {
       //   console.log("schema definition for "+schemaName+', prop '+propName)
@@ -169,7 +171,8 @@ function addTypeSchema (builder: any, schemaName: string, schema: any): void {
       ref.properties[propName] = propSchema
 
       // Only mark as required if declared explicitly
-      if (schema.required && schema.required.includes(propName)) {
+      const sr: string = schema.required ?? ''
+      if (sr !== '' && sr.includes(propName)) {
         required.push(propName)
       }
     }
@@ -185,13 +188,14 @@ async function addFunctionMethod (pathDef: any, method: string, def: any, includ
   const retDef: any = (def.returns)['200']
   const content: any = {}
   let primType = ''
-  let type = retDef?.type ?? 'Empty'
+  let type: string = retDef?.type ?? 'Empty'
   if (type === 'empty') type = 'Empty' // fix case
-  const isArray = (type.endsWith('[]'))
+  const isArray: boolean = (type.endsWith('[]'))
   if (isArray) type = type.substring(0, type.length - 2)
   if (type === 'string' || type === 'number' || type === 'object') primType = type
-  const mime = retDef?.mime ?? primType ? 'text/plain' : 'application/json'
-  const ref = primType ? { type: primType } : { $ref: '#/components/schemas/' + type }
+  const rdm: string = retDef?.mime ?? ''
+  const mime: string = rdm !== '' ? rdm : primType !== '' ? 'text/plain' : 'application/json'
+  const ref: any = primType !== '' ? { type: primType } : { $ref: '#/components/schemas/' + type }
   let schema: any
   if (isArray) {
     schema = { type: 'array', items: ref }
@@ -202,11 +206,12 @@ async function addFunctionMethod (pathDef: any, method: string, def: any, includ
     schema
   }
 
-  const region = getSettings()?.awsPreferredRegion ?? ''
-  const accountId = await getAccountId()
-  const decName = decoratedName(def.name)
+  const region: string = getSettings()?.awsPreferredRegion ?? ''
+  const accountId: string = await getAccountId() ?? ''
+  const decName: string = decoratedName(def.name) ?? ''
 
-  const isBinary = def.bodyType && !def.bodyType.startsWith('text') && !def.bodyType.endsWith('json')
+  const bodyType: string = def.bodyType ?? ''
+  const isBinary: boolean = bodyType.startsWith('text') && bodyType.endsWith('json')
 
   const methData = {
     summary: def.name,
@@ -251,18 +256,18 @@ async function addFunctionMethod (pathDef: any, method: string, def: any, includ
   if (!includeCORS) {
     // get the other response code declarations
     for (const rcode of Object.getOwnPropertyNames(def.returns)) {
-      if (rcode != '200') {
+      if (rcode !== '200') {
         const retDef = def.returns[rcode] ?? {}
 
         const content: any = {}
-        let primType = ''
-        let type = retDef?.type ?? 'Empty'
+        let primType: string = ''
+        let type: string = retDef?.type ?? 'Empty'
         if (type === 'empty') type = 'Empty' // fix case
-        const isArray = (type.endsWith('[]'))
+        const isArray: boolean = (type.endsWith('[]'))
         if (isArray) type = type.substring(0, type.length - 2)
         if (type === 'string' || type === 'number' || type === 'object') primType = type
-        const mime = retDef?.mime ?? primType ? 'text/plain' : 'application/json'
-        const ref = primType ? { type: primType } : { $ref: '#/components/schemas/' + type }
+        const mime: string = retDef?.mime.length > 0 ? primType?.length > 0 ? 'text/plain' : 'application/json' : ''
+        const ref: any = primType !== '' ? { type: primType } : { $ref: '#/components/schemas/' + type }
         let schema: any
         if (isArray) {
           schema = { type: 'array', items: ref }
@@ -347,8 +352,8 @@ function addParameter (pathDef: any, param: any): void {
   const constraints = Array.isArray(param.constraints) ? parseConstraints(param.type, param.constraints.join('\n'), '\n') : undefined
 
   const cdesc = (constraints != null) ? '\n  - ' + (constraints.describe() ?? '').split('\n').join('\n  - ') : ''
-  let description = param.description
-  if (cdesc) description += cdesc
+  let description: string = param.description
+  if (cdesc !== '') description += cdesc
 
   // don't declare parameters marked as 'body'.  OpenAPI doesn't support that.
   if (param.in === 'path' || param.in === 'query') {
@@ -356,7 +361,7 @@ function addParameter (pathDef: any, param: any): void {
       in: param.in,
       name: param.name,
       description,
-      example: example || undefined,
+      example: example ?? undefined,
       required,
       schema: schemaType(deflt, type, true)
     })
@@ -387,6 +392,6 @@ function schemaType (deflt: string | undefined, namedType: string, innerOnly: bo
   }
   if (type === 'int') type = 'integer'
   if (type === 'bool') type = 'boolean'
-  if (!deflt) deflt = undefined
+  if (deflt === null || deflt === '') deflt = undefined
   return innerOnly ? { type, format, example: deflt } : { schema: { type, format, example: deflt } }
 }

package/src/lift.ts

@@ -37,7 +37,7 @@ async function processCommand (): Promise<void> {
       await doDoctor()
       return
     case 'init':
-      return await doInit(args[0] ?? '')
+      return await doInit(args[0] ?? '', args[1]) // folder, clientType (react or js default js)
     case 'create':
       return doCreate(args[0] ?? '')
     case 'build': {

package/templateData/app/MainPage.tsx

@@ -0,0 +1,10 @@
+import React from 'react'
+
+export default function MainPage() {
+    return (
+        <>
+            <h2>Hello MistLift</h2>
+            <p>from the default React app/MainPage.tsx created by MistLift</p>
+        </>
+    )
+}

package/templateData/app/app.tsx

@@ -0,0 +1,39 @@
+import React from 'react'
+import {createRoot} from 'react-dom/client'
+import { BrowserRouter, Route, Routes } from 'react-router-dom'
+
+import MainPage from './MainPage'
+
+let pageComp = <MainPage />
+
+const routes = {
+    home: <MainPage />
+}
+
+// route to the page directed by the ?page= query parameter
+const params = new URLSearchParams(document.location.search)
+// console.log('search params', params)
+let page = params.get("page")?.toLowerCase().trim()
+// console.log('page='+page)
+// if(!page && document.cookie.indexOf("idtbd=") !== -1) {
+//     (IDTBD as any).hasCookie = true
+// }
+pageComp = routes[page] ?? <MainPage />
+
+const container = document.getElementById('root')
+const root = createRoot(container)
+
+root.render(
+    <>
+        <BrowserRouter>
+            <Routes>
+                <Route path = '/index.html' element= {pageComp} />
+                <Route path = '/' element= {pageComp} />
+                <Route path = '/Dev/index.html' element= {pageComp} />
+                <Route path = '/Dev/+' element= {pageComp} />
+                <Route path = '/vod/index.html' element= {pageComp} />
+                <Route path = '/vod/+' element= {pageComp} />
+            </Routes>
+        </BrowserRouter>
+    </>
+)

package/templateData/webroot/app.js

@@ -1,9 +1,9 @@
-/*
-empty template file
+const root = document.getElementById('root')
+const label = document.createElement('H1');
+const message = document.createElement('p');
 
-loaded by template index.html
+label.innerText =  'Hello MistLift'
+message.innerText = "This page content is generated from the default javascript MistLift page in webroot/app.js"
 
-Could be the output of an ESBuild bundle, for example.
-See docs/ESBuild and React support.md
-
- */
+root.appendChild(label);
+root.appendChild(message)

package/build/commands/actions/initQuestions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"initQuestions.js","sourceRoot":"","sources":["../../../src/commands/actions/initQuestions.ts"],"names":[],"mappings":"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"}

package/build/commands/actions/makePackageJson.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"makePackageJson.js","sourceRoot":"","sources":["../../../src/commands/actions/makePackageJson.ts"],"names":[],"mappings":""}

package/build/commands/actions/setupPackageJson.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"setupPackageJson.js","sourceRoot":"","sources":["../../../src/commands/actions/setupPackageJson.ts"],"names":[],"mappings":";AAAA,6CAA6C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE7C,2CAA4B;AAC5B,uCAAwB;AACxB,6DAAyD;AAEzD;;GAEG;AACH,SAAgB,iBAAiB,CAC/B,WAAmB;;IAEnB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAA;IACtD,IAAI,OAAO,GAAQ,EAAE,CAAA;IACrB,IAAI,CAAC;QAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;IAAC,CAAC;IAAC,WAAM,CAAC,CAAA,CAAC;IAC1E,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,MAAM,mCAAI,EAAE,CAAA;IACnC,MAAM,CAAC,IAAI,GAAG,WAAW,CAAA;IACzB,OAAO,CAAC,MAAM,GAAG,MAAM,CAAA;AACzB,CAAC;AATD,8CASC;AACD,SAAsB,cAAc,CAClC,WAAmB,EACnB,WAAmB;;QAEnB,MAAM,IAAA,+BAAc,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,CAAA;IACpE,CAAC;CAAA;AALD,wCAKC;AAED,SAAsB,iBAAiB,CACrC,WAAmB,EACnB,WAAmB;;QAEnB,MAAM,IAAA,+BAAc,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,YAAY,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,CAAA;IAClF,CAAC;CAAA;AALD,8CAKC"}

package/build/commands/actions/updateDeployedPermissions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"updateDeployedPermissions.js","sourceRoot":"","sources":["../../../src/commands/actions/updateDeployedPermissions.ts"],"names":[],"mappings":"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"}

package/build/commands/build.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"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"}