@nocobase/app-server 2.0.0-beta.8 → 2.0.0-beta.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/drive/provider.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAGhE,qBAAa,aAAc,SAAQ,eAAe,CAAC,oBAAoB,CAAC;IACtE,SAAgB,IAAI,EAAE,MAAM,CAAgC;IAE5C,QAAQ,IAAI,IAAI;IAOV,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C,OAAO,CAAC,cAAc;
|
|
1
|
+
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/drive/provider.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAGhE,qBAAa,aAAc,SAAQ,eAAe,CAAC,oBAAoB,CAAC;IACtE,SAAgB,IAAI,EAAE,MAAM,CAAgC;IAE5C,QAAQ,IAAI,IAAI;IAOV,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C,OAAO,CAAC,cAAc;CAQvB"}
|
package/dist/drive/provider.js
CHANGED
|
@@ -13,7 +13,7 @@ export class DriveProvider extends ServiceProvider {
|
|
|
13
13
|
getDriveConfig() {
|
|
14
14
|
const config = this.app.config.get('drive');
|
|
15
15
|
const s3 = config.disks.s3;
|
|
16
|
-
if (s3?.driver !== 's3' || s3.bucket)
|
|
16
|
+
if (typeof s3 === 'function' || s3?.driver !== 's3' || s3.bucket)
|
|
17
17
|
return config;
|
|
18
18
|
const { s3: _s3, ...disks } = config.disks;
|
|
19
19
|
return { ...config, disks };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/drive/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,mBAAmB,GAEpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAG7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,OAAO,aAAc,SAAQ,eAAqC;IACtD,IAAI,GAAW,4BAA4B,CAAC;IAE5C,QAAQ;QACtB,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACpC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,iBAAiB,EAAE,GAAG,EAAE,CACnD,kBAAkB,CAAC,KAAK,CAAC,CAC1B,CAAC;IACJ,CAAC;IAEe,KAAK,CAAC,IAAI;QACxB,MAAM,mBAAmB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;IACnD,CAAC;IAEO,cAAc;QACpB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAiB,OAAO,CAAE,CAAC;QAC7D,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3B,IAAI,EAAE,EAAE,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC,MAAM;
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/drive/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,mBAAmB,GAEpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAG7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,OAAO,aAAc,SAAQ,eAAqC;IACtD,IAAI,GAAW,4BAA4B,CAAC;IAE5C,QAAQ;QACtB,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACpC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,iBAAiB,EAAE,GAAG,EAAE,CACnD,kBAAkB,CAAC,KAAK,CAAC,CAC1B,CAAC;IACJ,CAAC;IAEe,KAAK,CAAC,IAAI;QACxB,MAAM,mBAAmB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;IACnD,CAAC;IAEO,cAAc;QACpB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAiB,OAAO,CAAE,CAAC;QAC7D,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3B,IAAI,OAAO,EAAE,KAAK,UAAU,IAAI,EAAE,EAAE,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC,MAAM;YAC9D,OAAO,MAAM,CAAC;QAChB,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,KAAK,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC;QAC3C,OAAO,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,CAAC;IAC9B,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nocobase/app-server",
|
|
3
|
-
"version": "2.0.0-beta.
|
|
3
|
+
"version": "2.0.0-beta.9",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"prettier": "@nocobase/dev-config/prettier",
|
|
6
6
|
"engines": {
|
|
@@ -119,7 +119,7 @@
|
|
|
119
119
|
"openapi-types": "^12.1.3",
|
|
120
120
|
"@nocobase/app-websocket": "^0.0.2-beta.0",
|
|
121
121
|
"@nocobase/config": "^0.1.0-beta.3",
|
|
122
|
-
"@nocobase/drive": "^0.1.0-beta.
|
|
122
|
+
"@nocobase/drive": "^0.1.0-beta.7",
|
|
123
123
|
"@nocobase/logging": "^0.1.0-beta.7",
|
|
124
124
|
"@nocobase/realtime": "^0.1.0-beta.2",
|
|
125
125
|
"@nocobase/secrets": "^0.1.0-beta.1",
|