update

Author: bichikim

apps/bplan-client/src/routes/(main-layout)/preset/[id].tsx

@@ -1,13 +1,17 @@
-import {createAsync, query, useParams} from '@solidjs/router'
-// import {createResource} from 'solid-js'
+import {createResource} from 'solid-js'
+import {MusicInfo} from 'src/components/midi-player'
 import {default as HomePage} from 'src/routes/(main-layout)/(home)'
 
 const getSelfUrl = () => {
   return import.meta.env.VITE_API_URL ?? 'http://localhost:3000'
 }
 
-const getPreset = query(async (id?: string) => {
-  'use server'
+interface Data {
+  musics: MusicInfo[]
+  title: string
+}
+const getPreset = async (id?: string): Promise<Data | undefined> => {
+  // 'use server'
 
   if (!id) {
     return
@@ -20,11 +24,14 @@ const getPreset = query(async (id?: string) => {
 
     return {musics: [], title: 'Unknown'}
   })
-}, 'preset')
+}
 
 export default function PresetPage() {
-  const params = useParams()
-  const preset = createAsync(() => getPreset(params.id))
+  // const params = useParams()
+  // solidjs/router query send empty page time to time
+  // do not use createAsync because it create a template and it does not work
+  // createResource also make the template and it does not work
+  const [preset] = createResource(() => getPreset())
   // const preset = () => ({musics: [], title: 'Unknown'})
 
   return <HomePage presetTitle={preset()?.title} initMusics={preset()?.musics} />

apps/bplan-client/vite.config.timestamp_1736947488807.mjs

@@ -0,0 +1,94 @@
+// vite.config.mts
+import { defineConfig } from "@solidjs/start/config";
+import { fileURLToPath, URL } from "node:url";
+import * as path from "node:path";
+import { generateSW } from "@winter-love/sw";
+import unoCss from "unocss/vite";
+import * as nodeFs from "node:fs";
+import legacy from "@vitejs/plugin-legacy";
+import { targets } from "@winter-love/vite-lib-config";
+var fixNitroFunction = async () => {
+  const source = process.env.VERCEL === "1" ? path.resolve(".vercel/output/functions/__nitro.func/chunks/nitro/nitro.mjs") : path.resolve(".output/server/chunks/nitro/nitro.mjs");
+  const scriptJs = await nodeFs.promises.readFile(source, "utf8");
+  await nodeFs.promises.writeFile(
+    source,
+    scriptJs.replace(
+      `
+function getDefaultExportFromNamespaceIfNotNamed (n) {
+	return n && Object.prototype.hasOwnProperty.call(n, 'default') && Object.keys(n).length === 1 ? n['default'] : n;
+}`,
+      `
+// hot fixed
+function getDefaultExportFromNamespaceIfNotNamed (n) {
+	return n && Object.prototype.hasOwnProperty.call(n, 'default') && (Object.keys(n).length === 1 || (Object.prototype.hasOwnProperty.call(n, '__esModule') && Object.keys(n).length === 2) ) ? n['default'] : n;
+}`
+    ),
+    "utf8"
+  );
+};
+var fixSw = async () => {
+  return nodeFs.promises.rm(path.resolve("public/sw.js"));
+};
+var hotfix = async () => {
+  await fixNitroFunction();
+  await fixSw();
+};
+var createGenerateSwPlugin = () => {
+  let _config;
+  return {
+    async closeBundle() {
+      if (!_config) {
+        return;
+      }
+      const { outDir, root } = _config.router;
+      const swOutPath = path.join(root, "public/sw.js");
+      await generateSW(swOutPath, {
+        assets: "_build/assets/**/*",
+        assetsRoot: outDir,
+        cwd: ""
+      });
+    },
+    configResolved(config) {
+      if (config.router.type === "client" && config.mode === "production") {
+        _config = config;
+      }
+    },
+    name: "generate-sw"
+  };
+};
+var vite_config_default = defineConfig({
+  server: {
+    hooks: {
+      close: () => {
+        return hotfix();
+      }
+    }
+  },
+  vite: {
+    // build: {
+    //   minify: false,
+    // },
+    plugins: [
+      //
+      unoCss("../../uno.config.ts"),
+      createGenerateSwPlugin(),
+      legacy({
+        targets
+      })
+    ],
+    resolve: {
+      alias: {
+        // fix #start/app is app.tsx only @solid/state error
+        "#start/app": fileURLToPath(new URL("src/App.tsx", import.meta.url)),
+        // fix @tonejs/midi is not module js
+        "@tonejs/midi": fileURLToPath(
+          new URL("node_modules/@tonejs/midi/src/Midi.ts", import.meta.url)
+        ),
+        src: fileURLToPath(new URL("src", import.meta.url))
+      }
+    }
+  }
+});
+export {
+  vite_config_default as default
+};

packages/sw/src/sw.ts

@@ -14,9 +14,12 @@ const isOriginPath = (url: string) =>
 
 const isApiPath = (url: string) => url.startsWith(apiPath)
 
-const createNetworkFirst = async (event: FetchEvent) => {
+const createNetworkFirst = async (event: FetchEvent, cache: RequestCache = 'default') => {
+  const headers = new Headers()
+  headers.append('cache-control', cache)
+  headers.append('pragma', cache)
   try {
-    const response = await fetch(event.request)
+    const response = await fetch(event.request, {headers})
     const cache = await caches.open(CACHE_NAME)
     await cache.put(event.request, response.clone())
 
@@ -90,12 +93,16 @@ self.addEventListener('fetch', (event: FetchEvent) => {
     return
   }
 
+  const destination: RequestDestination[] = [
+    'style',
+    'script',
+    'worker',
+    'manifest',
+    'document',
+  ]
+
   // Use network request for document navigation, otherwise use cache request
-  if (
-    ['document', 'style', 'script', 'worker', 'manifest'].includes(
-      event.request.destination,
-    )
-  ) {
+  if (destination.includes(event.request.destination)) {
     event.respondWith(createNetworkFirst(event))
 
     return