Merge pull request #7651 from QwikDev/v2-merge-main

chore: merge main into v2

Author: wmertens

.changeset/gold-colts-change.md

@@ -0,0 +1,5 @@
+---
+'@builder.io/qwik': patch
+---
+
+FIX: assetsDir and debug:true will no longer break your application.

.changeset/good-mammals-grab.md

@@ -0,0 +1,5 @@
+---
+'@builder.io/qwik': minor
+---
+
+FIX: the preloader bundle graph file is now built as an asset. This is cleaner and avoids i18n translation of the file.

.changeset/real-cities-fold.md

@@ -0,0 +1,5 @@
+---
+'@builder.io/qwik': patch
+---
+
+FEAT: q-manifest.json now also includes the generated assets

e2e/adapters-e2e/vite.config.ts

@@ -20,15 +20,9 @@ errorOnDuplicatesPkgDeps(devDependencies, dependencies);
  * Note that Vite normally starts from `index.html` but the qwikRouter plugin makes start at
  * `src/entry.ssr.tsx` instead.
  */
-export default defineConfig(({ command, mode }): UserConfig => {
+export default defineConfig((): UserConfig => {
   return {
-    plugins: [
-      qwikRouter(),
-      qwikVite(),
-      tsconfigPaths({
-        root: '.',
-      }),
-    ],
+    plugins: [qwikRouter(), qwikVite(), tsconfigPaths({ root: '.' })],
     // This tells Vite which dependencies to pre-build in dev mode.
     optimizeDeps: {
       // Put problematic deps that break bundling here, mostly those with binaries.

e2e/qwik-cli-e2e/vite.config.mts

@@ -26,7 +26,7 @@ if (process.env.CI) {
 }
 
 export default defineConfig({
-  plugins: [tsconfigPaths({ ignoreConfigErrors: true, root: '../../' })],
+  plugins: [tsconfigPaths({ root: '../../' })],
   test: {
     include: ['./tests/*.spec.?(c|m)[jt]s?(x)'],
     setupFiles: ['./utils/setup.ts'],

package.json

@@ -106,7 +106,6 @@
     "@vitejs/plugin-basic-ssl": "2.0.0",
     "all-contributors-cli": "6.26.1",
     "brotli": "1.3.3",
-    "concurrently": "8.2.2",
     "create-qwik": "workspace:*",
     "cross-spawn": "7.0.3",
     "csstype": "3.1.3",
@@ -220,7 +219,7 @@
     "release.prepare": "pnpm build --prepare-release",
     "serve": "tsx --require ./scripts/runBefore.ts --inspect --conditions=development starters/dev-server.ts 3300",
     "serve.debug": "tsx --require ./scripts/runBefore.ts --inspect-brk --conditions=development starters/dev-server.ts 3300",
-    "start": "concurrently \"npm:build.watch\"  \"npm:tsc.watch\" -n build,tsc -c green,cyan",
+    "start": "pnpm run --stream \"/.*\\.watch/\"",
     "test": "pnpm build.full && pnpm test.unit && pnpm test.e2e",
     "test.e2e": "pnpm test.e2e.chromium && pnpm test.e2e.webkit && test.e2e.integrations",
     "test.e2e.chromium": "playwright test starters --browser=chromium --config starters/playwright.config.ts",

packages/docs/src/repl/repl-options.tsx

@@ -22,6 +22,7 @@ export const ReplOptions = ({ input, versions, qwikVersion }: ReplOptionsProps)
       />
 
       <StoreBoolean label="Debug" inputProp="debug" input={input} />
+      <StoreBoolean label="Preloader" inputProp="preloader" input={input} />
     </div>
   );
 };

packages/docs/src/repl/repl-share-url.ts

@@ -7,6 +7,7 @@ const dataDefaults: PlaygroundShareUrl = {
   buildMode: 'development',
   entryStrategy: 'segment',
   files: [],
+  preloader: false,
 };
 export const parsePlaygroundShareUrl = (shareable: string) => {
   if (typeof shareable === 'string' && shareable.length > 0) {
@@ -27,6 +28,10 @@ export const parsePlaygroundShareUrl = (shareable: string) => {
       if (ENTRY_STRATEGY_OPTIONS.includes(entryStrategy)) {
         data.entryStrategy = entryStrategy;
       }
+      const preloader = params.get('preloader')!;
+      if (preloader !== null) {
+        data.preloader = true;
+      }
 
       if (params.has('files')) {
         // Old URLs that didn't compress
@@ -129,6 +134,13 @@ export const createPlaygroundShareUrl = (data: PlaygroundShareUrl, pathname = '/
   if (data.entryStrategy !== dataDefaults.entryStrategy) {
     params.set('entryStrategy', data.entryStrategy);
   }
+  if (data.preloader !== dataDefaults.preloader) {
+    if (data.preloader) {
+      params.set('preloader', '');
+    } else {
+      params.delete('preloader');
+    }
+  }
 
   params.set('f', compressFiles(data.files));
 
@@ -184,4 +196,5 @@ interface PlaygroundShareUrl {
   buildMode: any;
   entryStrategy: any;
   files: any[];
+  preloader?: boolean;
 }

packages/docs/src/repl/repl-share-url.unit.ts

@@ -24,6 +24,7 @@ const data = {
       code: 'console.log("bar");',
     },
   ],
+  preloader: false,
 };
 test('filesToStr', () => {
   assert.equal(

packages/docs/src/repl/repl.tsx

@@ -108,6 +108,7 @@ export const Repl = component$((props: ReplProps) => {
     track(() => input.files);
     track(() => input.version);
     track(() => input.debug);
+    track(() => input.preloader);
     track(() => store.serverWindow);
 
     sendUserUpdateToReplServer(input, store);
@@ -210,6 +211,7 @@ export const sendUserUpdateToReplServer = (input: ReplAppInput, store: ReplStore
         version: input.version,
         serverUrl: store.serverUrl,
         deps: getDependencies(input),
+        preloader: !!input.preloader,
       },
     };