fix: vite (#171)

Author: manucorporat

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/qwik",
-  "version": "0.0.16-9",
+  "version": "0.0.16-10",
   "description": "An Open-Source sub-framework designed with a focus on server-side-rendering, lazy-loading, and styling/animation.",
   "scripts": {
     "build": "node scripts --tsc --build --api --platform-binding --wasm",

src/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-qwik",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "Interactive CLI and API for generating Qwik projects.",
   "bin": {
     "create-qwik": "create-qwik"

src/optimizer/src/rollup/index.ts

@@ -41,6 +41,9 @@ export function qwikRollup(opts: QwikPluginOptions): any {
       }
       return {
         esbuild: { include: /\.js$/ },
+        optimizeDeps: {
+          include: ['@builder.io/qwik', '@builder.io/qwik/jsx-runtime'],
+        },
         build: {
           polyfillModulePreload: false,
           dynamicImportVarsOptions: {
@@ -128,8 +131,7 @@ export function qwikRollup(opts: QwikPluginOptions): any {
 
         const result = await optimizer.transformFs(transformOpts);
         for (const output of result.modules) {
-          let key = optimizer.path.join(transformOpts.rootDir, output.path)!;
-          key = key.split('.').slice(0, -1).join('.');
+          const key = optimizer.path.join(transformOpts.rootDir, output.path)!;
           if (debug) {
             // eslint-disable-next-line no-console
             console.debug(`[QWIK PLUGIN] Module: ${key}`);
@@ -166,24 +168,23 @@ export function qwikRollup(opts: QwikPluginOptions): any {
           id = optimizer.path.resolve(dir, id);
         }
       }
-      if (transformedOutputs.has(id)) {
-        if (debug) {
-          // eslint-disable-next-line no-console
-          console.debug(`[QWIK PLUGIN] Resolve: ${id} ${opts}`);
-        }
-        return {
-          id,
-          moduleSideEffects: false,
-        };
+      const tries = [id, id + '.js'];
+      if (['.jsx', '.ts', '.tsx'].includes(optimizer.path.extname(id))) {
+        tries.push(removeExtension(id) + '.js');
       }
-      if (['.js', '.jsx', '.ts', '.tsx'].includes(optimizer.path.extname(id))) {
-        id = id.split('.').slice(0, -1).join('.');
-        if (transformedOutputs.has(id)) {
+      for (const id of tries) {
+        const res = transformedOutputs.get(id);
+        if (res) {
           if (debug) {
             // eslint-disable-next-line no-console
-            console.debug(`[QWIK PLUGIN] Resolved: ${id}`);
+            console.debug(`[QWIK PLUGIN] Resolve: ${id} ${opts}`);
           }
-          return id;
+          const mod = res[0];
+          const sideEffects = !mod.isEntry || !mod.hook;
+          return {
+            id,
+            moduleSideEffects: sideEffects,
+          };
         }
       }
       return null;
@@ -310,7 +311,7 @@ export function qwikRollup(opts: QwikPluginOptions): any {
 
         hooks.forEach((h) => {
           const symbolName = h.name;
-          let filename = h.canonicalFilename;
+          let filename = h.canonicalFilename + '.js';
           // eslint-disable-next-line
           const found = output.find(([_, v]) => {
             return (
@@ -344,6 +345,10 @@ export function qwikRollup(opts: QwikPluginOptions): any {
   return plugin;
 }
 
+function removeExtension(id: string) {
+  return id.split('.').slice(0, -1).join('.');
+}
+
 /**
  * @alpha
  */

starters/apps/e2e/package.json

@@ -10,7 +10,7 @@
     "dev": "vite"
   },
   "devDependencies": {
-    "@builder.io/qwik": "0.0.16-9",
+    "@builder.io/qwik": "0.0.16-10",
     "typescript": "^4.5.2",
     "vite": "2.7.13"
   },

starters/apps/starter-builder/package.json

@@ -10,7 +10,7 @@
     "dev": "vite"
   },
   "devDependencies": {
-    "@builder.io/qwik": "0.0.16-9",
+    "@builder.io/qwik": "0.0.16-10",
     "typescript": "^4.5.2",
     "vite": "2.7.13"
   },

starters/apps/starter-partytown/package.json

@@ -10,7 +10,7 @@
     "dev": "vite"
   },
   "devDependencies": {
-    "@builder.io/qwik": "0.0.16-9",
+    "@builder.io/qwik": "0.0.16-10",
     "typescript": "4.5.2",
     "vite": "2.7.13"
   },

starters/apps/starter/package.json

@@ -10,7 +10,7 @@
     "dev": "vite"
   },
   "devDependencies": {
-    "@builder.io/qwik": "0.0.16-9",
+    "@builder.io/qwik": "0.0.16-10",
     "typescript": "^4.5.2",
     "vite": "2.7.13"
   },

starters/apps/todo/package.json

@@ -10,7 +10,7 @@
     "dev": "vite"
   },
   "devDependencies": {
-    "@builder.io/qwik": "0.0.16-9",
+    "@builder.io/qwik": "0.0.16-10",
     "typescript": "^4.5.2",
     "vite": "2.7.13"
   },

starters/dev-server.cjs

@@ -141,7 +141,7 @@ function removeDir(dir) {
 async function ssrApp(req, appName, appDir) {
   const buildDir = join(appDir, 'build');
   const serverDir = join(buildDir, 'server');
-  const serverPath = join(serverDir, 'entry.js');
+  const serverPath = join(serverDir, 'entry.server.js');
   const symbolsPath = join(serverDir, 'q-symbols.json');
   const symbols = JSON.parse(readFileSync(symbolsPath, 'utf-8'));
 

starters/servers/cloudflare/server/package.json

@@ -1,4 +1,4 @@
 {
   "name": "cloudflare-worker",
-  "main": "build/entry.js"
+  "main": "build/entry.cloudflare.js"
 }