fix: server url property (#112)

QwikDev · Dec 23, 2021 · a9b2004 · a9b2004
1 parent 2b571ad
commit a9b2004
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/qwik",
-  "version": "0.0.16-0",
+  "version": "0.0.16-1",
   "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",

diff --git a/src/server/api.md b/src/server/api.md
@@ -27,7 +27,7 @@ export interface DocumentOptions {
     // (undocumented)
     debug?: boolean;
     // (undocumented)
-    url?: string;
+    url?: URL;
 }
 
 // @alpha

diff --git a/src/server/document.ts b/src/server/document.ts
@@ -22,7 +22,7 @@ export function createGlobal(opts?: GlobalOptions): QwikGlobal {
   opts = opts || {};
 
   const doc: QwikDocument = domino.createDocument() as any;
-  const baseURI = typeof opts.url !== 'string' ? BASE_URI : opts.url;
+  const baseURI = opts.url === undefined ? BASE_URI : opts.url.href;
   const loc = new URL(baseURI, BASE_URI);
 
   Object.defineProperty(doc, 'baseURI', {

diff --git a/src/server/platform.ts b/src/server/platform.ts
@@ -14,7 +14,7 @@ function createPlatform(document: any, opts?: DocumentOptions) {
   const doc: Document = document;
 
   if (opts?.url) {
-    doc.location.href = new URL(opts.url, 'http://qwik.local').href;
+    doc.location.href = opts.url.href;
   }
   const symbolCache = new Map<string, { [symbol: string]: any }>();
   const serverPlatform: CorePlatform = {

diff --git a/src/server/types.ts b/src/server/types.ts
@@ -27,7 +27,7 @@ export interface QwikDocument extends Document {}
  * @public
  */
 export interface DocumentOptions {
-  url?: string;
+  url?: URL;
   debug?: boolean;
 }
 

diff --git a/src/testing/api.md b/src/testing/api.md
@@ -27,7 +27,7 @@ export interface DocumentOptions {
     // (undocumented)
     debug?: boolean;
     // (undocumented)
-    url?: string;
+    url?: URL;
 }
 
 // @alpha

diff --git a/src/testing/document.unit.ts b/src/testing/document.unit.ts
@@ -12,7 +12,7 @@ import { pathToFileURL } from 'url';
 describe('global', () => {
   it('should create document', () => {
     const global = createGlobal({
-      url: pathToFileURL(__filename).href,
+      url: pathToFileURL(__filename),
     });
     expect(global.document.baseURI).toContain('file://');
     expect(global.document.baseURI).toContain('document.unit.ts');

diff --git a/starters/apps/starter-builder/package.json b/starters/apps/starter-builder/package.json
@@ -9,7 +9,7 @@
     "start": "npm run clean && concurrently -c blue,green \"rollup -c --configDev --watch\" \"wait-on public/build && npm run serve\""
   },
   "devDependencies": {
-    "@builder.io/qwik": "~0.0.15",
+    "@builder.io/qwik": "0.0.16-1",
     "@rollup/plugin-node-resolve": "^13.0.6",
     "concurrently": "^6.4.0",
     "rimraf": "^3.0.2",

diff --git a/starters/apps/starter-builder/src/index.server.tsx b/starters/apps/starter-builder/src/index.server.tsx
@@ -21,7 +21,7 @@ export function renderApp(opts: RenderToStringOptions) {
       <head>
         <title>Qwik Blank App</title>
       </head>
-      <body>
+      <body q:base="/build/">
         <Header />
         <div id="my-content"></div>
         <Footer />

diff --git a/starters/apps/starter-partytown/package.json b/starters/apps/starter-partytown/package.json
@@ -9,7 +9,7 @@
     "serve": "echo \"server not setup\""
   },
   "devDependencies": {
-    "@builder.io/qwik": "~0.0.15",
+    "@builder.io/qwik": "0.0.16-1",
     "@rollup/plugin-node-resolve": "^13.0.6",
     "concurrently": "^6.4.0",
     "rimraf": "^3.0.2",

diff --git a/starters/apps/starter-partytown/src/index.server.tsx b/starters/apps/starter-partytown/src/index.server.tsx
@@ -22,7 +22,7 @@ export function renderApp(opts: RenderToStringOptions) {
         <title>Qwik + Partytown Blank App</title>
         <script defer async src="~partytown/debug/partytown.js"></script>
       </head>
-      <body>
+      <body q:base="/build/">
         <MyApp />
         <script type="text/partytown">
           ({partyTownExampleWhichBlocksMainThreadForOneSecond.toString()})()

diff --git a/starters/apps/starter/package.json b/starters/apps/starter/package.json
@@ -9,7 +9,7 @@
     "serve": "node server/index.js"
   },
   "devDependencies": {
-    "@builder.io/qwik": "~0.0.15",
+    "@builder.io/qwik": "0.0.16-1",
     "@rollup/plugin-node-resolve": "^13.0.6",
     "concurrently": "^6.4.0",
     "rimraf": "^3.0.2",

diff --git a/starters/apps/starter/src/index.server.tsx b/starters/apps/starter/src/index.server.tsx
@@ -21,7 +21,7 @@ export function renderApp(opts: RenderToStringOptions) {
       <head>
         <title>Qwik Blank App</title>
       </head>
-      <body>
+      <body q:base="/build/">
         <MyApp />
         <QwikLoader debug={opts.debug} />
       </body>

diff --git a/starters/apps/todo/package.json b/starters/apps/todo/package.json
@@ -9,7 +9,7 @@
     "start": "npm run clean && concurrently -c blue,green \"rollup -c --configDev --watch\" \"wait-on public/build && npm run serve\""
   },
   "devDependencies": {
-    "@builder.io/qwik": "~0.0.14",
+    "@builder.io/qwik": "0.0.16-1",
     "@rollup/plugin-node-resolve": "^13.0.6",
     "concurrently": "^6.4.0",
     "rimraf": "^3.0.2",

diff --git a/starters/servers/cloudflare/src/index.cloudflare.tsx b/starters/servers/cloudflare/src/index.cloudflare.tsx
@@ -31,7 +31,7 @@ async function handleQwik(event: any, request: Request) {
   }
 
   const ssrResult = await renderApp({
-    url: request.url,
+    url: new URL(request.url),
     symbols,
   });
 

diff --git a/starters/servers/express/server/index.js b/starters/servers/express/server/index.js
@@ -9,17 +9,15 @@ async function startServer() {
   async function handleQwik(req, res) {
     const result = await renderApp({
       symbols,
-      url: req.url,
+      url: new URL(req.url),
       debug: true,
     });
     res.send(result.html);
   }
 
   const app = express();
   const publicDir = join(__dirname, '..', 'public');
-  const buildDir = join(__dirname, '..', 'public', 'build');
   app.use(express.static(publicDir));
-  app.use(express.static(buildDir));
 
   // Optionally server Partytown if found.
   const partytownDir = join(__dirname, '..', 'node_modules', '@builder.io', 'partytown', 'lib');