@ditojs/server 1.0.0-rc.1 → 1.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@ditojs/server",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0",
   "description": "Dito.js Server – Dito.js is a declarative and modern web framework, based on Objection.js, Koa.js and Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/server",
   "author": "Jürg Lehni <juerg@scratchdisk.com> (http://scratchdisk.com)",
@@ -82,5 +82,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.2"
   },
-  "gitHead": "48ca0c1f446bd6cb2118881f8204ad117a14c3b7"
+  "gitHead": "a6156cb1d38695789b61d69388a0b38490e287e9"
 }

package/src/controllers/AdminController.js

@@ -71,7 +71,7 @@ export class AdminController extends Controller {
     // Shield admin views against unauthorized access.
     const authorization = this.processAuthorize(this.authorize)
     return async (ctx, next) => {
-      if (/^\/dito\b/.test(ctx.url)) {
+      if (ctx.url === '/dito.js') {
         // Return without calling `next()`
         return this.sendDitoObject(ctx)
       } else if (/\/views\b/.test(ctx.url)) {
@@ -129,6 +129,7 @@ export class AdminController extends Controller {
 
     const cwd = path.resolve('.')
     const root = this.getPath('build')
+    const base = `${this.url}/`
     const views = path.join(root, 'views')
 
     // Read `package.json` from the closest package.json, so we can emulate
@@ -138,11 +139,27 @@ export class AdminController extends Controller {
 
     return defineConfig(merge({
       root,
-      base: `${this.url}/`,
+      base,
       mode: this.mode,
       envFile: false,
       configFile: false,
-      plugins: [createVuePlugin(), createCommonJsPlugin()],
+      plugins: [
+        createVuePlugin(),
+        createCommonJsPlugin(),
+        {
+          // Private plugin to inject script tag above main module that loads
+          // the `dito` object through its own end-point, see `sendDitoObject()`
+          name: 'inject-dito-object',
+          transformIndexHtml: {
+            enforce: 'post',
+            transform(html) {
+              return html.replace(
+                /(\s*)(<script type="module"[^>]*?><\/script>)/,
+                `$1<script src="${base}dito.js"></script>$1$2`
+              )
+            }
+          }
+        }],
       build: {
         ...(development
           ? {}