npm - one - Versions diffs - 1.1.495 → 1.1.497 - Mend

one 1.1.495 → 1.1.497

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

package/src/vite/plugins/SSRCSSPlugin.ts CHANGED Viewed

@@ -95,6 +95,8 @@ function invalidateModule(server: ViteDevServer, id: string) {
 // https://github.com/vikejs/vike/blob/f9a91f3c47cab9c2871526ef714cc0f87a41fda0/vike/node/runtime/renderPage/getPageAssets/retrieveAssetsDev.ts
 export async function collectStyle(server: ViteDevServer, entries: string[]) {
+  const { transform } = await import('lightningcss')
   const urls = await collectStyleUrls(server, entries)
   const codes = await Promise.all(
     urls.map(async (url) => {
@@ -103,7 +105,6 @@ export async function collectStyle(server: ViteDevServer, entries: string[]) {
       const prefix = `/* [collectStyle] ${url} */`
       try {
-        const { transform } = await import('lightningcss')
         const buffer = Buffer.from(code)
         const codeOut = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength)
@@ -113,18 +114,6 @@ export async function collectStyle(server: ViteDevServer, entries: string[]) {
           ...server.config.css.lightningcss,
         }).code.toString()
-        if (process.env.ONE_DEBUG_CSS) {
-          console.info(`Got CSS`, processed)
-        }
-        if (process.env.ONE_DEDUPE_CSS) {
-          processed = dedupeCSS(processed)
-        }
-        if (process.env.ONE_DEBUG_CSS) {
-          console.info(`Got CSS after dedupe`, processed)
-        }
         return [prefix, processed]
       } catch (err) {
         console.error(` [one] Error post-processing CSS, leaving un-processed: ${err}`)
@@ -132,7 +121,23 @@ export async function collectStyle(server: ViteDevServer, entries: string[]) {
       }
     })
   )
-  return codes.flat().filter(Boolean).join('\n\n')
+  let out = codes.flat().filter(Boolean).join('\n\n')
+  try {
+    // run once more at the end to de-dupe!
+    const buffer = Buffer.from(out)
+    const codeOut = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength)
+    out = transform({
+      filename: 'code.css',
+      code: codeOut,
+      ...server.config.css.lightningcss,
+    }).code.toString()
+  } catch (err) {
+    console.error(` [one] Error post-processing merged CSS, leaving un-processed`)
+  }
+  return out
 }
 async function collectStyleUrls(server: ViteDevServer, entries: string[]): Promise<string[]> {
@@ -163,17 +168,3 @@ async function collectStyleUrls(server: ViteDevServer, entries: string[]): Promi
 // cf. https://github.com/vitejs/vite/blob/d6bde8b03d433778aaed62afc2be0630c8131908/packages/vite/src/node/constants.ts#L49C23-L50
 const CSS_LANGS_RE = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/
-function dedupeCSS(css: string): string {
-  const lines = css.split('\n')
-  const uniqueLines = new Set<string>()
-  for (const line of lines) {
-    const trimmedLine = line.trim()
-    if (trimmedLine) {
-      uniqueLines.add(trimmedLine)
-    }
-  }
-  return Array.from(uniqueLines).join('\n')
-}

package/src/vite/plugins/fileSystemRouterPlugin.tsx CHANGED Viewed

@@ -32,17 +32,18 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
   function createRequestHandler() {
     const routerRoot = getRouterRootFromOneOptions(options)
-    return createHandleRequest({
-      async handlePage({ route, url, loaderProps }) {
-        console.info(
-          ` ⓵  [${route.type}] ${url} resolved to ${
-            route.isNotFound ? '‼️ 404 not found' : `app/${route.file.slice(2)}`
-          }`
-        )
-        if (route.type === 'spa') {
-          // render just the layouts? route.layouts
-          return `<html><head>
+    return createHandleRequest(
+      {
+        async handlePage({ route, url, loaderProps }) {
+          console.info(
+            ` ⓵  [${route.type}] ${url} resolved to ${
+              route.isNotFound ? '‼️ 404 not found' : `app/${route.file.slice(2)}`
+            }`
+          )
+          if (route.type === 'spa') {
+            // render just the layouts? route.layouts
+            return `<html><head>
             ${getSpaHeaderElements({ serverContext: { mode: 'spa' } })}
             <script type="module">
               import { injectIntoGlobalHook } from "/@react-refresh";
@@ -53,76 +54,76 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
             <script type="module" src="/@vite/client" async=""></script>
             <script type="module" src="/@id/__x00__virtual:one-entry" async=""></script>
           </head></html>`
-        }
-        if (renderPromise) {
-          await renderPromise
-        }
+          }
-        const { promise, resolve } = promiseWithResolvers<void>()
-        renderPromise = promise
+          if (renderPromise) {
+            await renderPromise
+          }
-        try {
-          const routeFile = join(routerRoot, route.file)
-          runner.clearCache()
+          const { promise, resolve } = promiseWithResolvers<void>()
+          renderPromise = promise
-          globalThis['__vxrnresetState']?.()
+          try {
+            const routeFile = join(routerRoot, route.file)
+            runner.clearCache()
-          const exported = routeFile === '' ? {} : await runner.import(routeFile)
-          const loaderData = await exported.loader?.(loaderProps)
+            globalThis['__vxrnresetState']?.()
-          // biome-ignore lint/security/noGlobalEval: <explanation>
-          eval(`process.env.TAMAGUI_IS_SERVER = '1'`)
+            const exported = routeFile === '' ? {} : await runner.import(routeFile)
+            const loaderData = await exported.loader?.(loaderProps)
-          const entry = await runner.import(virtualEntryId)
+            // biome-ignore lint/security/noGlobalEval: <explanation>
+            eval(`process.env.TAMAGUI_IS_SERVER = '1'`)
-          const render = entry.default.render as (props: RenderAppProps) => any
+            const entry = await runner.import(virtualEntryId)
-          setServerContext({
-            loaderData,
-            loaderProps,
-          })
+            const render = entry.default.render as (props: RenderAppProps) => any
-          LoaderDataCache[route.file] = loaderData
+            setServerContext({
+              loaderData,
+              loaderProps,
+            })
-          const is404 = route.isNotFound || !exported.default
+            LoaderDataCache[route.file] = loaderData
-          const html = await render({
-            mode: route.type === 'ssg' ? 'ssg' : route.type === 'ssr' ? 'ssr' : 'spa',
-            loaderData,
-            loaderProps,
-            path: loaderProps?.path || '/',
-            preloads,
-          })
+            const is404 = route.isNotFound || !exported.default
-          if (is404) {
-            return new Response(html, {
-              status: 404,
-              headers: { 'Content-Type': 'text/html' },
+            const html = await render({
+              mode: route.type === 'ssg' ? 'ssg' : route.type === 'ssr' ? 'ssr' : 'spa',
+              loaderData,
+              loaderProps,
+              path: loaderProps?.path || '/',
+              preloads,
             })
-          }
-          return html
-        } catch (err) {
-          console.error(`SSR error while loading file ${route.file} from URL ${url.href}\n`, err)
-          const title = `Error rendering ${url.pathname} on server`
-          const message = err instanceof Error ? err.message : `${err}`
-          const stack = err instanceof Error ? err.stack || '' : ''
-          const isDuplicateReactError =
-            /at (useEffect|useState|useReducer|useContext|useLayoutEffect)\s*\(.*?react\.development\.js/g.test(
-              stack
-            )
-          const subMessage = isDuplicateReactError
-            ? `
+            if (is404) {
+              return new Response(html, {
+                status: 404,
+                headers: { 'Content-Type': 'text/html' },
+              })
+            }
+            return html
+          } catch (err) {
+            console.error(`SSR error while loading file ${route.file} from URL ${url.href}\n`, err)
+            const title = `Error rendering ${url.pathname} on server`
+            const message = err instanceof Error ? err.message : `${err}`
+            const stack = err instanceof Error ? err.stack || '' : ''
+            const isDuplicateReactError =
+              /at (useEffect|useState|useReducer|useContext|useLayoutEffect)\s*\(.*?react\.development\.js/g.test(
+                stack
+              )
+            const subMessage = isDuplicateReactError
+              ? `
             <h2>Duplicate React Error</h2>
             <p style="font-size: 18px; line-height: 24px; max-width: 850px;">Note: These types of errors happen during SSR because One needs all dependencies that use React to be optimized. Find the dependency on the line after the react.development.js line below to find the failing dependency. So long as that dependency has "react" as a sub-dependency, you can add it to your package.json and One will optimize it automatically. If it doesn't list it properly, you can fix this manually by changing your vite.config.ts One plugin to add "one({ deps: { depName: true })" so One optimizes depName.</p>
           `
-            : ``
+              : ``
-          console.error(`${title}\n ${message}\n\n${stack}\n`)
+            console.error(`${title}\n ${message}\n\n${stack}\n`)
-          return `
+            return `
             <html>
               <body style="background: #000; color: #fff; padding: 5%; font-family: monospace; line-height: 2rem;">
                 <h1 style="display: inline-flex; background: red; color: white; padding: 5px; margin: -5px;">${title}</h1>
@@ -138,58 +139,60 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
               </body>
             </html>
           `
-        } finally {
-          resolve()
-        }
-      },
+          } finally {
+            resolve()
+          }
+        },
-      async handleLoader({ request, route, url, loaderProps }) {
-        const routeFile = join(routerRoot, route.file)
+        async handleLoader({ request, route, url, loaderProps }) {
+          const routeFile = join(routerRoot, route.file)
-        // this will remove all loaders
-        let transformedJS = (await server.transformRequest(routeFile))?.code
-        if (!transformedJS) {
-          throw new Error(`No transformed js returned`)
-        }
+          // this will remove all loaders
+          let transformedJS = (await server.transformRequest(routeFile))?.code
+          if (!transformedJS) {
+            throw new Error(`No transformed js returned`)
+          }
-        const exported = await runner.import(routeFile)
-        const loaderData = await exported.loader?.(loaderProps)
+          const exported = await runner.import(routeFile)
+          const loaderData = await exported.loader?.(loaderProps)
-        if (loaderData) {
-          // add loader back in!
-          transformedJS = replaceLoader({
-            code: transformedJS,
-            loaderData,
-          })
-        }
+          if (loaderData) {
+            // add loader back in!
+            transformedJS = replaceLoader({
+              code: transformedJS,
+              loaderData,
+            })
+          }
-        const platform = url.searchParams.get('platform')
+          const platform = url.searchParams.get('platform')
-        if (platform === 'ios' || platform === 'android') {
-          // Need to transpile to CommonJS for React Native
+          if (platform === 'ios' || platform === 'android') {
+            // Need to transpile to CommonJS for React Native
-          const environment = server.environments[platform || '']
-          if (!environment) {
-            throw new Error(`[handleLoader] No Vite environment found for platform '${platform}'`)
-          }
+            const environment = server.environments[platform || '']
+            if (!environment) {
+              throw new Error(`[handleLoader] No Vite environment found for platform '${platform}'`)
+            }
-          // [3] Just use a simple function to return the loader data for now.
-          const nativeTransformedJS = `exports.loader = () => (${JSON.stringify(loaderData)});`
+            // [3] Just use a simple function to return the loader data for now.
+            const nativeTransformedJS = `exports.loader = () => (${JSON.stringify(loaderData)});`
-          return nativeTransformedJS
-        }
+            return nativeTransformedJS
+          }
-        return transformedJS
-      },
+          return transformedJS
+        },
-      async handleAPI({ route }) {
-        return await runner.import(join(routerRoot, route.file))
-      },
+        async handleAPI({ route }) {
+          return await runner.import(join(routerRoot, route.file))
+        },
-      async loadMiddleware(route) {
-        return await runner.import(join(routerRoot, route.contextKey))
+        async loadMiddleware(route) {
+          return await runner.import(join(routerRoot, route.contextKey))
+        },
       },
-    }, { routerRoot })
+      { routerRoot }
+    )
   }
   return {
@@ -412,7 +415,7 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
             res.end()
             return
           } catch (error) {
-            console.error(`One routing error: ${error}`)
+            console.error(`[one] routing error ${req.url}: ${error}`)
             // Forward the error to Vite
             next(error)
           }

package/types/vite/plugins/SSRCSSPlugin.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SSRCSSPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/SSRCSSPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,MAAM,CAAA;AAKjD,wBAAgB,YAAY,CAAC,UAAU,EAAE;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,MAAM,CA8EtE;AAaD,wBAAsB,YAAY,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,~~mBAuC1E~~"}
1	+ {"version":3,"file":"SSRCSSPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/SSRCSSPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,MAAM,CAAA;AAKjD,wBAAgB,YAAY,CAAC,UAAU,EAAE;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,MAAM,CA8EtE;AAaD,wBAAsB,YAAY,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,mBA4C1E"}

package/types/vite/plugins/fileSystemRouterPlugin.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fileSystemRouterPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/fileSystemRouterPlugin.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAW,MAAM,EAAiB,MAAM,MAAM,CAAA;AAW1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAQ3C,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,GAAG,CAAC,aAAa,GAAG,MAAM,~~CAsZ~~/E"}
1	+ {"version":3,"file":"fileSystemRouterPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/fileSystemRouterPlugin.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAW,MAAM,EAAiB,MAAM,MAAM,CAAA;AAW1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAQ3C,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,GAAG,CAAC,aAAa,GAAG,MAAM,CAyZ/E"}