@steedos/server 3.0.0-beta.19 → 3.0.0-beta.21
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.
|
@@ -0,0 +1,149 @@
|
|
|
1
|
+
datasources:
|
|
2
|
+
default:
|
|
3
|
+
connection:
|
|
4
|
+
url: ${MONGO_URL}
|
|
5
|
+
objectFiles:
|
|
6
|
+
- "./steedos-app/**"
|
|
7
|
+
public:
|
|
8
|
+
NODE_ENV: ${NODE_ENV}
|
|
9
|
+
masterSpaceId: ${STEEDOS_TENANT_MASTER_ID}
|
|
10
|
+
amis:
|
|
11
|
+
map_ak: ${STEEDOS_AMIS_MAP_KEY}
|
|
12
|
+
map_vendor: ${STEEDOS_AMIS_MAP_VENDER}
|
|
13
|
+
cfs:
|
|
14
|
+
store: ${STEEDOS_CFS_STORE}
|
|
15
|
+
templateSpaceId: 'template'
|
|
16
|
+
enable_saas: ${STEEDOS_TENANT_ENABLE_SAAS}
|
|
17
|
+
use_open_api: ${STEEDOS_PUBLIC_USE_OPEN_API}
|
|
18
|
+
webservices:
|
|
19
|
+
jsreport:
|
|
20
|
+
url: ${JSREPORT_URL}
|
|
21
|
+
urlProvideForJsreport: ${JSREPORT_TO_ACQUIRE_DATA_URL}
|
|
22
|
+
app_exchange:
|
|
23
|
+
url: ${STEEDOS_APP_EXCHANGE_URL}
|
|
24
|
+
analytics:
|
|
25
|
+
enabled: ${STEEDOS_PUBLIC_ANALYTICS_ENABLED}
|
|
26
|
+
baidu:
|
|
27
|
+
id: ${STEEDOS_PUBLIC_ANALYTICS_BAIDU_ID}
|
|
28
|
+
posthog:
|
|
29
|
+
id: ${STEEDOS_PUBLIC_ANALYTICS_POSTHOG_ID}
|
|
30
|
+
api_host: ${STEEDOS_PUBLIC_ANALYTICS_POSTHOG_API_HOST}
|
|
31
|
+
workflow:
|
|
32
|
+
traceShowSignImage: ${STEEDOS_WORKFLOW_TRACE_SHOW_SIGN_IMAGE}
|
|
33
|
+
sentry:
|
|
34
|
+
enabled: ${STEEDOS_SENTRY_ENABLED}
|
|
35
|
+
dsn: ${STEEDOS_SENTRY_DSN}
|
|
36
|
+
vconsole:
|
|
37
|
+
url: ${STEEDOS_PUBLIC_SCRIPT_VCONSOLE}
|
|
38
|
+
accounts:
|
|
39
|
+
username_min_length: ${STEEDOS_ACCOUNT_USERNAME_MIN_LENGTH}
|
|
40
|
+
UTF8_Names_Validation: ${STEEDOS_ACCOUNT_NAME_VALIDATION}
|
|
41
|
+
enable_query_auth: ${STEEDOS_ENABLE_QUERY_AUTH}
|
|
42
|
+
cfs:
|
|
43
|
+
store: ${STEEDOS_CFS_STORE}
|
|
44
|
+
local:
|
|
45
|
+
folder: ${STEEDOS_STORAGE_DIR}
|
|
46
|
+
aliyun:
|
|
47
|
+
region: ${STEEDOS_CFS_ALIYUN_REGION}
|
|
48
|
+
bucket: ${STEEDOS_CFS_ALIYUN_BUCKET}
|
|
49
|
+
folder: ${STEEDOS_CFS_ALIYUN_FOLDER}
|
|
50
|
+
accessKeyId: ${STEEDOS_CFS_ALIYUN_ACCESSKEYID}
|
|
51
|
+
secretAccessKey: ${STEEDOS_CFS_ALIYUN_SECRETACCESSKEY}
|
|
52
|
+
aws:
|
|
53
|
+
region: ${STEEDOS_CFS_AWS_S3_REGION}
|
|
54
|
+
endpoint: ${STEEDOS_CFS_AWS_S3_ENDPOINT}
|
|
55
|
+
bucket: ${STEEDOS_CFS_AWS_S3_BUCKET}
|
|
56
|
+
accessKeyId: ${STEEDOS_CFS_AWS_S3_ACCESS_KEY_ID}
|
|
57
|
+
secretAccessKey: ${STEEDOS_CFS_AWS_S3_SECRET_ACCESS_KEY}
|
|
58
|
+
s3ForcePathStyle: ${STEEDOS_CFS_AWS_S3_FORCE_PATH_STYLE}
|
|
59
|
+
signatureVersion: ${STEEDOS_CFS_AWS_S3_SIGNATURE_VERSION}
|
|
60
|
+
steedosCloud:
|
|
61
|
+
region: ${STEEDOS_CFS_CLOUD_REGION}
|
|
62
|
+
bucket: ${STEEDOS_CFS_CLOUD_BUCKET}
|
|
63
|
+
endpoint: ${STEEDOS_CFS_CLOUD_ENDPOINT}
|
|
64
|
+
accessKeyId: ${STEEDOS_CFS_CLOUD_ACCESSKEYID}
|
|
65
|
+
secretAccessKey: ${STEEDOS_CFS_CLOUD_SECRETACCESSKEY}
|
|
66
|
+
tenant:
|
|
67
|
+
_id: ${STEEDOS_TENANT_ID}
|
|
68
|
+
name: 华炎魔方
|
|
69
|
+
logo_url: ${STEEDOS_TENANT_LOGO_URL}
|
|
70
|
+
logo_square_url: ${STEEDOS_TENANT_LOGO_SQUARE_URL}
|
|
71
|
+
background_url: ${STEEDOS_TENANT_BACKGROUND_URL}
|
|
72
|
+
enable_activation: ${STEEDOS_TENANT_ENABLE_ACTIVATION} # 启用初始化向导
|
|
73
|
+
enable_register: ${STEEDOS_TENANT_ENABLE_REGISTER} # 启用注册功能 true / false
|
|
74
|
+
enable_forget_password: ${STEEDOS_TENANT_ENABLE_FORGET_PASSWORD}
|
|
75
|
+
enable_create_tenant: ${STEEDOS_TENANT_ENABLE_SAAS}
|
|
76
|
+
enable_password_login: ${STEEDOS_TENANT_ENABLE_PASSWORD_LOGIN}
|
|
77
|
+
enable_mobile_code_login: ${STEEDOS_TENANT_ENABLE_MOBILE_CODE_LOGIN}
|
|
78
|
+
enable_email_code_login: ${STEEDOS_TENANT_ENABLE_EMAIL_CODE_LOGIN}
|
|
79
|
+
enable_bind_email: ${STEEDOS_TENANT_ENABLE_BIND_EMAIL}
|
|
80
|
+
enable_bind_mobile: ${STEEDOS_TENANT_ENABLE_BIND_MOBILE}
|
|
81
|
+
tokenSecret: ${STEEDOS_TENANT_TOKEN_SECRET} # 默认值 43位字符串, 每次重启服务时生成新的值
|
|
82
|
+
accessTokenExpiresIn: ${STEEDOS_TENANT_ACCESS_TOKEN_EXPIRES_IN} # 默认值 90d
|
|
83
|
+
refreshTokenExpiresIn: ${STEEDOS_TENANT_REFRESH_TOKEN_EXPIRES_IN} # 默认值 7d
|
|
84
|
+
sms:
|
|
85
|
+
qcloud:
|
|
86
|
+
smsqueue_interval: ${STEEDOS_CRON_SMSQUEUE_INTERVAL}
|
|
87
|
+
sdkappid: ${STEEDOS_SMS_QCLOUD_SDKAPPID}
|
|
88
|
+
appkey: ${STEEDOS_SMS_QCLOUD_APPKEY}
|
|
89
|
+
signname: ${STEEDOS_SMS_QCLOUD_SIGNNAME}
|
|
90
|
+
email:
|
|
91
|
+
from: ${STEEDOS_EMAIL_FROM}
|
|
92
|
+
url: ${STEEDOS_EMAIL_URL}
|
|
93
|
+
host: ${STEEDOS_EMAIL_HOST}
|
|
94
|
+
port: ${STEEDOS_EMAIL_PORT}
|
|
95
|
+
username: ${STEEDOS_EMAIL_USERNAME}
|
|
96
|
+
password: ${STEEDOS_EMAIL_PASSWORD}
|
|
97
|
+
secure: ${STEEDOS_EMAIL_PASSWORD}
|
|
98
|
+
signname: ${STEEDOS_EMAIL_SIGNNAME}
|
|
99
|
+
cron:
|
|
100
|
+
enabled: ${STEEDOS_CRON_ENABLED}
|
|
101
|
+
instancerecordqueue_interval: ${STEEDOS_CRON_INSTANCERECORDQUEUE_INTERVAL}
|
|
102
|
+
mailqueue_interval: ${STEEDOS_CRON_MAILQUEUE_INTERVAL}
|
|
103
|
+
push_interval: ${STEEDOS_CRON_PUSH_INTERVAL}
|
|
104
|
+
webhookqueue_interval: ${STEEDOS_CRON_WEBHOOKQUEUE_INTERVAL}
|
|
105
|
+
build_index: ${STEEDOS_CRON_BUILD_INDEX}
|
|
106
|
+
objectwebhooksqueue_interval: ${STEEDOS_CRON_OBJECTWEBHOOKSQUEUE_INTERVAL}
|
|
107
|
+
workflow_rule_interval: ${STEEDOS_CRON_WORKFLOW_RULE}
|
|
108
|
+
instances_stat:
|
|
109
|
+
schedule: ${STEEDOS_INSTANCES_STAT_SCHEDULE}
|
|
110
|
+
dingtalk:
|
|
111
|
+
api_Key: ${APIKEY}
|
|
112
|
+
log_path: ${DING_LOGPATH}
|
|
113
|
+
qywx:
|
|
114
|
+
api_Key: ${APIKEY}
|
|
115
|
+
log_path: ${QYWX_LOGPATH}
|
|
116
|
+
push:
|
|
117
|
+
apn:
|
|
118
|
+
keyData: ${STEEDOS_PUSH_APN_DATA}
|
|
119
|
+
certData: ${STEEDOS_PUSH_APN_DATA}
|
|
120
|
+
gcm:
|
|
121
|
+
apiKey: ${STEEDOS_GCM_APIKEY}
|
|
122
|
+
projectNumber: ${STEEDOS_GCM_PROJECT_NUMBER}
|
|
123
|
+
xinge:
|
|
124
|
+
accessId: ${STEEDOS_PUSH_XINGE_ACCESSID}
|
|
125
|
+
secretKey: ${STEEDOS_PUSH_XINGE_SECRETKEY}
|
|
126
|
+
huawei:
|
|
127
|
+
appId: ${STEEDOS_PUSH_HUAWEI_APPID}
|
|
128
|
+
appSecret: ${STEEDOS_PUSH_HUAWEI_APPSECRET}
|
|
129
|
+
appPkgName: ${STEEDOS_PUSH_HUAWEI_APPPKGNAME}
|
|
130
|
+
debug: ${STEEDOS_PUSH_HUAWEI_DEBUG}
|
|
131
|
+
mi:
|
|
132
|
+
appSecret: ${STEEDOS_PUSH_MI_APPSECRET}
|
|
133
|
+
production: ${STEEDOS_PUSH_MI_PRODUCTION}
|
|
134
|
+
pay:
|
|
135
|
+
weixin:
|
|
136
|
+
appid: ${PAY_WEIXIN_APPID}
|
|
137
|
+
mch_id: ${PAY_WEIXIN_MCH_ID}
|
|
138
|
+
partner_key: ${PAY_WEIXIN_PARTNER_KEY}
|
|
139
|
+
sso:
|
|
140
|
+
oidc:
|
|
141
|
+
config_url: ${STEEDOS_IDENTITY_OIDC_CONFIG_URL}
|
|
142
|
+
client_id: ${STEEDOS_IDENTITY_OIDC_CLIENT_ID}
|
|
143
|
+
client_secret: ${STEEDOS_IDENTITY_OIDC_CLIENT_SECRET}
|
|
144
|
+
name: ${STEEDOS_IDENTITY_OIDC_NAME}
|
|
145
|
+
label: ${STEEDOS_IDENTITY_OIDC_LABEL}
|
|
146
|
+
logo: ${STEEDOS_IDENTITY_OIDC_LOGO}
|
|
147
|
+
require_local_account: ${STEEDOS_IDENTITY_OIDC_REQUIRE_LOCAL_ACCOUNT}
|
|
148
|
+
db:
|
|
149
|
+
auto_migrate: ${STEEDOS_DB_AUTO_MIGRATE}
|
package/dist/config/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAiBA,oCAEC;AAED,8CAEC;AAhBD,sEAA6C;AAE7C,yDAA0D;AAAjD,wHAAA,mBAAmB,OAAA;AAEf,QAAA,aAAa,GAAG,wBAAa,CAAC,gBAAgB,EAAE,CAAC;AAE9D,MAAM,CAAC,OAAO,GAAG;IACf,QAAQ,EAAE,qBAAa,CAAC,QAAQ;CACjC,CAAC;AAEF,SAAsB,YAAY;;QAChC,OAAO,EAAE,CAAC;IACZ,CAAC;CAAA;AAED,SAAgB,iBAAiB;IAC/B,OAAO,qBAAa,CAAC;AACvB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"moleculler.config.js","sourceRoot":"","sources":["../../src/config/moleculler.config.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"moleculler.config.js","sourceRoot":"","sources":["../../src/config/moleculler.config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.steedosConfig = void 0;
|
|
4
7
|
exports.isObject = isObject;
|
|
@@ -6,11 +9,16 @@ exports.isFunction = isFunction;
|
|
|
6
9
|
exports.isPlainObject = isPlainObject;
|
|
7
10
|
exports.isJsonMap = isJsonMap;
|
|
8
11
|
const lodash_1 = require("lodash");
|
|
12
|
+
const dotenv_flow_1 = __importDefault(require("dotenv-flow"));
|
|
13
|
+
dotenv_flow_1.default.config({
|
|
14
|
+
path: process.cwd(),
|
|
15
|
+
silent: true,
|
|
16
|
+
});
|
|
9
17
|
const path = require("path");
|
|
10
18
|
const fs = require("fs");
|
|
11
19
|
const clone = require("clone");
|
|
12
|
-
const validator = require(
|
|
13
|
-
const yaml = require(
|
|
20
|
+
const validator = require("validator");
|
|
21
|
+
const yaml = require("js-yaml");
|
|
14
22
|
function calcString(str, content = process.env) {
|
|
15
23
|
if (!(0, lodash_1.isString)(str)) {
|
|
16
24
|
return str;
|
|
@@ -18,12 +26,15 @@ function calcString(str, content = process.env) {
|
|
|
18
26
|
let calcFun = null;
|
|
19
27
|
var reg = /(\${[^{}]*\})/g;
|
|
20
28
|
let rev = str.replace(reg, function (m, $1) {
|
|
21
|
-
return $1.replace(/\{\s*/,
|
|
29
|
+
return $1.replace(/\{\s*/, '{args["').replace(/\s*\}/, '"]}');
|
|
22
30
|
});
|
|
23
31
|
eval(`calcFun = function(args){return \`${rev}\`}`);
|
|
24
32
|
let val = calcFun.call({}, content);
|
|
25
33
|
if ((0, lodash_1.isString)(val) && val) {
|
|
26
|
-
return val
|
|
34
|
+
return val
|
|
35
|
+
.replace(/\\r/g, "\r")
|
|
36
|
+
.replace(/\\n/g, "\n")
|
|
37
|
+
.replace(/undefined/g, "");
|
|
27
38
|
}
|
|
28
39
|
else {
|
|
29
40
|
return null;
|
|
@@ -38,14 +49,22 @@ function calcSteedosConfig(config) {
|
|
|
38
49
|
}
|
|
39
50
|
else {
|
|
40
51
|
config[k] = calcString(v);
|
|
41
|
-
if (k &&
|
|
52
|
+
if (k &&
|
|
53
|
+
(0, lodash_1.isString)(k) &&
|
|
54
|
+
k.startsWith("enable_") &&
|
|
55
|
+
config[k] &&
|
|
56
|
+
(0, lodash_1.isString)(config[k])) {
|
|
42
57
|
config[k] = validator.toBoolean(config[k], true);
|
|
43
58
|
}
|
|
44
59
|
}
|
|
45
60
|
}
|
|
46
61
|
else {
|
|
47
62
|
config[k] = calcString(v);
|
|
48
|
-
if (k &&
|
|
63
|
+
if (k &&
|
|
64
|
+
(0, lodash_1.isString)(k) &&
|
|
65
|
+
k.startsWith("enable_") &&
|
|
66
|
+
config[k] &&
|
|
67
|
+
(0, lodash_1.isString)(config[k])) {
|
|
49
68
|
config[k] = validator.toBoolean(config[k], true);
|
|
50
69
|
}
|
|
51
70
|
}
|
|
@@ -54,7 +73,7 @@ function calcSteedosConfig(config) {
|
|
|
54
73
|
}
|
|
55
74
|
class SteedosConfig {
|
|
56
75
|
static loadDefaultSettings() {
|
|
57
|
-
const filePath = path.join(__dirname,
|
|
76
|
+
const filePath = path.join(__dirname, "..", "..", "default.steedos.settings.yml");
|
|
58
77
|
if (fs.existsSync(filePath) && !fs.statSync(filePath).isDirectory()) {
|
|
59
78
|
return SteedosConfig.loadSettings(filePath);
|
|
60
79
|
}
|
|
@@ -63,7 +82,7 @@ class SteedosConfig {
|
|
|
63
82
|
}
|
|
64
83
|
}
|
|
65
84
|
static loadProjectSettings() {
|
|
66
|
-
let configPath = path.join(process.cwd(),
|
|
85
|
+
let configPath = path.join(process.cwd(), "steedos-config.yml");
|
|
67
86
|
if (fs.existsSync(configPath) && !fs.statSync(configPath).isDirectory()) {
|
|
68
87
|
return SteedosConfig.loadSettings(configPath);
|
|
69
88
|
}
|
|
@@ -78,7 +97,7 @@ class SteedosConfig {
|
|
|
78
97
|
const _defaultConfig = (0, lodash_1.defaultsDeep)({}, { settings: defaultSettings });
|
|
79
98
|
const res = (0, lodash_1.cloneDeep)(_defaultConfig);
|
|
80
99
|
const mods = (0, lodash_1.cloneDeep)(_projectConfig);
|
|
81
|
-
Object.keys(mods).forEach(key => {
|
|
100
|
+
Object.keys(mods).forEach((key) => {
|
|
82
101
|
if (["created", "started", "stopped"].indexOf(key) !== -1) {
|
|
83
102
|
const functionArray = SteedosConfig.mergeSchemaLifecycleHandlers(mods[key], res[key]);
|
|
84
103
|
if (functionArray.length > 0) {
|
|
@@ -105,7 +124,7 @@ class SteedosConfig {
|
|
|
105
124
|
}
|
|
106
125
|
SteedosConfig.loadSettings = (filePath) => {
|
|
107
126
|
try {
|
|
108
|
-
const settings = yaml.load(fs.readFileSync(filePath,
|
|
127
|
+
const settings = yaml.load(fs.readFileSync(filePath, "utf8"));
|
|
109
128
|
if (settings.env) {
|
|
110
129
|
(0, lodash_1.each)(settings.env, function (item, key) {
|
|
111
130
|
process.env[key] = calcString(item);
|
|
@@ -113,7 +132,11 @@ SteedosConfig.loadSettings = (filePath) => {
|
|
|
113
132
|
}
|
|
114
133
|
let emailConfig = settings.email;
|
|
115
134
|
if (emailConfig) {
|
|
116
|
-
if (!emailConfig.url &&
|
|
135
|
+
if (!emailConfig.url &&
|
|
136
|
+
emailConfig.host &&
|
|
137
|
+
emailConfig.port &&
|
|
138
|
+
emailConfig.username &&
|
|
139
|
+
emailConfig.password) {
|
|
117
140
|
let url = `smtps://${emailConfig.username}:${emailConfig.password}@${emailConfig.host}:${emailConfig.port}/`;
|
|
118
141
|
emailConfig.url = url;
|
|
119
142
|
}
|
|
@@ -133,18 +156,18 @@ SteedosConfig.loadSettings = (filePath) => {
|
|
|
133
156
|
return res;
|
|
134
157
|
}
|
|
135
158
|
catch (error) {
|
|
136
|
-
console.error(
|
|
159
|
+
console.error("loadFile error", filePath, error);
|
|
137
160
|
}
|
|
138
161
|
};
|
|
139
162
|
exports.default = SteedosConfig;
|
|
140
163
|
function isObject(value) {
|
|
141
|
-
return value != null && (typeof value ===
|
|
164
|
+
return (value != null && (typeof value === "object" || typeof value === "function"));
|
|
142
165
|
}
|
|
143
166
|
function isFunction(value) {
|
|
144
|
-
return typeof value ===
|
|
167
|
+
return typeof value === "function";
|
|
145
168
|
}
|
|
146
169
|
function isPlainObject(value) {
|
|
147
|
-
const isObjectObject = (o) => isObject(o) && Object.prototype.toString.call(o) ===
|
|
170
|
+
const isObjectObject = (o) => isObject(o) && Object.prototype.toString.call(o) === "[object Object]";
|
|
148
171
|
if (!isObjectObject(value))
|
|
149
172
|
return false;
|
|
150
173
|
const ctor = value.constructor;
|
|
@@ -152,7 +175,7 @@ function isPlainObject(value) {
|
|
|
152
175
|
return false;
|
|
153
176
|
if (!isObjectObject(ctor.prototype))
|
|
154
177
|
return false;
|
|
155
|
-
if (!ctor.prototype.hasOwnProperty(
|
|
178
|
+
if (!ctor.prototype.hasOwnProperty("isPrototypeOf"))
|
|
156
179
|
return false;
|
|
157
180
|
return true;
|
|
158
181
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"steedos.config.js","sourceRoot":"","sources":["../../src/config/steedos.config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"steedos.config.js","sourceRoot":"","sources":["../../src/config/steedos.config.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/server",
|
|
3
|
-
"version": "3.0.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.21",
|
|
4
4
|
"description": "",
|
|
5
5
|
"author": "",
|
|
6
6
|
"license": "AGPL-3.0-only",
|
|
7
7
|
"files": [
|
|
8
8
|
"dist",
|
|
9
9
|
"public",
|
|
10
|
-
"views"
|
|
10
|
+
"views",
|
|
11
|
+
"app.config.js",
|
|
12
|
+
"default.steedos.settings.yml",
|
|
13
|
+
"dist"
|
|
11
14
|
],
|
|
12
15
|
"main": "app.config.js",
|
|
13
16
|
"scripts": {
|
|
@@ -20,10 +23,10 @@
|
|
|
20
23
|
"dependencies": {
|
|
21
24
|
"@builder6/server": "^0.16.3-alpha.10",
|
|
22
25
|
"@steedos/ee_unpkg": "1.0.0",
|
|
23
|
-
"@steedos/service-community": "3.0.0-beta.
|
|
26
|
+
"@steedos/service-community": "3.0.0-beta.21",
|
|
24
27
|
"@steedos/service-enterprise": "^3.0.0",
|
|
25
28
|
"@steedos/service-license": "2.5.49",
|
|
26
|
-
"@steedos/webapp": "3.0.0-beta.
|
|
29
|
+
"@steedos/webapp": "3.0.0-beta.21"
|
|
27
30
|
},
|
|
28
31
|
"devDependencies": {
|
|
29
32
|
"@nestjs/cli": "^11.0.0",
|
|
@@ -68,5 +71,5 @@
|
|
|
68
71
|
"publishConfig": {
|
|
69
72
|
"access": "public"
|
|
70
73
|
},
|
|
71
|
-
"gitHead": "
|
|
74
|
+
"gitHead": "32e9995fdf155892ba258a4b1e69fdae12f5dbed"
|
|
72
75
|
}
|