Fix vite 3 integration

package.json

@@ -23,8 +23,9 @@
     "start": "concurrently \"npm:build.watch\" \"npm:test.watch\" \"npm:tsc.watch\" -n build,test,tsc -c green,magenta,cyan",
     "release.prepare": "yarn lint && yarn test.unit && yarn node scripts --tsc --build --api --eslint --platform-binding --wasm --prepare-release",
     "release.prepare.qwik-city": "cd packages/qwik-city && yarn test && yarn build && yarn node -r esbuild-register scripts/prepare-release.ts",
-    "test": "yarn build.full && jest && yarn test.e2e",
-    "test.unit": "jest",
+    "test": "yarn build.full && yarn test.unit && yarn test.e2e",
+    "test.unit": "jest && yarn test.uvu",
+    "test.uvu": "uvu -r tsm packages test.ts",
     "test.rust": "make test",
     "test.watch": "jest --watch",
     "test.e2e": "yarn test.e2e.chromium && yarn test.e2e.firefox && yarn test.e2e.webkit",
@@ -48,7 +49,6 @@
   "devDependencies": {
     "@builder.io/partytown": "0.6.2",
     "@builder.io/qwik-dom": "2.1.18",
-    "@jest/types": "^28.1.3",
     "@microsoft/api-extractor": "7.28.4",
     "@napi-rs/cli": "2.6.2",
     "@napi-rs/triples": "1.1.0",
@@ -58,7 +58,6 @@
     "@types/cross-spawn": "6.0.2",
     "@types/eslint": "8.4.5",
     "@types/express": "4.17.13",
-    "@types/jest": "^28.1.5",
     "@types/mri": "1.1.1",
     "@types/node": "latest",
     "@types/node-fetch": "2.6.2",
@@ -69,13 +68,13 @@
     "@typescript-eslint/utils": "5.30.6",
     "all-contributors-cli": "^6.20.0",
     "brotli": "1.3.3",
-    "commitizen": "4.2.4",
+    "commitizen": "4.2.5",
     "concurrently": "7.2.2",
     "cross-spawn": "7.0.3",
     "cz-conventional-changelog": "3.3.0",
     "esbuild": "0.14.49",
     "esbuild-register": "3.3.3",
-    "eslint": "8.19.0",
+    "eslint": "8.20.0",
     "eslint-plugin-no-only-tests": "2.6.0",
     "execa": "6.1.0",
     "express": "4.18.1",
@@ -90,9 +89,9 @@
     "terser": "5.14.2",
     "todomvc-app-css": "2.4.2",
     "todomvc-common": "1.0.5",
-    "ts-jest": "28.0.6",
+    "ts-jest": "28.0.7",
     "typescript": "4.7.4",
-    "vite": "3.0.0",
+    "vite": "3.0.1",
     "vite-tsconfig-paths": "3.5.0",
     "wasm-pack": "0.10.3"
   },
@@ -137,6 +136,10 @@
         "useESM": true
       }
     },
+    "extensionsToTreatAsEsm": [
+      ".ts",
+      ".tsx"
+    ],
     "moduleFileExtensions": [
       "ts",
       "tsx",
@@ -191,5 +194,9 @@
       "<rootDir>/target/"
     ],
     "testRegex": "/(scripts|packages)/.*\\.unit\\.(ts|tsx)$"
+  },
+  "dependencies": {
+    "tsm": "^2.2.1",
+    "uvu": "^0.5.6"
   }
 }

packages/docs/functions/[[path]].ts

@@ -2,4 +2,4 @@
 
 // Cloudflare Pages Functions
 // https://developers.cloudflare.com/pages/platform/functions/
-export { onRequestGet } from '../server/entry.cloudflare.js';
+export { onRequestGet } from '../server/entry.cloudflare';

packages/docs/package.json

@@ -30,7 +30,7 @@
     "prismjs": "^1.28.0",
     "tailwindcss": "3.1.6",
     "uvu": "0.5.6",
-    "vite": "3.0.0",
+    "vite": "3.0.1",
     "wrangler": "beta"
   },
   "author": "Builder.io Team",

packages/qwik-city/buildtime/vite/plugin.ts

@@ -8,17 +8,7 @@ import { isMarkdownFileName, normalizePath } from '../utils/fs';
 import { validatePlugin } from './validate-plugin';
 import type { QwikCityVitePluginOptions } from './types';
 import { build } from '../build';
-import {
-  createPrinter,
-  createSourceFile,
-  factory,
-  isIdentifier,
-  isVariableDeclaration,
-  isVariableStatement,
-  NewLineKind,
-  ScriptTarget,
-  SyntaxKind,
-} from 'typescript';
+import ts from 'typescript';
 import { configureDevServer } from './dev-server';
 
 /**
@@ -115,38 +105,38 @@ export function qwikCity(userOpts?: QwikCityVitePluginOptions) {
 
 function removeServerFns(code: string, id: string) {
   let didModify = false;
-  const sourceFile = createSourceFile(id, code, ScriptTarget.Latest);
+  const sourceFile = ts.createSourceFile(id, code, ts.ScriptTarget.Latest);
 
   for (const s of sourceFile.statements) {
-    if (!isVariableStatement(s)) {
+    if (!ts.isVariableStatement(s)) {
       continue;
     }
 
-    if (!s.modifiers?.some((m) => m.kind === SyntaxKind.ExportKeyword)) {
+    if (!s.modifiers?.some((m) => m.kind === ts.SyntaxKind.ExportKeyword)) {
       continue;
     }
 
     const decs = s.declarationList.declarations;
 
     for (const d of decs) {
-      if (!isVariableDeclaration(d)) {
+      if (!ts.isVariableDeclaration(d)) {
         continue;
       }
       const identifier = d.name;
-      if (!isIdentifier(identifier)) {
+      if (!ts.isIdentifier(identifier)) {
         continue;
       }
       if (!SERVER_FNS.some((fn) => identifier.escapedText === fn)) {
         continue;
       }
 
-      (d as any).initializer = factory.createNull();
+      (d as any).initializer = ts.factory.createNull();
       didModify = true;
     }
   }
 
   if (didModify) {
-    const printer = createPrinter({ newLine: NewLineKind.LineFeed });
+    const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
     return printer.printFile(sourceFile);
   }
   return null;

packages/qwik-city/middleware/express/index.ts

@@ -2,11 +2,10 @@ import type { QwikCityRequestOptions } from '../request-handler/types';
 import { requestHandler } from '../request-handler';
 import { patchGlobalFetch } from '../request-handler/node-fetch';
 import express from 'express';
-import { dirname, isAbsolute, join, resolve } from 'path';
+import { join, resolve } from 'path';
 import type { QwikCityPlan } from '@builder.io/qwik-city';
 import type { Render } from '@builder.io/qwik/server';
 import { fromNodeRequest, toNodeResponse } from './utils';
-import { fileURLToPath } from 'url';
 
 // @builder.io/qwik-city/middleware/express
 
@@ -20,15 +19,13 @@ export function qwikCity(render: Render, opts: QwikCityPlanExpress) {
 
   let staticDir = opts.staticDir;
   if (typeof staticDir === 'string') {
-    const __dirname = dirname(fileURLToPath(import.meta.url));
+    staticDir = resolve(staticDir);
 
-    if (!isAbsolute(staticDir)) {
-      staticDir = resolve(__dirname, staticDir);
-    }
-
-    let buildDir = opts.buildDir || join(staticDir, 'build');
-    if (!isAbsolute(buildDir)) {
-      buildDir = resolve(__dirname, buildDir);
+    let buildDir = opts.buildDir;
+    if (typeof buildDir === 'string') {
+      buildDir = resolve(buildDir);
+    } else {
+      buildDir = join(staticDir, 'build');
     }
 
     router.use(`/build`, express.static(buildDir, { immutable: true, maxAge: '1y', index: false }));

packages/qwik-city/package.json

@@ -2,14 +2,15 @@
   "name": "@builder.io/qwik-city",
   "version": "0.0.20",
   "description": "Static Site Generator for Qwik",
-  "main": "./lib/index.cjs.qwik.js",
-  "module": "./lib/index.es.qwik.js",
-  "qwik": "./lib/index.cjs.qwik.js",
+  "main": "./lib/index.qwik.cjs",
+  "module": "./lib/index.qwik.mjs",
+  "qwik": "./lib/index.qwik.cjs",
   "types": "./lib/index.d.ts",
+  "type": "module",
   "exports": {
     ".": {
-      "import": "./lib/index.es.qwik.js",
-      "require": "./lib/index.cjs.qwik.js"
+      "import": "./lib/index.qwik.mjs",
+      "require": "./lib/index.qwik.cjs"
     },
     "./middleware/cloudflare-pages": {
       "import": "./lib/middleware/cloudflare-pages/index.mjs"
@@ -33,8 +34,8 @@
     "build.client": "cd runtime && vite build --config vite-app.config.ts",
     "build.ssr": "cd runtime && vite build --config vite-app.config.ts --ssr src/entry.express.tsx",
     "build.runtime": "cd runtime && vite build --mode lib",
-    "serve": "node --inspect runtime/server/entry.express.js",
-    "serve.debug": "node --inspect-brk runtime/server/entry.express.js",
+    "serve": "node --inspect runtime/server/entry.express",
+    "serve.debug": "node --inspect-brk runtime/server/entry.express",
     "test": "yarn test.unit && yarn test.e2e",
     "test.unit": "node ../../node_modules/.bin/uvu -r tsm . \"(unit)\"",
     "test.e2e": "DISABLE_JS=true node ../../node_modules/.bin/playwright test runtime/src/app/tests --config runtime/playwright.config.ts",
@@ -70,7 +71,7 @@
     "unified": "10.1.2",
     "unist-util-visit": "4.1.0",
     "uvu": "0.5.6",
-    "vite": "3.0.0"
+    "vite": "3.0.1"
   },
   "license": "MIT",
   "homepage": "https://qwik.builder.io/",

packages/qwik-city/runtime/playwright.config.ts

@@ -12,7 +12,7 @@ const config: PlaywrightTestConfig = {
   },
   timeout: 5000,
   webServer: {
-    command: 'node server/entry.express.js',
+    command: 'node server/entry.express',
     port: 3000,
     reuseExistingServer: !process.env.CI,
   },

packages/qwik-city/runtime/vite.config.ts

@@ -10,7 +10,7 @@ export default defineConfig(() => {
       lib: {
         entry: './src/index.ts',
         formats: ['es', 'cjs'],
-        fileName: (format) => `index.${format}.qwik.js`,
+        fileName: (format) => `index.qwik.${format === 'es' ? 'mjs' : 'cjs'}`,
       },
       rollupOptions: {
         external: ['@qwik-city-plan'],
@@ -28,8 +28,11 @@ export default defineConfig(() => {
       qwikVite(),
     ],
     clearScreen: false,
-    server: {
+    optimizeDeps: {
       force: true,
     },
+    server: {
+      port: 3000,
+    },
   };
 });

packages/qwik-react/package.json

@@ -28,7 +28,7 @@
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "typescript": "4.7.4",
-    "vite": "3.0.0"
+    "vite": "3.0.1"
   },
   "peerDependencies": {
     "@builder.io/qwik": ">=0.0.35",
@@ -45,8 +45,8 @@
   },
   "exports": {
     ".": {
-      "import": "./lib/index.es.qwik.js",
-      "require": "./lib/index.cjs.qwik.js"
+      "import": "./lib/index.qwik.mjs",
+      "require": "./lib/index.qwik.cjs"
     }
   },
   "files": [
@@ -62,8 +62,9 @@
   "bugs": {
     "url": "https://github.com/BuilderIO/qwik/issues"
   },
-  "main": "./lib/index.cjs.qwik.js",
-  "module": "./lib/index.es.qwik.js",
-  "qwik": "./lib/index.es.qwik.js",
+  "type": "module",
+  "main": "./lib/index.qwik.cjs",
+  "module": "./lib/index.qwik.mjs",
+  "qwik": "./lib/index.qwik.mjs",
   "types": "./lib/types/index.d.ts"
 }

packages/qwik-react/vite.config.ts

@@ -11,7 +11,7 @@ export default defineConfig(() => {
       lib: {
         entry: './src/index.ts',
         formats: ['es', 'cjs'],
-        fileName: (format) => `index.${format}.qwik.js`,
+        fileName: (format) => `index.qwik.${format === 'es' ? 'mjs' : 'cjs'}`,
       },
       rollupOptions: {
         external: [
@@ -26,9 +26,6 @@ export default defineConfig(() => {
           'react-dom/client',
           'react-dom/server',
         ],
-        output: {
-          chunkFileNames: '[name]-[hash].js',
-        },
       },
     },
     plugins: [

packages/qwik/package.json

@@ -139,6 +139,6 @@
     "Builder.io"
   ],
   "engines": {
-    "node": ">=14"
+    "node": ">=14.18.0"
   }
 }

packages/qwik/src/core/component/component.unit.tsx

@@ -5,6 +5,7 @@ import { runtimeQrl } from '../import/qrl';
 import { render } from '../render/render.public';
 import { useStylesQrl } from '../use/use-styles';
 import { PropsOf, component$ } from './component.public';
+import { describe, it } from '@jest/globals';
 
 describe('q-component', () => {
   it('should declare and render basic component', async () => {

packages/qwik/src/core/import/qrl.unit.ts

@@ -1,6 +1,7 @@
 import { parseQRL, stringifyQRL } from './qrl';
 import { createQrl } from './qrl-class';
 import { qrl } from './qrl';
+import { expect, describe, it } from '@jest/globals';
 
 describe('QRL', () => {
   describe('serialization', () => {

packages/qwik/src/core/object/q-object.unit.ts

@@ -1,3 +1,5 @@
+import { expect, describe, beforeEach, it } from '@jest/globals';
+
 import {
   createSubscriptionManager,
   getOrCreateProxy,

packages/qwik/src/core/object/store.unit.tsx

@@ -1,3 +1,4 @@
+import { expect, describe, beforeEach, it } from '@jest/globals';
 import { createDocument } from '../../testing/document';
 import { useStore } from '../use/use-store.public';
 import { render } from '../render/render.public';

packages/qwik/src/core/render/jsx/factory.unit.ts

@@ -1,3 +1,4 @@
+import { expect, describe, it } from '@jest/globals';
 import { Host } from './host.public';
 import { h } from './factory';
 import { isJSXNode, Fragment, processNode } from './jsx-runtime';

packages/qwik/src/core/render/jsx/jsx-runtime.unit.ts

@@ -1,3 +1,4 @@
+import { expect, describe, it } from '@jest/globals';
 import { Host } from './host.public';
 import { jsx, isJSXNode, Fragment, processNode } from './jsx-runtime';
 import type { FunctionComponent, ProcessedJSXNode } from './types/jsx-node';

packages/qwik/src/core/render/render.unit.tsx

@@ -1,3 +1,4 @@
+import { expect, describe, beforeEach, it } from '@jest/globals';
 import { h, Host, useStore } from '@builder.io/qwik';
 import { useCleanup$, useClientEffect$, useWatch$ } from '../../core';
 import { ElementFixture, trigger } from '../../testing/element-fixture';
@@ -17,7 +18,7 @@ import { useScopedStyles$ } from '../use/use-styles';
 
 describe('render', () => {
   let fixture: ElementFixture;
-  beforeEach(() => (fixture = new ElementFixture()));
+  beforeEach(async () => (fixture = new ElementFixture()));
   describe('basic JSX', () => {
     it('should render basic content', async () => {
       await render(fixture.host, <div></div>);

packages/qwik/src/core/util/case.unit.ts

@@ -1,3 +1,4 @@
+import { expect, describe, it } from '@jest/globals';
 import { fromCamelToKebabCase } from './case';
 
 describe('case', () => {