chore: wip

chore: wip

chore: wip

Author: chrisbbreuer

storage/framework/core/cloud/src/cloud/cdn.ts

@@ -313,17 +313,28 @@ export class CdnStack {
         const regexTrailingSlash = /.+\\/$/
 
         exports.handler = (event, context, callback) => {
-          console.log('event from stacks', event)
+          const safeStringify = (obj, indent = 2) => {
+            const cache = new Set()
+            return JSON.stringify(obj, (key, value) => {
+              if (typeof value === 'object' && value !== null) {
+                if (cache.has(value)) return '[Circular]'
+                cache.add(value)
+              }
+              return value
+            }, indent)
+          }
+          console.log('Event from Stacks:', safeStringify(event))
           const request = event.Records[0].cf.request;
-          let uri = request.uri;
 
-          if (uri === '/docs' || uri === '/docs/') {
-            uri = '/index.html'
+          if (request.uri === '/docs' || request.uri === '/docs/') {
+            request.uri = '/docs/index.html'
+            console.log('Request from Stacks:', safeStringify(request))
             callback(null, request)
             return
           }
 
           // Append ".html" to origin request
+          const uri = request.uri
           if (uri.match(regexSuffixless)) {
             request.uri = uri + config.suffix
             callback(null, request)
@@ -337,7 +348,6 @@ export class CdnStack {
             return
           }
 
-          request.uri = uri;
           callback(null, request);
         };
       `),

storage/framework/docs/.vitepress/config.ts

@@ -16,9 +16,10 @@ import { analyticsHead, faviconHead } from './head'
 export default withPwa(
   defineConfig({
     srcDir: p.projectPath('docs'),
-    outDir: p.frameworkPath('docs/dist'),
+    outDir: p.frameworkPath('docs/dist/docs'), // we need to currently ensure it outputs into docs/dist/docs to ensure the S3 storage key is correct for CloudFront origins
     cacheDir: p.frameworkPath('cache/docs'),
     assetsDir: '/assets',
+    emptyOutDir: true,
 
     // sitemap: {
     //   hostname: 'stacks.localhost',

storage/framework/server/build.ts

@@ -137,14 +137,28 @@ async function main() {
     }
   }
 
-  // Process the storage folder and remove the .DS_Store files
-  const glob4 = new Bun.Glob('**/*.DS_Store')
-  const scanOptions4 = { cwd: path.storagePath(), onlyFiles: true }
-
-  for await (const file of glob4.scan(scanOptions4)) {
-    fs.unlink(file)
+  // next, lets move the dist/docs/index.html to dist/index.html
+  const docsDistPath = path.frameworkPath('docs/dist')
+
+  log.info(`Moving dist/docs/index.html to dist/index.html`)
+  try {
+    await fs.rename(path.resolve(docsDistPath, 'docs/index.html'), path.resolve(docsDistPath, 'index.html'))
+    log.success(`Moved dist/docs/index.html to dist/index.html`)
+  } catch (error) {
+    log.error(`Failed to move dist/docs/index.html`, error)
+    process.exit(1)
   }
 
+  log.info(`Adjusting paths in index.html`)
+  // now, let's adjust the paths in the index.html by simply updating all "/assets/ to "/dist/assets/
+  let content = await fs.readFile(path.resolve(docsDistPath, 'index.html'), 'utf-8')
+
+  // Replace all instances of /assets/ with /dist/assets/
+  content = content.replace(/\/assets\//g, '/dist/assets/')
+
+  await fs.writeFile(path.join(docsDistPath, 'index.html'), content, 'utf-8')
+  log.success(`Adjusted paths in index.html`)
+
   await outro({
     dir: import.meta.dir,
     startTime: perf,