@nocobase/app 1.9.0-beta.8 → 2.0.0-alpha.10

package/lib/config/cache.d.ts

@@ -6,14 +6,5 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-export declare const cacheManager: Partial<{
-    defaultStore: string;
-    stores: {
-        [storeType: string]: {
-            [key: string]: any;
-            store?: "memory" | import("cache-manager").FactoryStore<import("cache-manager").Store, any>;
-            close?: (store: import("cache-manager").Store) => Promise<void>;
-        };
-    };
-    prefix: string;
-}>;
+import { CacheManagerOptions } from '@nocobase/cache';
+export declare const cacheManager: CacheManagerOptions;

package/lib/config/cache.js

@@ -29,6 +29,7 @@ __export(cache_exports, {
   cacheManager: () => cacheManager
 });
 module.exports = __toCommonJS(cache_exports);
+const redisURL = process.env.REDIS_URL || process.env.CACHE_REDIS_URL;
 const cacheManager = {
   defaultStore: process.env.CACHE_DEFAULT_STORE || "memory",
   stores: {
@@ -36,9 +37,9 @@ const cacheManager = {
       store: "memory",
       max: parseInt(process.env.CACHE_MEMORY_MAX) || 2e3
     },
-    ...process.env.CACHE_REDIS_URL ? {
+    ...redisURL ? {
       redis: {
-        url: process.env.CACHE_REDIS_URL
+        url: redisURL
       }
     } : {}
   }

package/lib/config/index.d.ts

@@ -6,24 +6,5 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-export declare function getConfig(): Promise<{
-    database: import("@nocobase/database").IDatabaseOptions;
-    resourcer: {
-        prefix: string;
-    };
-    plugins: import("@nocobase/server").PluginConfiguration[];
-    cacheManager: Partial<{
-        defaultStore: string;
-        stores: {
-            [storeType: string]: {
-                [key: string]: any;
-                store?: "memory" | import("cache-manager").FactoryStore<import("cache-manager").Store, any>;
-                close?: (store: import("cache-manager").Store) => Promise<void>;
-            };
-        };
-        prefix: string;
-    }>;
-    logger: import("@nocobase/server").AppLoggerOptions;
-    telemetry: import("@nocobase/server").AppTelemetryOptions;
-    perfHooks: boolean;
-}>;
+import { ApplicationOptions } from '@nocobase/server';
+export declare function getConfig(): Promise<ApplicationOptions>;

package/lib/config/index.js

@@ -49,6 +49,9 @@ var import_telemetry = require("./telemetry");
 async function getConfig() {
   return {
     database: await (0, import_database.parseDatabaseOptions)(),
+    redisConfig: {
+      connectionString: process.env.REDIS_URL
+    },
     resourcer: import_resourcer.default,
     plugins: import_plugins.default,
     cacheManager: import_cache.cacheManager,

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@nocobase/app",
-  "version": "1.9.0-beta.8",
+  "version": "2.0.0-alpha.10",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/database": "1.9.0-beta.8",
-    "@nocobase/preset-nocobase": "1.9.0-beta.8",
-    "@nocobase/server": "1.9.0-beta.8"
+    "@nocobase/database": "2.0.0-alpha.10",
+    "@nocobase/preset-nocobase": "2.0.0-alpha.10",
+    "@nocobase/server": "2.0.0-alpha.10"
   },
   "devDependencies": {
-    "@nocobase/client": "1.9.0-beta.8"
+    "@nocobase/client": "2.0.0-alpha.10"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/app"
   },
-  "gitHead": "f3d4f3d1ba7adbf4d4c60e656c23da45565769c8"
+  "gitHead": "6422cfb6fa6c8450de2efa3294fd29a28b228990"
 }

package/src/config/cache.ts

@@ -9,19 +9,20 @@
 
 import { CacheManagerOptions } from '@nocobase/cache';
 
-export const cacheManager = {
+const redisURL = process.env.REDIS_URL || process.env.CACHE_REDIS_URL;
+export const cacheManager: CacheManagerOptions = {
   defaultStore: process.env.CACHE_DEFAULT_STORE || 'memory',
   stores: {
     memory: {
       store: 'memory',
       max: parseInt(process.env.CACHE_MEMORY_MAX) || 2000,
     },
-    ...(process.env.CACHE_REDIS_URL
+    ...(redisURL
       ? {
           redis: {
-            url: process.env.CACHE_REDIS_URL,
+            url: redisURL,
           },
         }
       : {}),
   },
-} as CacheManagerOptions;
+};

package/src/config/index.ts

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+import { ApplicationOptions } from '@nocobase/server';
 import { cacheManager } from './cache';
 import { parseDatabaseOptions } from './database';
 import logger from './logger';
@@ -14,9 +15,12 @@ import plugins from './plugins';
 import resourcer from './resourcer';
 import { telemetry } from './telemetry';
 
-export async function getConfig() {
+export async function getConfig(): Promise<ApplicationOptions> {
   return {
     database: await parseDatabaseOptions(),
+    redisConfig: {
+      connectionString: process.env.REDIS_URL,
+    },
     resourcer,
     plugins,
     cacheManager,