@jon49/sw 0.12.9 → 0.12.11

package/bin/lib/arguments.ts

@@ -26,6 +26,9 @@ export class Arguments {
     get isProd() {
         return this.environment === "prod"
     }
+    get isServer() {
+        return this.environment === "server"
+    }
 }
 
 export interface Argv {

package/bin/lib/esbuild-plugins.ts

@@ -83,7 +83,7 @@ async function handleHTML(targetDirectory: string) {
 
     let mappableFiles =
         (await Promise.all(
-        (await glob("**/{css,js,images}/*.*", "./src"))
+        (await glob("**/{css,js,images}/**/*.*", "./src"))
         .map(async x => {
             let ext = path.extname(x)
             if (ext === ".ts") {

package/bin/lib/system.ts

@@ -40,7 +40,9 @@ export async function findHashedFile(
 
     let parsed = path.parse(filename)
     for await (const file of Glob(`**/${parsed.dir}/${parsed.name}.*${ext}`, { cwd: targetDirectory })) {
-        return file
+        if (file.startsWith(parsed.dir)) {
+            return file
+        }
     }
 }
 

package/bin/start.ts

@@ -21,6 +21,7 @@ if (argv.isHelp) {
 
 let targetDirectory = argv.targetDirectory
 let isProd = argv.isProd
+let isServer = argv.isServer
 
 console.time("Cleaning")
 await rm(targetDirectory, { recursive: true, force: true })
@@ -143,8 +144,9 @@ if (isProd) {
     let contexts = await Promise.all(configs.map(x => esbuild.context(x)))
     for (let i = 0; i < contexts.length; i++) {
         let ctx = contexts[i]
-        if (i === 0) {
+        if (i === 0 && !isServer) {
             ctx.serve({ port: argv.port, servedir: targetDirectory, host: "localhost" })
+            console.log(`###### Serving on http://localhost:${argv.port} ######`)
         } else {
             ctx.watch()
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jon49/sw",
-  "version": "0.12.9",
+  "version": "0.12.11",
   "description": "Packages for MVC service workers.",
   "type": "module",
   "files": [

package/lib/arguments.ts

@@ -1,46 +0,0 @@
-import argvGenerator from "minimist"
-
-export class Arguments {
-    argv: Argv
-    constructor() {
-        this.argv = argvGenerator(process.argv.slice(2)) as Argv
-    }
-    get _() {
-        return this.argv._
-    }
-    get environment() {
-        return this.argv.e || this.argv.env || "dev"
-    }
-    get port() {
-        return this.argv.p || this.argv.port || 3000
-    }
-    get targetDirectory() {
-        return this.argv.t || this.argv.target || "./public"
-    }
-    get help() {
-        return this.argv.h || this.argv.help
-    }
-    get isHelp() {
-        return this.help
-    }
-    get isProd() {
-        return this.environment === "prod"
-    }
-}
-
-export interface Argv {
-    _: string[]
-    // Environment
-    e: "dev" | "server" | "prod"
-    env: "dev" | "server" | "prod"
-    // Port
-    p: number
-    port: number
-    // Target directory
-    t: string
-    target: string
-    // Help
-    h: boolean
-    help: boolean
-}
-