@fecommunity/reactpress-server 4.0.0-beta.10 → 4.0.0-beta.12
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.
- package/bin/reactpress-server.js +19 -0
- package/dist/app.module.js +5 -5
- package/dist/app.module.js.map +1 -1
- package/dist/main.d.ts +2 -0
- package/dist/main.js +2 -0
- package/dist/main.js.map +1 -1
- package/dist/modules/extension/extension.module.js +3 -1
- package/dist/modules/extension/extension.module.js.map +1 -1
- package/dist/modules/extension/plugin.controller.d.ts +7 -7
- package/dist/modules/extension/preview-draft.store.d.ts +1 -1
- package/dist/modules/extension/preview-draft.store.js +1 -1
- package/dist/modules/extension/preview-draft.store.js.map +1 -1
- package/dist/modules/extension/theme-registry.bridge.js +23 -1
- package/dist/modules/extension/theme-registry.bridge.js.map +1 -1
- package/dist/modules/extension/theme.controller.d.ts +8 -8
- package/dist/modules/extension/theme.service.d.ts +1 -1
- package/dist/modules/extension/theme.service.js +19 -19
- package/dist/modules/extension/theme.service.js.map +1 -1
- package/dist/modules/setting/setting.constant.d.ts +1 -1
- package/dist/modules/setting/setting.constant.js +3 -3
- package/dist/modules/setting/setting.constant.js.map +1 -1
- package/dist/modules/setting/setting.service.js +9 -9
- package/dist/modules/setting/setting.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/utils/theme-placeholder-cover.d.ts +2 -3
- package/dist/utils/theme-placeholder-cover.js.map +1 -1
- package/package.json +2 -2
package/bin/reactpress-server.js
CHANGED
|
@@ -154,6 +154,22 @@ function startWithPM2() {
|
|
|
154
154
|
}
|
|
155
155
|
}
|
|
156
156
|
|
|
157
|
+
// Function to prepend bundled runtime paths so sibling toolkit/ can resolve server/node_modules.
|
|
158
|
+
function prependNodePath(...dirs) {
|
|
159
|
+
const Module = require('module');
|
|
160
|
+
const sep = path.delimiter;
|
|
161
|
+
const parts = (process.env.NODE_PATH || '').split(sep).filter(Boolean);
|
|
162
|
+
for (const dir of dirs) {
|
|
163
|
+
if (fs.existsSync(dir) && !parts.includes(dir)) {
|
|
164
|
+
parts.unshift(dir);
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
if (parts.length) {
|
|
168
|
+
process.env.NODE_PATH = parts.join(sep);
|
|
169
|
+
Module._initPaths();
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
|
|
157
173
|
// Function to start with regular Node.js
|
|
158
174
|
function startWithNode() {
|
|
159
175
|
// Check if the server is built
|
|
@@ -186,6 +202,9 @@ function startWithNode() {
|
|
|
186
202
|
// Set environment variables
|
|
187
203
|
process.env.NODE_ENV = process.env.NODE_ENV || 'production';
|
|
188
204
|
|
|
205
|
+
// Bundled CLI layout: toolkit/ is a sibling of server/; expose server deps to toolkit requires.
|
|
206
|
+
prependNodePath(path.join(serverDir, 'node_modules'));
|
|
207
|
+
|
|
189
208
|
// Import and run the server (require() alone does not invoke main — see dist/main.js)
|
|
190
209
|
try {
|
|
191
210
|
const mainModule = require(distPath);
|
package/dist/app.module.js
CHANGED
|
@@ -7,9 +7,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.AppModule = void 0;
|
|
10
|
-
const
|
|
10
|
+
const config_1 = require("../../toolkit/dist/config");
|
|
11
11
|
const common_1 = require("@nestjs/common");
|
|
12
|
-
const
|
|
12
|
+
const config_2 = require("@nestjs/config");
|
|
13
13
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
14
14
|
const typeorm_options_1 = require("./database/typeorm-options");
|
|
15
15
|
const api_key_module_1 = require("./modules/api-key/api-key.module");
|
|
@@ -35,10 +35,10 @@ let AppModule = class AppModule {
|
|
|
35
35
|
AppModule = __decorate([
|
|
36
36
|
(0, common_1.Module)({
|
|
37
37
|
imports: [
|
|
38
|
-
|
|
38
|
+
config_2.ConfigModule.forRoot({ isGlobal: true, envFilePath: [config_1.config.file] }),
|
|
39
39
|
typeorm_1.TypeOrmModule.forRootAsync({
|
|
40
|
-
imports: [
|
|
41
|
-
inject: [
|
|
40
|
+
imports: [config_2.ConfigModule],
|
|
41
|
+
inject: [config_2.ConfigService],
|
|
42
42
|
useFactory: async (configService) => (0, typeorm_options_1.createTypeOrmOptions)(configService),
|
|
43
43
|
}),
|
|
44
44
|
user_module_1.UserModule,
|
package/dist/app.module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;AACA,sDAAgE;AAChE,2CAAwC;AACxC,2CAA6D;AAC7D,6CAAgD;AAEhD,gEAAkE;AAClE,qEAAgE;AAEhE,qEAAiE;AAEjE,4DAAwD;AAExD,wEAAoE;AAEpE,qEAAiE;AACjE,2EAAuE;AAEvE,4DAAwD;AACxD,kEAA8D;AAC9D,4DAAwD;AAExD,2EAAuE;AAEvE,4DAAwD;AAExD,kEAA8D;AAE9D,qEAAiE;AAEjE,4DAAwD;AAExD,yDAAqD;AAErD,4DAAwD;AAExD,4DAAwD;AACxD,qEAAiE;AAgC1D,IAAM,SAAS,GAAf,MAAM,SAAS;CAAG,CAAA;AAAZ,SAAS;IA9BrB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,qBAAY,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,eAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACpE,uBAAa,CAAC,YAAY,CAAC;gBACzB,OAAO,EAAE,CAAC,qBAAY,CAAC;gBACvB,MAAM,EAAE,CAAC,sBAAa,CAAC;gBACvB,UAAU,EAAE,KAAK,EAAE,aAA4B,EAAE,EAAE,CAAC,IAAA,sCAAoB,EAAC,aAAa,CAAC;aACxF,CAAC;YACF,wBAAU;YACV,wBAAU;YACV,sBAAS;YACT,8BAAa;YACb,kCAAe;YACf,gCAAc;YACd,8BAAa;YACb,8BAAa;YACb,wBAAU;YACV,wBAAU;YACV,wBAAU;YACV,wBAAU;YACV,4BAAY;YACZ,4BAAY;YACZ,wBAAU;YACV,6BAAY;YACZ,8BAAa;YACb,kCAAe;SAChB;QACD,WAAW,EAAE,EAAE;QACf,SAAS,EAAE,EAAE;KACd,CAAC;GACW,SAAS,CAAG;AAAZ,8BAAS"}
|
package/dist/main.d.ts
CHANGED
package/dist/main.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.main = void 0;
|
|
3
4
|
require("./node-polyfills");
|
|
4
5
|
const bodyParser = require("body-parser");
|
|
5
6
|
const express = require("express");
|
|
@@ -141,6 +142,7 @@ const main = async () => {
|
|
|
141
142
|
process.exit(1);
|
|
142
143
|
}
|
|
143
144
|
};
|
|
145
|
+
exports.main = main;
|
|
144
146
|
const getProjectRoot = () => {
|
|
145
147
|
if (process.env.REACTPRESS_ORIGINAL_CWD) {
|
|
146
148
|
if (!(0, local_api_quiet_util_1.isLocalApiQuiet)()) {
|
package/dist/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;AAAA,4BAA0B;AAC1B,0CAA0C;AAC1C,mCAAmC;AACnC,yBAAyB;AACzB,2BAA2B;AAC3B,6BAA6B;AAC7B,+BAAqC;AAErC,uEAA+D;AAS/D,MAAM,iBAAiB,GAAG,IAAI,CAAC;AAC/B,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAS7B,MAAM,WAAW,GAAgB;IAC/B,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,KAAK;IAChB,WAAW,EAAE,KAAK;CACnB,CAAC;AAGF,MAAM,SAAS,GAAG,CAAC,IAAY,EAAoB,EAAE;IACnD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC;QAClC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAQ,EAAE,EAAE;YAChC,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY,EAAE;gBAC7B,OAAO,CAAC,KAAK,CAAC,CAAC;aAChB;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,CAAC;aAChB;QACH,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;YAC5B,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QACpD,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAGF,MAAM,iBAAiB,GAAG,KAAK,EAAE,SAAiB,EAAmB,EAAE;IACrE,KAAK,IAAI,IAAI,GAAG,SAAS,EAAE,IAAI,GAAG,SAAS,GAAG,iBAAiB,EAAE,IAAI,EAAE,EAAE;QACvE,IAAI,MAAM,SAAS,CAAC,IAAI,CAAC,EAAE;YACzB,OAAO,IAAI,CAAC;SACb;KACF;IACD,MAAM,IAAI,KAAK,CAAC,qCAAqC,SAAS,IAAI,SAAS,GAAG,iBAAiB,GAAG,CAAC,EAAE,CAAC,CAAC;AACzG,CAAC,CAAC;AAGF,MAAM,iBAAiB,GAAG,KAAK,IAAmB,EAAE;IAClD,IAAI,CAAC,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,SAAS,EAAE;QAChD,OAAO;KACR;IAED,WAAW,CAAC,SAAS,GAAG,IAAI,CAAC;IAE7B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAE7B,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE;YAC5B,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC;YAC1B,WAAW,CAAC,SAAS,GAAG,KAAK,CAAC;YAC9B,OAAO,EAAE,CAAC;YACV,OAAO;SACR;QAGD,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YAC9B,OAAO,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;YAChE,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC;YAC1B,WAAW,CAAC,SAAS,GAAG,KAAK,CAAC;YAC9B,WAAW,CAAC,WAAW,GAAG,KAAK,CAAC;YAChC,OAAO,EAAE,CAAC;QACZ,CAAC,EAAE,IAAI,CAAC,CAAC;QAGT,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;YACpC,YAAY,CAAC,OAAO,CAAC,CAAC;YAEtB,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,wBAAwB,EAAE;gBAChD,OAAO,CAAC,IAAI,CAAC,oCAAoC,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;aACjE;YAED,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC;YAC1B,WAAW,CAAC,SAAS,GAAG,KAAK,CAAC;YAC9B,WAAW,CAAC,WAAW,GAAG,KAAK,CAAC;YAChC,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;QAGH,IAAI,WAAW,CAAC,MAAM,CAAC,mBAAmB,EAAE;YAC1C,WAAW,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC;SAC1C;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAGF,MAAM,oBAAoB,GAAG,CAAC,GAAoB,EAAE,IAAY,EAAiB,EAAE;IACjF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,MAAM,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC,CAAC;YAC/C,OAAO;SACR;QAED,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;YACnC,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC;YAC5B,WAAW,CAAC,WAAW,GAAG,IAAI,CAAC;YAC/B,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAC/B,OAAO,CAAC,GAAG,CAAC,gEAAgE,IAAI,EAAE,CAAC,CAAC;YACpF,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAU,EAAE,EAAE;YAChC,WAAW,CAAC,WAAW,GAAG,KAAK,CAAC;YAChC,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACtB,WAAW,CAAC,WAAW,GAAG,KAAK,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAGF,MAAM,mBAAmB,GAAG,GAAG,EAAE;IAC/B,MAAM,QAAQ,GAAG,KAAK,EAAE,MAAc,EAAE,EAAE;QACxC,OAAO,CAAC,GAAG,CAAC,2BAA2B,MAAM,+BAA+B,CAAC,CAAC;QAE9E,MAAM,iBAAiB,EAAE,CAAC;QAE1B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC;IAEF,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/C,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;IACjD,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;AACjD,CAAC,CAAC;AAGF,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;IACtB,IAAI;QACF,mBAAmB,EAAE,CAAC;QAGtB,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAE1C,IAAI,CAAC,IAAA,sCAAe,GAAE,EAAE;YACtB,OAAO,CAAC,GAAG,CAAC,kDAAkD,OAAO,EAAE,CAAC,CAAC;SAC1E;QACD,IAAI,CAAC,IAAA,sCAAe,GAAE,EAAE;YACtB,OAAO,CAAC,GAAG,CAAC,+CAA+C,WAAW,EAAE,CAAC,CAAC;SAC3E;QAED,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;YAC1B,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,SAAS,EAAE;gBAClD,IAAI,CAAC,IAAA,sCAAe,GAAE,EAAE;oBACtB,OAAO,CAAC,GAAG,CAAC,4FAA4F,CAAC,CAAC;iBAC3G;gBACD,OAAO;aACR;YACD,IAAI,CAAC,IAAA,sCAAe,GAAE,EAAE;gBACtB,OAAO,CAAC,GAAG,CAAC,iEAAiE,CAAC,CAAC;aAChF;YACD,MAAM,oBAAoB,EAAE,CAAC;YAC7B,OAAO;SACR;QAED,OAAO,CAAC,GAAG,CAAC,uEAAuE,CAAC,CAAC;QACrF,OAAO,CAAC,GAAG,CAAC,yCAAyC,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACtE,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,SAAS,CAAC,CAAC;QAElD,MAAM,qBAAqB,EAAE,CAAC;KAC/B;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;QAElD,MAAM,iBAAiB,EAAE,CAAC;QAC1B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC,CAAC;AA8KO,oBAAI;AA3Kb,MAAM,cAAc,GAAG,GAAW,EAAE;IAGlC,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;QACvC,IAAI,CAAC,IAAA,sCAAe,GAAE,EAAE;YACtB,OAAO,CAAC,GAAG,CACT,qEAAqE,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,CAC3G,CAAC;SACH;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;KAC5C;IAGD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAClC,IAAI,CAAC,IAAA,sCAAe,GAAE,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,iEAAiE,WAAW,EAAE,CAAC,CAAC;KAC7F;IACD,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAGF,MAAM,qBAAqB,GAAG,KAAK,IAAmB,EAAE;IACtD,IAAI;QAEF,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;QAExD,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;QAGtB,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAC5C,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAClE,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;QAGjE,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACxB,GAAG,CAAC,QAAQ,CAAC,IAAA,WAAI,EAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACtC,IAAI;gBACF,MAAM,KAAK,GAAG,2CAAa,gBAAgB,EAAC,CAAC;gBAC7C,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;gBAC1D,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,gBAAgB,CAAC;oBAC9C,IAAI,EAAE,IAAI,IAAI,WAAW;oBACzB,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI;oBAC5B,IAAI;oBACJ,QAAQ;oBACR,QAAQ;iBACT,CAAC,CAAC;gBACH,MAAM,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gBACrC,MAAM,UAAU,CAAC,GAAG,EAAE,CAAC;gBACvB,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,iCAAiC,EAAE,CAAC,CAAC;aACzE;YAAC,OAAO,KAAK,EAAE;gBACd,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACnB,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,+BAA+B,KAAK,CAAC,OAAO,EAAE;iBACxD,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACtC,IAAI;gBACF,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;gBAC9B,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE;oBAChB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBAC1B,OAAO,EAAE,KAAK;wBACd,OAAO,EAAE,4BAA4B;qBACtC,CAAC,CAAC;iBACJ;gBAGD,MAAM,KAAK,GAAG,2CAAa,gBAAgB,EAAC,CAAC;gBAC7C,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,gBAAgB,CAAC;oBAC9C,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,WAAW;oBAC5B,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI;oBAC/B,IAAI,EAAE,EAAE,CAAC,IAAI;oBACb,QAAQ,EAAE,EAAE,CAAC,QAAQ;oBACrB,QAAQ,EAAE,EAAE,CAAC,QAAQ;iBACtB,CAAC,CAAC;gBACH,MAAM,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gBACrC,MAAM,UAAU,CAAC,GAAG,EAAE,CAAC;gBAGvB,MAAM,UAAU,GAAG;UACjB,EAAE,CAAC,IAAI,IAAI,WAAW;UACtB,EAAE,CAAC,IAAI,IAAI,IAAI;UACf,EAAE,CAAC,IAAI;YACL,EAAE,CAAC,QAAQ;cACT,EAAE,CAAC,QAAQ;;;kBAGP,IAAI,CAAC,SAAS,IAAI,uBAAuB;;;kBAGzC,IAAI,CAAC,SAAS,IAAI,uBAAuB;CAC1D,CAAC,IAAI,EAAE,CAAC;gBAGD,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;gBACrC,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;gBAC1C,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;gBAE9C,GAAG,CAAC,IAAI,CAAC;oBACP,OAAO,EAAE,IAAI;oBACb,OAAO,EAAE,8CAA8C;oBACvD,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,uBAAuB;iBACrD,CAAC,CAAC;gBAGH,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;oBAC1B,IAAI;wBACF,OAAO,CAAC,GAAG,CAAC,0DAA0D,CAAC,CAAC;wBACxE,MAAM,iBAAiB,EAAE,CAAC;wBAC1B,MAAM,oBAAoB,EAAE,CAAC;qBAC9B;oBAAC,OAAO,KAAK,EAAE;wBACd,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;qBACrD;gBACH,CAAC,CAAC,CAAC;aACJ;YAAC,OAAO,KAAK,EAAE;gBACd,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACnB,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,wBAAwB,KAAK,CAAC,OAAO,EAAE;iBACjD,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAGH,MAAM,oBAAoB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAEtC,IAAI;YACF,MAAM,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;SACxC;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,8CAA8C,IAAI,WAAW,CAAC,CAAC;SAC5E;KACF;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,0CAA0C,EAAE,KAAK,CAAC,CAAC;QAEjE,MAAM,iBAAiB,EAAE,CAAC;QAC1B,MAAM,KAAK,CAAC;KACb;AACH,CAAC,CAAC;AAGF,MAAM,oBAAoB,GAAG,KAAK,IAAmB,EAAE;IACrD,IAAI;QACF,IAAI,CAAC,IAAA,sCAAe,GAAE,EAAE;YACtB,OAAO,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC;SAC1D;QAGD,MAAM,iBAAiB,EAAE,CAAC;QAG1B,MAAM,CAAC,YAAY,GAAG,KAAK,CAAC;QAG5B,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QAG1D,MAAM,EAAE,SAAS,EAAE,GAAG,2CAAa,WAAW,EAAC,CAAC;QAChD,IAAI,OAAO,SAAS,KAAK,UAAU,EAAE;YACnC,MAAM,SAAS,EAAE,CAAC;SACnB;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;SACjD;KACF;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,gDAAgD,EAAE,KAAK,CAAC,CAAC;QACvE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC,CAAC;AAIF,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE;IAC3B,IAAI,EAAE,CAAC;CACR"}
|
|
@@ -27,7 +27,9 @@ let ExtensionModule = class ExtensionModule {
|
|
|
27
27
|
this.pluginLoader = pluginLoader;
|
|
28
28
|
}
|
|
29
29
|
onModuleInit() {
|
|
30
|
-
void this.themeService.ensureDefaultTheme()
|
|
30
|
+
void this.themeService.ensureDefaultTheme().catch((err) => {
|
|
31
|
+
console.warn('[ThemeService] ensureDefaultTheme skipped:', err instanceof Error ? err.message : err);
|
|
32
|
+
});
|
|
31
33
|
void this.pluginLoader.loadActivePlugins();
|
|
32
34
|
}
|
|
33
35
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension.module.js","sourceRoot":"","sources":["../../../src/modules/extension/extension.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAkE;AAClE,6CAAgD;AAEhD,qDAAiD;AACjD,qDAAiD;AACjD,8DAA0D;AAC1D,8DAAoD;AACpD,2DAAuD;AACvD,mEAA8D;AAC9D,qDAAiD;AACjD,yDAAqD;AACrD,mDAA+C;AAaxC,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YACmB,YAA0B,EAC1B,YAAiC;QADjC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,iBAAY,GAAZ,YAAY,CAAqB;IACjD,CAAC;IAEJ,YAAY;QACV,KAAK,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"extension.module.js","sourceRoot":"","sources":["../../../src/modules/extension/extension.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAkE;AAClE,6CAAgD;AAEhD,qDAAiD;AACjD,qDAAiD;AACjD,8DAA0D;AAC1D,8DAAoD;AACpD,2DAAuD;AACvD,mEAA8D;AAC9D,qDAAiD;AACjD,yDAAqD;AACrD,mDAA+C;AAaxC,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YACmB,YAA0B,EAC1B,YAAiC;QADjC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,iBAAY,GAAZ,YAAY,CAAqB;IACjD,CAAC;IAEJ,YAAY;QACV,KAAK,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACxD,OAAO,CAAC,IAAI,CAAC,4CAA4C,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACvG,CAAC,CAAC,CAAC;QACH,KAAK,IAAI,CAAC,YAAY,CAAC,iBAAiB,EAAE,CAAC;IAC7C,CAAC;CACF,CAAA;AAZY,eAAe;IAX3B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC,CAAC,wBAAO,CAAC,CAAC;YACnC,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC;YAC5B,8BAAa;YACb,wBAAU;SACX;QACD,WAAW,EAAE,CAAC,kCAAe,EAAE,oCAAgB,CAAC;QAChD,SAAS,EAAE,CAAC,4BAAY,EAAE,8BAAa,EAAE,2CAAmB,CAAC;QAC7D,OAAO,EAAE,CAAC,4BAAY,EAAE,8BAAa,EAAE,2CAAmB,CAAC;KAC5D,CAAC;qCAGiC,4BAAY;QACZ,2CAAmB;GAHzC,eAAe,CAY3B;AAZY,0CAAe"}
|
|
@@ -5,18 +5,18 @@ export declare class PluginController {
|
|
|
5
5
|
private readonly pluginLoader;
|
|
6
6
|
constructor(pluginService: PluginService, pluginLoader: PluginLoaderService);
|
|
7
7
|
list(): Promise<import("./plugin.service").PluginListItem[]>;
|
|
8
|
-
state(): Promise<import("@fecommunity/reactpress-toolkit/plugin").SitePluginState>;
|
|
8
|
+
state(): Promise<import("@fecommunity/reactpress-toolkit/plugin/extension").SitePluginState>;
|
|
9
9
|
getLocale(id: string, locale: string): Promise<{
|
|
10
10
|
pluginId: string;
|
|
11
11
|
locale: string;
|
|
12
|
-
messages: import("@fecommunity/reactpress-toolkit/plugin").PluginAdminLocaleMessages;
|
|
12
|
+
messages: import("@fecommunity/reactpress-toolkit/plugin/extension").PluginAdminLocaleMessages;
|
|
13
13
|
}>;
|
|
14
14
|
getOne(id: string): Promise<import("./plugin.service").PluginListItem>;
|
|
15
|
-
install(id: string): Promise<import("@fecommunity/reactpress-toolkit/plugin").SitePluginState>;
|
|
16
|
-
activate(id: string): Promise<import("@fecommunity/reactpress-toolkit/plugin").SitePluginState>;
|
|
17
|
-
deactivate(id: string): Promise<import("@fecommunity/reactpress-toolkit/plugin").SitePluginState>;
|
|
18
|
-
uninstall(id: string): Promise<import("@fecommunity/reactpress-toolkit/plugin").SitePluginState>;
|
|
15
|
+
install(id: string): Promise<import("@fecommunity/reactpress-toolkit/plugin/extension").SitePluginState>;
|
|
16
|
+
activate(id: string): Promise<import("@fecommunity/reactpress-toolkit/plugin/extension").SitePluginState>;
|
|
17
|
+
deactivate(id: string): Promise<import("@fecommunity/reactpress-toolkit/plugin/extension").SitePluginState>;
|
|
18
|
+
uninstall(id: string): Promise<import("@fecommunity/reactpress-toolkit/plugin/extension").SitePluginState>;
|
|
19
19
|
updateConfig(id: string, body: {
|
|
20
20
|
config?: Record<string, unknown>;
|
|
21
|
-
}): Promise<import("@fecommunity/reactpress-toolkit/plugin").SitePluginState>;
|
|
21
|
+
}): Promise<import("@fecommunity/reactpress-toolkit/plugin/extension").SitePluginState>;
|
|
22
22
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getPreviewDraft = exports.putPreviewDraft = void 0;
|
|
4
|
-
const
|
|
4
|
+
const extension_1 = require("../../../../toolkit/dist/theme/extension");
|
|
5
5
|
const crypto_1 = require("crypto");
|
|
6
6
|
const TTL_MS = 30 * 60 * 1000;
|
|
7
7
|
const store = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preview-draft.store.js","sourceRoot":"","sources":["../../../src/modules/extension/preview-draft.store.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"preview-draft.store.js","sourceRoot":"","sources":["../../../src/modules/extension/preview-draft.store.ts"],"names":[],"mappings":";;;AAAA,wEAAiF;AACjF,mCAAqC;AASrC,MAAM,MAAM,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAC9B,MAAM,KAAK,GAAG,IAAI,GAAG,EAA8B,CAAC;AAEpD,SAAS,KAAK;IACZ,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,KAAK,EAAE;QACjC,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,GAAG,MAAM;YAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KACxD;AACH,CAAC;AAED,SAAgB,eAAe,CAAC,OAI/B;IACC,KAAK,EAAE,CAAC;IACR,MAAM,KAAK,GAAG,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9C,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE;QACf,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC;AAdD,0CAcC;AAED,SAAgB,eAAe,CAAC,KAAa;IAC3C,IAAI,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,EAAE,CAAA;QAAE,OAAO,IAAI,CAAC;IAChC,KAAK,EAAE,CAAC;IACR,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IACrC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,GAAG,MAAM,EAAE;QACxC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC;KACb;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAVD,0CAUC"}
|
|
@@ -5,11 +5,33 @@ const fs = require("fs");
|
|
|
5
5
|
const path = require("path");
|
|
6
6
|
const project_root_util_1 = require("../../utils/project-root.util");
|
|
7
7
|
let cached = null;
|
|
8
|
+
function resolveBundledCliPackageRoot() {
|
|
9
|
+
const serverRoot = path.join(__dirname, '..', '..', '..');
|
|
10
|
+
const cliRoot = path.dirname(serverRoot);
|
|
11
|
+
const registryPath = path.join(cliRoot, 'out', 'lib', 'theme-registry.js');
|
|
12
|
+
if (fs.existsSync(registryPath)) {
|
|
13
|
+
return cliRoot;
|
|
14
|
+
}
|
|
15
|
+
try {
|
|
16
|
+
const pkgPath = path.join(cliRoot, 'package.json');
|
|
17
|
+
if (!fs.existsSync(pkgPath))
|
|
18
|
+
return null;
|
|
19
|
+
const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
|
|
20
|
+
if (pkg.name === '@fecommunity/reactpress') {
|
|
21
|
+
return cliRoot;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
catch (_a) {
|
|
25
|
+
}
|
|
26
|
+
return null;
|
|
27
|
+
}
|
|
8
28
|
function resolveThemeRegistryPath(monorepoRoot) {
|
|
29
|
+
const bundledCliRoot = resolveBundledCliPackageRoot();
|
|
9
30
|
const candidates = [
|
|
31
|
+
bundledCliRoot ? path.join(bundledCliRoot, 'out', 'lib', 'theme-registry.js') : null,
|
|
10
32
|
path.join(monorepoRoot, 'cli', 'out', 'lib', 'theme-registry.js'),
|
|
11
33
|
path.join(monorepoRoot, 'cli', 'lib', 'theme-registry.js'),
|
|
12
|
-
];
|
|
34
|
+
].filter(Boolean);
|
|
13
35
|
for (const candidate of candidates) {
|
|
14
36
|
if (fs.existsSync(candidate))
|
|
15
37
|
return candidate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theme-registry.bridge.js","sourceRoot":"","sources":["../../../src/modules/extension/theme-registry.bridge.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AACzB,6BAA6B;AAE7B,qEAAwF;AAoCxF,IAAI,MAAM,GAA+B,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"theme-registry.bridge.js","sourceRoot":"","sources":["../../../src/modules/extension/theme-registry.bridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ export declare class ThemeController {
|
|
|
13
13
|
installFromNpm(body: {
|
|
14
14
|
spec?: string;
|
|
15
15
|
skipDependencies?: boolean;
|
|
16
|
-
}): Promise<import("@fecommunity/reactpress-toolkit/
|
|
16
|
+
}): Promise<import("@fecommunity/reactpress-toolkit/config/global").SiteThemeState & {
|
|
17
17
|
themeId: string;
|
|
18
18
|
npmSpec: string;
|
|
19
19
|
}>;
|
|
@@ -26,10 +26,10 @@ export declare class ThemeController {
|
|
|
26
26
|
};
|
|
27
27
|
getPreviewDraft(token: string): {
|
|
28
28
|
themeId?: string;
|
|
29
|
-
mods?: import("@fecommunity/reactpress-toolkit/theme").ThemeMods;
|
|
29
|
+
mods?: import("@fecommunity/reactpress-toolkit/theme/extension").ThemeMods;
|
|
30
30
|
configuration?: Record<string, unknown>;
|
|
31
31
|
};
|
|
32
|
-
endPreviewSession(): Promise<import("@fecommunity/reactpress-toolkit/
|
|
32
|
+
endPreviewSession(): Promise<import("@fecommunity/reactpress-toolkit/config/global").SiteThemeState & {
|
|
33
33
|
siteUrl: string;
|
|
34
34
|
}>;
|
|
35
35
|
beginPreviewSession(id: string): Promise<import("./theme.service").ThemePreviewSessionResult>;
|
|
@@ -38,11 +38,11 @@ export declare class ThemeController {
|
|
|
38
38
|
getLocale(id: string, locale: string): Promise<{
|
|
39
39
|
themeId: string;
|
|
40
40
|
locale: string;
|
|
41
|
-
messages: import("@fecommunity/reactpress-toolkit/theme").ThemeAdminLocaleMessages;
|
|
41
|
+
messages: import("@fecommunity/reactpress-toolkit/theme/extension").ThemeAdminLocaleMessages;
|
|
42
42
|
}>;
|
|
43
43
|
getConfigurationSchema(id: string): Promise<{
|
|
44
44
|
themeId: string;
|
|
45
|
-
schema: import("@fecommunity/reactpress-toolkit/theme").ThemeConfigurationSchema;
|
|
45
|
+
schema: import("@fecommunity/reactpress-toolkit/theme/extension").ThemeConfigurationSchema;
|
|
46
46
|
}>;
|
|
47
47
|
getConfiguration(id: string): Promise<{
|
|
48
48
|
themeId: string;
|
|
@@ -56,11 +56,11 @@ export declare class ThemeController {
|
|
|
56
56
|
configuration: Record<string, unknown>;
|
|
57
57
|
}>;
|
|
58
58
|
getOne(id: string): Promise<import("./theme.service").ThemeListItem>;
|
|
59
|
-
install(id: string): Promise<import("@fecommunity/reactpress-toolkit/
|
|
60
|
-
activate(id: string): Promise<import("@fecommunity/reactpress-toolkit/
|
|
59
|
+
install(id: string): Promise<import("@fecommunity/reactpress-toolkit/config/global").SiteThemeState>;
|
|
60
|
+
activate(id: string): Promise<import("@fecommunity/reactpress-toolkit/config/global").SiteThemeState & {
|
|
61
61
|
siteUrl?: string;
|
|
62
62
|
}>;
|
|
63
63
|
updateMods(id: string, body: {
|
|
64
64
|
mods?: Record<string, string>;
|
|
65
|
-
}): Promise<import("@fecommunity/reactpress-toolkit/
|
|
65
|
+
}): Promise<import("@fecommunity/reactpress-toolkit/config/global").SiteThemeState>;
|
|
66
66
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { SiteThemeState, ThemeAdminLocaleMessages, ThemeConfigurationSchema, ThemeManifest, ThemeMods } from '@fecommunity/reactpress-toolkit/theme';
|
|
1
|
+
import type { SiteThemeState, ThemeAdminLocaleMessages, ThemeConfigurationSchema, ThemeManifest, ThemeMods } from '@fecommunity/reactpress-toolkit/theme/extension';
|
|
2
2
|
import { Repository } from 'typeorm';
|
|
3
3
|
import { SettingService } from '../setting/setting.service';
|
|
4
4
|
import { Setting } from '../setting/setting.entity';
|
|
@@ -14,8 +14,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
var ThemeService_1;
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.ThemeService = void 0;
|
|
17
|
-
const
|
|
18
|
-
const
|
|
17
|
+
const extension_1 = require("../../../../toolkit/dist/theme/extension");
|
|
18
|
+
const extension_2 = require("../../../../toolkit/dist/theme/extension");
|
|
19
19
|
const node_1 = require("../../../../toolkit/dist/theme/node");
|
|
20
20
|
const common_1 = require("@nestjs/common");
|
|
21
21
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
@@ -26,7 +26,7 @@ const typeorm_2 = require("typeorm");
|
|
|
26
26
|
const project_root_util_1 = require("../../utils/project-root.util");
|
|
27
27
|
const setting_service_1 = require("../setting/setting.service");
|
|
28
28
|
const setting_entity_1 = require("../setting/setting.entity");
|
|
29
|
-
const
|
|
29
|
+
const theme_placeholder_cover_1 = require("../../utils/theme-placeholder-cover");
|
|
30
30
|
const theme_registry_bridge_1 = require("./theme-registry.bridge");
|
|
31
31
|
const preview_draft_store_1 = require("./preview-draft.store");
|
|
32
32
|
function projectRoot() {
|
|
@@ -119,14 +119,14 @@ let ThemeService = ThemeService_1 = class ThemeService {
|
|
|
119
119
|
return null;
|
|
120
120
|
try {
|
|
121
121
|
const raw = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
|
|
122
|
-
const parsed = (0,
|
|
122
|
+
const parsed = (0, extension_2.parseThemeManifest)(raw);
|
|
123
123
|
if (parsed)
|
|
124
124
|
return parsed;
|
|
125
125
|
if (raw && typeof raw.id === 'string') {
|
|
126
|
-
return (0,
|
|
126
|
+
return (0, extension_2.parseThemeManifest)(Object.assign(Object.assign({}, raw), { id: raw.id }));
|
|
127
127
|
}
|
|
128
128
|
const id = path.basename(themeDir);
|
|
129
|
-
return (0,
|
|
129
|
+
return (0, extension_2.parseThemeManifest)(Object.assign({ id, name: id, version: '1.0.0' }, raw));
|
|
130
130
|
}
|
|
131
131
|
catch (_a) {
|
|
132
132
|
return null;
|
|
@@ -222,11 +222,11 @@ let ThemeService = ThemeService_1 = class ThemeService {
|
|
|
222
222
|
}
|
|
223
223
|
async getThemeState() {
|
|
224
224
|
const row = await this.getSettingRow();
|
|
225
|
-
return (0,
|
|
225
|
+
return (0, extension_2.getThemeStateFromGlobalSetting)(this.parseGlobalSetting(row));
|
|
226
226
|
}
|
|
227
227
|
async saveThemeState(patch) {
|
|
228
228
|
const row = await this.getSettingRow();
|
|
229
|
-
const merged = (0,
|
|
229
|
+
const merged = (0, extension_2.mergeThemeStateIntoGlobalSetting)(this.parseGlobalSetting(row), patch);
|
|
230
230
|
row.globalSetting = JSON.stringify(merged);
|
|
231
231
|
await this.settingRepository.save(row);
|
|
232
232
|
return merged.theme;
|
|
@@ -367,7 +367,7 @@ let ThemeService = ThemeService_1 = class ThemeService {
|
|
|
367
367
|
const manifest = this.getThemeManifestForConfig(themeId);
|
|
368
368
|
if (!manifest)
|
|
369
369
|
throw new common_1.NotFoundException(`Theme "${themeId}" not found`);
|
|
370
|
-
const schema = (0,
|
|
370
|
+
const schema = (0, extension_2.getConfigurationSchemaFromManifest)(manifest, themeId);
|
|
371
371
|
return { themeId, schema };
|
|
372
372
|
}
|
|
373
373
|
async getThemeConfiguration(themeId) {
|
|
@@ -378,7 +378,7 @@ let ThemeService = ThemeService_1 = class ThemeService {
|
|
|
378
378
|
if (!manifest)
|
|
379
379
|
throw new common_1.NotFoundException(`Theme "${themeId}" not found`);
|
|
380
380
|
const row = await this.getSettingRow();
|
|
381
|
-
const configuration = (0,
|
|
381
|
+
const configuration = (0, extension_2.getMergedThemeConfiguration)(this.parseGlobalSetting(row), themeId, {
|
|
382
382
|
manifest,
|
|
383
383
|
});
|
|
384
384
|
return { themeId, configuration };
|
|
@@ -391,7 +391,7 @@ let ThemeService = ThemeService_1 = class ThemeService {
|
|
|
391
391
|
const manifest = this.getThemeManifestForConfig(themeId);
|
|
392
392
|
if (!manifest)
|
|
393
393
|
throw new common_1.NotFoundException(`Theme "${themeId}" not found`);
|
|
394
|
-
const schema = (0,
|
|
394
|
+
const schema = (0, extension_2.getConfigurationSchemaFromManifest)(manifest, themeId);
|
|
395
395
|
if (!schema) {
|
|
396
396
|
throw new common_1.BadRequestException(`Theme "${themeId}" does not declare options schema`);
|
|
397
397
|
}
|
|
@@ -399,21 +399,21 @@ let ThemeService = ThemeService_1 = class ThemeService {
|
|
|
399
399
|
const globalRaw = this.parseGlobalSetting(row);
|
|
400
400
|
const locale = (_a = options === null || options === void 0 ? void 0 : options.locale) !== null && _a !== void 0 ? _a : 'zh';
|
|
401
401
|
if (options === null || options === void 0 ? void 0 : options.replace) {
|
|
402
|
-
const seed = (_b = (0,
|
|
403
|
-
const validation = (0,
|
|
402
|
+
const seed = (_b = (0, extension_2.getThemeConfigurationSeed)(themeId, locale)) !== null && _b !== void 0 ? _b : (0, extension_2.getMergedThemeConfiguration)(globalRaw, themeId, { locale, manifest });
|
|
403
|
+
const validation = (0, extension_2.validateThemeConfiguration)(schema, seed);
|
|
404
404
|
if (!validation.valid) {
|
|
405
405
|
throw new common_1.BadRequestException((_c = validation.message) !== null && _c !== void 0 ? _c : 'Invalid configuration');
|
|
406
406
|
}
|
|
407
|
-
const mergedGlobal = (0,
|
|
407
|
+
const mergedGlobal = (0, extension_2.mergeConfigIntoGlobalSetting)(globalRaw, themeId, seed);
|
|
408
408
|
row.globalSetting = JSON.stringify(mergedGlobal);
|
|
409
409
|
await this.settingRepository.save(row);
|
|
410
410
|
return { themeId, configuration: seed };
|
|
411
411
|
}
|
|
412
|
-
const result = (0,
|
|
412
|
+
const result = (0, extension_2.validateAndMergeThemeConfiguration)(themeId, globalRaw, patch, manifest);
|
|
413
413
|
if (!result.ok) {
|
|
414
414
|
throw new common_1.BadRequestException('message' in result ? result.message : 'Invalid configuration');
|
|
415
415
|
}
|
|
416
|
-
const mergedGlobal = (0,
|
|
416
|
+
const mergedGlobal = (0, extension_2.mergeConfigIntoGlobalSetting)(globalRaw, themeId, result.config);
|
|
417
417
|
row.globalSetting = JSON.stringify(mergedGlobal);
|
|
418
418
|
await this.settingRepository.save(row);
|
|
419
419
|
return { themeId, configuration: result.config };
|
|
@@ -798,7 +798,7 @@ let ThemeService = ThemeService_1 = class ThemeService {
|
|
|
798
798
|
var _a;
|
|
799
799
|
const manifest = this.getThemeManifestFromSources(id);
|
|
800
800
|
const defaults = this.themeAppearanceDefaults(manifest);
|
|
801
|
-
return (0,
|
|
801
|
+
return (0, theme_placeholder_cover_1.buildThemePlaceholderCoverSvg)({
|
|
802
802
|
id,
|
|
803
803
|
name: (_a = manifest === null || manifest === void 0 ? void 0 : manifest.name) !== null && _a !== void 0 ? _a : id,
|
|
804
804
|
primary: defaults.primaryColor,
|
|
@@ -916,7 +916,7 @@ let ThemeService = ThemeService_1 = class ThemeService {
|
|
|
916
916
|
state.activeTheme,
|
|
917
917
|
'hello-world',
|
|
918
918
|
...state.installedThemes,
|
|
919
|
-
|
|
919
|
+
extension_2.defaultSiteThemeState.activeTheme,
|
|
920
920
|
];
|
|
921
921
|
const seen = new Set();
|
|
922
922
|
for (const id of candidates) {
|
|
@@ -948,7 +948,7 @@ let ThemeService = ThemeService_1 = class ThemeService {
|
|
|
948
948
|
activeTheme = saved.activeTheme;
|
|
949
949
|
}
|
|
950
950
|
else if (!activeTheme) {
|
|
951
|
-
const saved = await this.saveThemeState(
|
|
951
|
+
const saved = await this.saveThemeState(extension_2.defaultSiteThemeState);
|
|
952
952
|
activeTheme = saved.activeTheme;
|
|
953
953
|
}
|
|
954
954
|
}
|