refactor: move global Q config to document links

QwikDev · Jun 21, 2021 · 3f2d725 · 3f2d725
1 parent b3f53f5
commit 3f2d725
Show file tree

Hide file tree

Showing 38 changed files with 207 additions and 545 deletions.
diff --git a/docs/QRL.md b/docs/QRL.md
@@ -45,27 +45,6 @@ The above says that the `/handle_click` can be found relative to `myApp:`. This
 
 The above global configuration simply says that `myApp:/handle_click` should be translated to `http://myserver.com/app/handle_click`. Notice that all which is needed to configure the protocol is declaration of `Q` property on global namespace such as `window`.
 
-### Server protocol configuration
-
-Configuring protocol on the server serves the same purpose as on the client, but is a bit more complicated because a single server can serve multiple applications and therefore is contextual.
-
-As a convention create a `CONFIG.ts` file in a directory which will control protocols in that directory and its subdirectories.
-
-```typescript
-import { setConfig } from './index.js';
-
-setConfig({
-  baseURI: import.meta.url,
-  protocol: {
-    myApp: 'http://myserver.com/app',
-  },
-});
-```
-
-The important part is the `baseURI` which gets set to the obsolete URL of this file (`import.meta.url` returns `file://path/to/CONFIG.js`.) This will tell Qwik to resolve all files which come from a `file://path/to/**` folder using this configuration.
-
-It is important that you import the `CONFIG.ts` file someplace from the root of the application so that the protocols can get configured before they are used.
-
 ## File extension
 
 When Qwik imports a QRL it always imports it with a `.js` extension.

diff --git a/integration/hello_server/CONFIG.ts b/integration/hello_server/CONFIG.ts
diff --git a/integration/hello_server/server_index.tsx b/integration/hello_server/server_index.tsx
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://github.com/BuilderIO/qwik/blob/main/LICENSE
  */
 
-import './CONFIG.js';
 import { jsxFactory, jsxRender } from './qwik.js';
 import { Greeter } from './Greeter.js';
 

diff --git a/integration/todo/CONFIG.ts b/integration/todo/CONFIG.ts
diff --git a/integration/todo/client.html b/integration/todo/client.html
@@ -1,10 +1,10 @@
 <html>
   <head>
     <title>ToDo Application</title>
-    <script src="/qwikloader.min.js" type="module"></script>
-    <script>
-      var Q = { protocol: { ui: './ui', data: './data', base: './' } };
-    </script>
+    <script src="/qwikloader.js" type="module"></script>
+    <link rel="q.protocol.ui" href="./ui" />
+    <link rel="q.protocol.data" href="./data" />
+    <link rel="q.protocol.base" href="./" />
     <link rel="stylesheet" href="./base.css" />
     <link rel="stylesheet" href="./index.css" />
   </head>

diff --git a/integration/todo/server_index.tsx b/integration/todo/server_index.tsx
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://github.com/BuilderIO/qwik/blob/main/LICENSE
  */
 
-import './CONFIG.js';
 import { jsxFactory, jsxRender } from './qwik.js';
 import { ToDoApp } from './ui/TodoApp.js';
 
@@ -22,8 +21,10 @@ export async function serverMain(document: Document) {
     <html>
       <head>
         <title>ToDo Application</title>
-        <script src="/qwikloader.min.js" type="module" events="click;dblclick;keyup;blur"></script>
-        <script>{"var Q={protocol:{ui:'./ui',data:'./data',base:'./'}}"}</script>
+        <script src="/qwikloader.js" type="module" events="click;dblclick;keyup;blur"></script>
+        <link rel="q.protocol.ui" href="./ui" />
+        <link rel="q.protocol.data" href="./data" />
+        <link rel="q.protocol.base" href="./" />
         <link rel="stylesheet" href="./base.css" />
         <link rel="stylesheet" href="./index.css" />
       </head>

diff --git a/src/core/BUILD.bazel b/src/core/BUILD.bazel
@@ -19,22 +19,13 @@ ts_project(
         ["**/*.ts"],
         exclude = [
             "**/*.unit.ts",
-            "CONFIG.ts",
         ],
     ),
     declaration = True,
     tsconfig = "//:tsconfig",
     # TODO: https://bazelbuild.github.io/rules_nodejs/TypeScript.html#ts_project-supports_workers
 )
 
-ts_project(
-    name = "CONFIG",
-    srcs = ["CONFIG.ts"],
-    declaration = True,
-    tsconfig = "//:tsconfig",
-    deps = [":core"],
-)
-
 ts_project(
     name = "unit_lib",
     srcs = glob([
@@ -44,9 +35,9 @@ ts_project(
     declaration = True,
     tsconfig = "//:tsconfig",
     deps = [
-        ":CONFIG",
         ":core",
         "//src/core/testing",
+        "//src/core/testing:unit_lib",
         "@npm//@types/chai",
         "@npm//@types/mocha",
     ],

diff --git a/src/core/CONFIG.ts b/src/core/CONFIG.ts
diff --git a/src/core/component/component.unit.ts b/src/core/component/component.unit.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://github.com/BuilderIO/qwik/blob/main/LICENSE
  */
 
-import '../CONFIG.js';
 import { expect } from 'chai';
 import { ComponentFixture, GreeterComponent } from '../testing/component_fixture.js';
 import { AttributeMarker } from '../util/markers.js';

diff --git a/src/core/config/README.md b/src/core/config/README.md
diff --git a/src/core/config/index.ts b/src/core/config/index.ts
diff --git a/src/core/config/qGlobal.ts b/src/core/config/qGlobal.ts
diff --git a/src/core/config/qGlobal.unit.ts b/src/core/config/qGlobal.unit.ts