Restructure templates

templates/http-js/content/.npmrc

@@ -0,0 +1 @@
+KNITWIT_SOURCE=./config/knitwit.json

templates/http-js/content/package.json

@@ -4,19 +4,20 @@
     "description": "{{project-description}}",
     "main": "index.js",
     "scripts": {
-        "build": "npx webpack --mode=production && npx mkdirp target && npx j2w -i dist.js -d combined-wit -n combined -o target/{{project-name | kebab_case}}.wasm {% if enable-aot == 'y' or enable-aot == 'Y' %}--aot{% endif %}",
+        "build": "npx webpack --mode=production && npx mkdirp dist && npx j2w -i build/bundle.js -d build/wit/knitwit -n combined -o dist/{{project-name | kebab_case}}.wasm",
         "test": "echo \"Error: no test specified\" && exit 1",
-        "postinstall": "knitwit"
+        "postinstall": "knitwit --out-dir build/wit/knitwit --out-world combined"
     },
     "keywords": [],
     "author": "",
     "license": "ISC",
     "devDependencies": {
         "mkdirp": "^3.0.1",
         "webpack": "^5.74.0",
-        "webpack-cli": "^4.10.0"
+        "webpack-cli": "^4.10.0",
+        "@fermyon/knitwit": "0.3.0"
     },
     "dependencies": {
-        "@fermyon/spin-sdk": "^2.3.0"
+        "@fermyon/spin-sdk": "^2.4.0"
     }
 }

templates/http-js/content/spin.toml

@@ -11,8 +11,8 @@ route = "{{http-path}}"
 component = "{{project-name | kebab_case}}"
 
 [component.{{project-name | kebab_case}}]
-source = "target/{{project-name | kebab_case}}.wasm"
+source = "dist/{{project-name | kebab_case}}.wasm"
 exclude_files = ["**/node_modules"]
 [component.{{project-name | kebab_case}}.build]
-command = "npm run build"
+command = "npm install && npm run build"
 watch = ["src/**/*.ts", "package.json"]

templates/http-js/content/src/index.js

@@ -1,6 +1,19 @@
-import { ResponseBuilder } from "@fermyon/spin-sdk";
+import { ResponseBuilder, Router } from "@fermyon/spin-sdk";
+
+let router = Router();
+// Modify this route or add additional ones to implement the component's API:
+router.get("/hello/:name", (metadata, req, res) => { handleHelloRoute(req, res, metadata.params.name) });
+// Default route that will be called for any routes not handled above:
+router.all("*", (_, req, res) => { notFound(req, res) });
+
+async function handleHelloRoute(req, res, name) {
+    res.send(`hello ${name}`);
+}
+async function notFound(req, res) {
+    res.status(404);
+    res.send("not found");
+}
 
 export async function handler(req, res) {
-    console.log(req);
-    res.send("hello universe");
+    await router.handleRequest(req, res);
 }

templates/http-js/content/webpack.config.js

@@ -7,8 +7,8 @@ module.exports = {
         outputModule: true,
     },
     output: {
-        path: path.resolve(__dirname, './'),
-        filename: 'dist.js',
+        path: path.resolve(__dirname, './build'),
+        filename: 'bundle.js',
         module: true,
         library: {
             type: "module",

templates/http-js/metadata/snippets/component.txt

@@ -3,9 +3,9 @@ route = "{{http-path}}"
 component = "{{project-name | kebab_case}}"
 
 [component.{{project-name | kebab_case}}]
-source = "{{ output-path }}/target/{{project-name | kebab_case}}.wasm"
+source = "{{ output-path }}/dist/{{project-name | kebab_case}}.wasm"
 allowed_outbound_hosts = []
 
 [component.{{project-name | kebab_case}}.build]
-command = "npm run build"
+command = "npm install && npm run build"
 workdir = "{{ output-path }}"

templates/http-js/metadata/spin-template.toml

@@ -10,4 +10,3 @@ component = "component.txt"
 [parameters]
 project-description = { type = "string", prompt = "Description", default = "" }
 http-path = { type = "string", prompt = "HTTP path", default = "/...", pattern = "^/\\S*$" }
-enable-aot = { type = "string", prompt = "Enable AoT Compilation [y/N]", default = "N", pattern = "^[yYnN]$" }

templates/http-ts/content/.npmrc

@@ -0,0 +1 @@
+KNITWIT_SOURCE=./config/knitwit.json

templates/http-ts/content/package.json

@@ -4,9 +4,9 @@
     "description": "{{project-description}}",
     "main": "index.js",
     "scripts": {
-        "build": "npx webpack --mode=production && npx mkdirp target && npx j2w -i dist.js -d combined-wit -n combined -o target/{{ project-name | kebab_case }}.wasm {% if enable-aot == 'y' or enable-aot == 'Y' %}--aot{% endif %}",
+        "build": "npx webpack --mode=production && npx mkdirp dist && npx j2w -i build/bundle.js -d build/wit/knitwit -n combined -o dist/{{ project-name | kebab_case }}.wasm",
         "test": "echo \"Error: no test specified\" && exit 1",
-        "postinstall": "knitwit"
+        "postinstall": "knitwit --out-dir build/wit/knitwit --out-world combined"
     },
     "keywords": [],
     "author": "",
@@ -16,9 +16,10 @@
         "ts-loader": "^9.4.1",
         "typescript": "^4.8.4",
         "webpack": "^5.74.0",
-        "webpack-cli": "^4.10.0"
+        "webpack-cli": "^4.10.0",
+        "@fermyon/knitwit": "0.3.0"
     },
     "dependencies": {
-        "@fermyon/spin-sdk": "^2.3.0"
+        "@fermyon/spin-sdk": "^2.4.0"
     }
 }

templates/http-ts/content/spin.toml

@@ -11,8 +11,8 @@ route = "{{http-path}}"
 component = "{{project-name | kebab_case}}"
 
 [component.{{project-name | kebab_case}}]
-source = "target/{{project-name | kebab_case}}.wasm"
+source = "dist/{{project-name | kebab_case}}.wasm"
 exclude_files = ["**/node_modules"]
 [component.{{project-name | kebab_case}}.build]
-command = "npm run build"
+command = "npm install && npm run build"
 watch = ["src/**/*.ts", "package.json"]

templates/http-ts/content/src/index.ts

@@ -1,6 +1,19 @@
-import { ResponseBuilder } from "@fermyon/spin-sdk";
+import { ResponseBuilder, Router } from "@fermyon/spin-sdk";
+
+let router = Router();
+// Modify this route or add additional ones to implement the component's API:
+router.get("/hello/:name", (metadata, req, res) => { handleHelloRoute(req, res, metadata.params.name) });
+// Default route that will be called for any routes not handled above:
+router.all("*", (_, req, res) => { notFound(req, res) });
+
+async function handleHelloRoute(req: Request, res: ResponseBuilder, name: string) {
+    res.send(`hello ${name}`);
+}
+async function notFound(req: Request, res: ResponseBuilder) {
+    res.status(404);
+    res.send("not found");
+}
 
 export async function handler(req: Request, res: ResponseBuilder) {
-    console.log(req);
-    res.send("hello universe");
+    await router.handleRequest(req, res);
 }

templates/http-ts/content/webpack.config.js

@@ -19,8 +19,8 @@ module.exports = {
         extensions: ['.tsx', '.ts', '.js'],
     },
     output: {
-        path: path.resolve(__dirname, './'),
-        filename: 'dist.js',
+        path: path.resolve(__dirname, './build'),
+        filename: 'bundle.js',
         module: true,
         library: {
             type: "module",

templates/http-ts/metadata/snippets/component.txt

@@ -3,9 +3,9 @@ route = "{{http-path}}"
 component = "{{project-name | kebab_case}}"
 
 [component.{{project-name | kebab_case}}]
-source = "{{ output-path }}/target/{{project-name | kebab_case}}.wasm"
+source = "{{ output-path }}/dist/{{project-name | kebab_case}}.wasm"
 allowed_outbound_hosts = []
 
 [component.{{project-name | kebab_case}}.build]
-command = "npm run build"
+command = "npm install && npm run build"
 workdir = "{{ output-path }}"

templates/http-ts/metadata/spin-template.toml

@@ -10,4 +10,3 @@ component = "component.txt"
 [parameters]
 project-description = { type = "string", prompt = "Description", default = "" }
 http-path = { type = "string", prompt = "HTTP path", default = "/...", pattern = "^/\\S*$" }
-enable-aot = { type = "string", prompt = "Enable AoT Compilation [y/N]", default = "N", pattern = "^[yYnN]$" }

templates/redis-js/content/.npmrc

@@ -0,0 +1 @@
+KNITWIT_SOURCE=./config/knitwit.json

templates/redis-js/content/package.json

@@ -4,19 +4,20 @@
     "description": "{{project-description}}",
     "main": "index.js",
     "scripts": {
-        "build": "npx webpack --mode=production && npx mkdirp target && npx j2w -i dist.js -d combined-wit -n combined -o target/{{project-name | kebab_case}}.wasm {% if enable-aot == 'y' or enable-aot == 'Y' %}--aot{% endif %}",
+        "build": "npx webpack --mode=production && npx mkdirp dist && npx j2w -i build/bundle.js -d build/wit/knitwit -n combined -o dist/{{project-name | kebab_case}}.wasm",
         "test": "echo \"Error: no test specified\" && exit 1",
-        "postinstall": "knitwit"
+        "postinstall": "knitwit --out-dir build/wit/knitwit --out-world combined"
     },
     "keywords": [],
     "author": "",
     "license": "ISC",
     "devDependencies": {
         "mkdirp": "^3.0.1",
         "webpack": "^5.74.0",
-        "webpack-cli": "^4.10.0"
+        "webpack-cli": "^4.10.0",
+        "@fermyon/knitwit": "0.3.0"
     },
     "dependencies": {
-        "@fermyon/spin-sdk": "^2.3.0"
+        "@fermyon/spin-sdk": "^2.4.0"
     }
 }

templates/redis-js/content/spin.toml

@@ -14,8 +14,8 @@ channel = "{{redis-channel}}"
 component = "{{project-name | kebab_case}}"
 
 [component.{{project-name | kebab_case}}]
-source = "target/{{project-name | kebab_case}}.wasm"
+source = "dist/{{project-name | kebab_case}}.wasm"
 exclude_files = ["**/node_modules"]
 [component.{{project-name | kebab_case}}.build]
-command = "npm run build"
+command = "npm install && npm run build"
 watch = ["src/**/*.ts", "package.json"]

templates/redis-js/content/webpack.config.js

@@ -7,8 +7,8 @@ module.exports = {
         outputModule: true,
     },
     output: {
-        path: path.resolve(__dirname, './'),
-        filename: 'dist.js',
+        path: path.resolve(__dirname, './build'),
+        filename: 'bundle.js',
         module: true,
         library: {
             type: "module",

templates/redis-js/metadata/snippets/component.txt

@@ -3,8 +3,8 @@ channel = "{{redis-channel}}"
 component = "{{project-name | kebab_case}}"
 
 [component.{{project-name | kebab_case}}]
-source = "{{ output-path }}/target/{{project-name | kebab_case}}.wasm"
+source = "{{ output-path }}/dist/{{project-name | kebab_case}}.wasm"
 allowed_outbound_hosts = []
 [component.{{project-name | kebab_case}}.build]
-command = "npm run build"
+command = "npm install && npm run build"
 workdir = "{{ output-path }}"

templates/redis-js/metadata/spin-template.toml

@@ -17,4 +17,3 @@ skip_snippets = ["application_trigger"]
 project-description = { type = "string", prompt = "Description", default = "" }
 redis-address = { type = "string", prompt = "Redis address", default = "redis://localhost:6379" }
 redis-channel = { type = "string", prompt = "Redis channel" }
-enable-aot = { type = "string", prompt = "Enable AoT Compilation [y/N]", default = "N", pattern = "^[yYnN]$" }

templates/redis-ts/content/.npmrc

@@ -0,0 +1 @@
+KNITWIT_SOURCE=./config/knitwit.json

templates/redis-ts/content/package.json

@@ -4,9 +4,9 @@
     "description": "{{project-description}}",
     "main": "index.js",
     "scripts": {
-        "build": "npx webpack --mode=production && npx mkdirp target && npx j2w -i dist.js -d combined-wit -n combined -o target/{{project-name | kebab_case}}.wasm {% if enable-aot == 'y' or enable-aot == 'Y' %}--aot{% endif %}",
+        "build": "npx webpack --mode=production && npx mkdirp dist && npx j2w -i build/bundle.js -d build/wit/knitwit -n combined -o dist/{{project-name | kebab_case}}.wasm",
         "test": "echo \"Error: no test specified\" && exit 1",
-        "postinstall": "knitwit"
+        "postinstall": "knitwit  --out-dir build/wit/knitwit --out-world combined"
     },
     "keywords": [],
     "author": "",
@@ -16,9 +16,10 @@
         "ts-loader": "^9.4.1",
         "typescript": "^4.8.4",
         "webpack": "^5.74.0",
-        "webpack-cli": "^4.10.0"
+        "webpack-cli": "^4.10.0",
+        "@fermyon/knitwit": "0.3.0"
     },
     "dependencies": {
-        "@fermyon/spin-sdk": "^2.3.0"
+        "@fermyon/spin-sdk": "^2.4.0"
     }
 }

templates/redis-ts/content/spin.toml

@@ -14,8 +14,8 @@ channel = "{{redis-channel}}"
 component = "{{project-name | kebab_case}}"
 
 [component.{{project-name | kebab_case}}]
-source = "target/{{project-name | kebab_case}}.wasm"
+source = "dist/{{project-name | kebab_case}}.wasm"
 exclude_files = ["**/node_modules"]
 [component.{{project-name | kebab_case}}.build]
-command = "npm run build"
+command = "npm install && npm run build"
 watch = ["src/**/*.ts", "package.json"]

templates/redis-ts/content/webpack.config.js

@@ -19,8 +19,8 @@ module.exports = {
         extensions: ['.tsx', '.ts', '.js'],
     },
     output: {
-        path: path.resolve(__dirname, './'),
-        filename: 'dist.js',
+        path: path.resolve(__dirname, './build'),
+        filename: 'bundle.js',
         module: true,
         library: {
             type: "module",

templates/redis-ts/metadata/snippets/component.txt

@@ -3,8 +3,8 @@ channel = "{{redis-channel}}"
 component = "{{project-name | kebab_case}}"
 
 [component.{{project-name | kebab_case}}]
-source = "{{ output-path }}/target/{{project-name | kebab_case}}.wasm"
+source = "{{ output-path }}/dist/{{project-name | kebab_case}}.wasm"
 allowed_outbound_hosts = []
 [component.{{project-name | kebab_case}}.build]
-command = "npm run build"
+command = "npm install && npm run build"
 workdir = "{{ output-path }}"

templates/redis-ts/metadata/spin-template.toml

@@ -17,4 +17,3 @@ skip_snippets = ["application_trigger"]
 project-description = { type = "string", prompt = "Description", default = "" }
 redis-address = { type = "string", prompt = "Redis address", default = "redis://localhost:6379" }
 redis-channel = { type = "string", prompt = "Redis channel" }
-enable-aot = { type = "string", prompt = "Enable AoT Compilation [y/N]", default = "N", pattern = "^[yYnN]$" }