@opengis/cms 0.0.15 → 0.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/cms",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "cms",
   "type": "module",
   "author": "Softpro",
@@ -22,10 +22,10 @@
     "dev": "node server --cms=cms/softpro"
   },
   "dependencies": {
-    "@opengis/admin": "0.3.109",
+    "@opengis/admin": "0.4.4",
     "@opengis/fastify-auth": "1.1.0",
-    "@opengis/fastify-file": "1.1.1",
-    "@opengis/fastify-table": "1.4.1",
+    "@opengis/fastify-file": "1.1.2",
+    "@opengis/fastify-table": "1.4.5",
     "@opengis/v3-core": "0.3.190",
     "@opengis/v3-filter": "0.0.74",
     "@vitejs/plugin-vue": "5.0.4",
@@ -42,6 +42,9 @@
     "vue-i18n": "11.1.5",
     "vue-router": "4.4.3"
   },
+  "overrides": {
+    "@opengis/fastify-table": "1.4.5"
+  },
   "devDependencies": {
     "@parcel/watcher": "2.4.1",
     "@tailwindcss/typography": "0.5.10",
@@ -58,4 +61,4 @@
     "vite": "5.1.4",
     "vue-tsc": "1.8.27"
   }
-}
+}

package/plugin.js

@@ -1,11 +1,36 @@
+import path from 'node:path';
+import { fileURLToPath } from 'url';
+import { existsSync, readFileSync } from 'node:fs';
+
 import { config, execMigrations } from '@opengis/fastify-table/utils.js';
 
-export default async function (fastify) {
+const dirname = path.dirname(fileURLToPath(import.meta.url));
+
+// cross-env cms=cms/softpro npm start
+if (process.argv.find(el => el.includes('--cms'))) {
+  const subdir = process.argv.find(el => el.includes('--cms')).substring(6);
+  const cmsDir = path.join(dirname, '..', subdir).replace(/\\/g, '/'); // from app.js
+
+  const cmsConfig = existsSync(path.join(cmsDir, 'setting.json'))
+    ? JSON.parse(readFileSync(path.join(cmsDir, 'setting.json'), 'utf8'))
+    : {};
+
+  config.auth = config.auth || cmsConfig.auth;
+  config.pg = cmsConfig.pg;
+  config.cms = cmsConfig.cms || {};
+  config.cms.root = cmsDir;
+  config.folder = path.posix.join(config.folder || '', config.cms.folder || subdir);
+}
 
-  // API  
-  fastify.register(import('./server/routes/builder/index.mjs'), config);
-  fastify.register(import('./server/routes/category/index.mjs'), config);
-  fastify.register(import('./server/routes/manager/index.mjs'), config);
-  // fastify.register(import('./server/routes/media/index.mjs'), config);
-  // execMigrations(path.join(cwd, './server/migrations')).catch(err => console.log(err));
+export default async function (app, opts = config) {
+  const { prefix = '/api' } = opts;
+  if (!opts.pg || opts.cms?.provider === 'file') {
+    app.register(import('./server/routes/fileContent/index.mjs'), { prefix });
+  } else {
+    app.register(import('./server/routes/cms/index.mjs'), { prefix });
+    app.register(import('./server/routes/contentType/index.mjs'), { prefix });
+    app.register(import('./server/routes/category/index.mjs'), { prefix });
+    const pg = await getPGAsync(opts.pg);
+    execMigrations(path.join(dirname, 'migrations'), pg).catch(err => console.log(err));
+  }
 }

package/server/app.js

@@ -1,50 +1,18 @@
-import path from 'node:path';
-import { fileURLToPath } from 'url';
-import { existsSync, readFileSync } from 'node:fs';
-
-import { config, pgClients, execMigrations, getPGAsync } from '@opengis/fastify-table/utils.js';
-
-const dirname = path.dirname(fileURLToPath(import.meta.url));
-
-// cross-env cms=cms/softpro npm start
-if (process.argv.find(el => el.includes('--cms'))) {
-  const subdir = process.argv.find(el => el.includes('--cms')).substring(6);
-  const cmsDir = path.join(dirname, '..', subdir).replace(/\\/g, '/'); // from app.js
-
-  const cmsConfig = existsSync(path.join(cmsDir, 'setting.json'))
-    ? JSON.parse(readFileSync(path.join(cmsDir, 'setting.json'), 'utf8'))
-    : {};
-
-  config.auth = config.auth || cmsConfig.auth;
-  config.pg = cmsConfig.pg;
-  config.cms = cmsConfig.cms || {};
-  config.cms.root = cmsDir;
-  config.folder = path.posix.join(config.folder || '', config.cms.folder || subdir);
-}
+import { config } from '@opengis/fastify-table/utils.js';
 
 config.prefix = config.prefix || '/api';
-const { prefix } = config;
 
-export default async function (fastify) {
+export default async function (app) {
   // core
-  fastify.register(import('./plugins/adminHook.js'));
-  fastify.register(import('./plugins/hook.js'));
+  app.register(import('./plugins/adminHook.js'));
+  app.register(import('./plugins/hook.js'));
 
-  fastify.register(import('@opengis/fastify-table'), config);
+  app.register(import('@opengis/fastify-table'), config);
   // fastify.register(import('@opengis/fastify-auth'), config);
-  fastify.register(import('@opengis/fastify-file'), config);
+  app.register(import('@opengis/fastify-file'), config);
 
-  fastify.register(import('./plugins/vite.js'));
+  app.register(import('./plugins/vite.js'));
   // API
-  fastify.register(import('./routes/root.mjs'));
-
-  if (!config.pg || config.cms?.provider === 'file') {
-    fastify.register(import('./routes/fileContent/index.mjs'), { prefix });
-  } else {
-    fastify.register(import('./routes/cms/index.mjs'), { prefix });
-    fastify.register(import('./routes/contentType/index.mjs'), { prefix });
-    fastify.register(import('./routes/category/index.mjs'), { prefix });
-    const pg = await getPGAsync(config.pg);
-    execMigrations(path.join(dirname, 'migrations'), pg).catch(err => console.log(err));
-  }
+  app.register(import('./routes/root.mjs'));
+  app.register(import('../plugin.js'));
 }