Unexpected behaviour when using cloudflare deploy adapter

[kumardeo]

When I use @astrojs/cloudflare as deploy adapter in adapter field of astro config, all the files generated by vite-pwa are available in dist/_worker.js directory instead of dist.

"astro": "^5.7.9"
"@astrojs/cloudflare": "^12.5.1"
"@vite-pwa/astro": "^1.0.1"
"vite-plugin-pwa": "^1.0.0"

astro.config.ts:

import cloudflare from '@astrojs/cloudflare';
import AstroPWA from '@vite-pwa/astro';
import { defineConfig } from 'astro/config';

// https://astro.build/config
export default defineConfig({
  adapter: cloudflare(),
  trailingSlash: 'never',
  integrations: [
    AstroPWA({
      registerType: 'autoUpdate',
      manifest: {
        name: "App",
        short_name: "App",
        icons: []
      },
      workbox: {
        globDirectory: 'dist',
        globPatterns: ['**/*.{js,css,svg,png,jpg,jpeg,gif,webp,woff,woff2,ttf,eot,ico}'],
        globIgnores: ['**/_worker.js/**/*'],
        // Don't fallback on document based (e.g. `/some-page`) requests
        // This removes an errant console.log message from showing up.
        navigateFallback: null,
      },
      experimental: {
        directoryAndTrailingSlashHandler: true,
      },
    }),
  ],
});

When removing @astrojs/cloudflare adapter, the files are generated in dist

[userquin]

can you try using https://pkg.pr.new/@vite-pwa/astro@6c7e19b?

EDIT: you may need to remove globDirectory option

[kumardeo]

I removed globDirectory and installed the package from https://pkg.pr.new/@vite-pwa/astro@6c7e19b but the files are still generated in dist/_worker.js dir instead of dist

[userquin]

can you reinstall the dependency and test it again? Just moved the configuration before destructring it in the pr...

Use https://pkg.pr.new/@vite-pwa/astro@37eac3a

[kumardeo]

After reinstalling the dependency, only service worker js (sw.js and workbox-*.js) is moved to dist but other files (manifest.webmanifest, registerSW.js, etc) are still being generated in dist/_worker.js dir

[userquin]

It is weird, web manifest and registerSW assets generated using Vite emitFile, maybe we need to generate it only on client build, rn should be generated in both folders (dist for client and dist/_worker.js for server)

[kumardeo]

But I can't find manifest and registerSW in dist, they are only being generated in dist/_worker.js directory.

[userquin]

Astro version, latest 5.7?

[kumardeo]

Yes

[userquin]

Using node adapter also generating both entries in the server folder, looks like an Astro issue/bug, cannot use generateBundle, I'll check if using environment api works for your deployment:

[userquin]

@kumardeo can you test with this new version https://pkg.pr.new/@vite-pwa/astro@c5fbc56 ?

[kumardeo]

It no longer emits manifest.webmanifest and registerSW.js (neither in dist nor in dist/_worker.js).

sw.js and workbox-* are emitted in dist.

I tried @astrojs/node adapter, same behaviour there.

[userquin]

oh, you need to include a pwa.ts module to register the sw, otherwise the client build is not triggered, missing PWA from logs:

• https://github.com/vite-pwa/astro/blob/main/examples/pwa-simple-assets-ssr/src/pwa.ts (you can remove the hooks)
• https://github.com/vite-pwa/astro/blob/main/examples/pwa-simple-assets-ssr/src/layouts/DefaultLayout.astro#L26

EDIT: I need to add this to the docs, not sure why Astro not building the client in that case