@fecommunity/reactpress 3.0.0 → 3.0.2

package/lib/publish.js

@@ -389,6 +389,15 @@ function buildPackage(pkg) {
         execSync('pnpm run prebuild && pnpm run build', { cwd: path.join(process.cwd(), pkg.path), stdio: 'inherit' });
       } else if (pkg.path === 'toolkit') {
         execSync('pnpm run build', { cwd: path.join(process.cwd(), pkg.path), stdio: 'inherit' });
+      } else if (pkg.path === 'cli') {
+        execSync('node scripts/sync-bundled-core.mjs', {
+          cwd: path.join(process.cwd(), pkg.path),
+          stdio: 'inherit',
+        });
+        execSync('node scripts/install-bundled-runtime.mjs', {
+          cwd: path.join(process.cwd(), pkg.path),
+          stdio: 'inherit',
+        });
       } else if (pkg.path === 'templates/hello-world' || pkg.path === 'templates/twentytwentyfive') {
         // Templates don't need to be built, just validate package.json
         console.log(chalk.gray('  Templates do not require building, skipping...'));

package/lib/root.js

@@ -1,13 +1,66 @@
 const fs = require('fs');
 const path = require('path');
 
-/** Monorepo root (parent of cli/) */
+const CLI_PACKAGE_NAME = '@fecommunity/reactpress';
+
+/**
+ * Install root: monorepo checkout (repo root) or published @fecommunity/reactpress package root.
+ * cli/lib -> ../.. when pnpm-workspace.yaml exists; published lib/ -> .. only.
+ */
 function getMonorepoRoot() {
-  return path.resolve(__dirname, '../..');
+  const packageRoot = path.resolve(__dirname, '..');
+  const parentOfPackage = path.resolve(__dirname, '../..');
+  if (fs.existsSync(path.join(parentOfPackage, 'pnpm-workspace.yaml'))) {
+    return parentOfPackage;
+  }
+  return packageRoot;
+}
+
+function isPublishedCliRoot(dir) {
+  const resolved = path.resolve(dir);
+  try {
+    const pkg = JSON.parse(
+      fs.readFileSync(path.join(resolved, 'package.json'), 'utf8')
+    );
+    if (pkg.name !== CLI_PACKAGE_NAME) return false;
+  } catch {
+    return false;
+  }
+  return !fs.existsSync(path.join(resolved, 'pnpm-workspace.yaml'));
+}
+
+function isProjectRoot(dir) {
+  const resolved = path.resolve(dir);
+  if (isPublishedCliRoot(resolved)) return false;
+  return (
+    fs.existsSync(path.join(resolved, '.reactpress', 'config.json')) ||
+    fs.existsSync(path.join(resolved, 'pnpm-workspace.yaml')) ||
+    fs.existsSync(path.join(resolved, 'server', 'src', 'main.ts')) ||
+    fs.existsSync(path.join(resolved, 'toolkit', 'package.json'))
+  );
+}
+
+function findProjectRoot(startDir = process.cwd()) {
+  let dir = path.resolve(startDir);
+  while (true) {
+    if (isProjectRoot(dir)) return dir;
+    const parent = path.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return null;
 }
 
 function getProjectRoot() {
-  return path.resolve(process.env.REACTPRESS_ORIGINAL_CWD || process.cwd());
+  const envRoot = process.env.REACTPRESS_ORIGINAL_CWD;
+  if (envRoot) {
+    const resolved = path.resolve(envRoot);
+    if (isProjectRoot(resolved)) return resolved;
+  }
+  const discovered = findProjectRoot(process.cwd());
+  if (discovered) return discovered;
+  if (envRoot) return path.resolve(envRoot);
+  return path.resolve(process.cwd());
 }
 
 function ensureOriginalCwd() {
@@ -16,10 +69,11 @@ function ensureOriginalCwd() {
   return root;
 }
 
-function isMonorepoCheckout(cwd = getMonorepoRoot()) {
+function isMonorepoCheckout(cwd) {
+  const resolved = path.resolve(cwd || process.cwd());
   return (
-    fs.existsSync(path.join(cwd, 'pnpm-workspace.yaml')) ||
-    fs.existsSync(path.join(cwd, 'server', 'src', 'main.ts'))
+    fs.existsSync(path.join(resolved, 'pnpm-workspace.yaml')) ||
+    fs.existsSync(path.join(resolved, 'server', 'src', 'main.ts'))
   );
 }
 
@@ -28,4 +82,7 @@ module.exports = {
   getProjectRoot,
   ensureOriginalCwd,
   isMonorepoCheckout,
+  isProjectRoot,
+  findProjectRoot,
+  isPublishedCliRoot,
 };

package/lib/spawn.js

@@ -1,19 +1,24 @@
 const { spawn, spawnSync } = require('child_process');
 const path = require('path');
 const chalk = require('chalk');
-const { getMonorepoRoot } = require('./root');
+const { ensureOriginalCwd } = require('./root');
 const { getCliPackageRoot } = require('./paths');
 const { t, resolveLocale } = require('./i18n');
 
+function resolveSpawnCwd(options = {}) {
+  return options.cwd ? path.resolve(options.cwd) : ensureOriginalCwd();
+}
+
 function runSync(command, args, options = {}) {
+  const cwd = resolveSpawnCwd(options);
   const result = spawnSync(command, args, {
-    cwd: options.cwd || getMonorepoRoot(),
+    cwd,
     stdio: 'inherit',
     env: {
       ...process.env,
       REACTPRESS_LANG: process.env.REACTPRESS_LANG || resolveLocale(),
-      REACTPRESS_ORIGINAL_CWD:
-        options.cwd || process.env.REACTPRESS_ORIGINAL_CWD || process.cwd(),
+      REACTPRESS_ORIGINAL_CWD: cwd,
+      ...options.env,
     },
     shell: options.shell ?? false,
   });
@@ -28,15 +33,15 @@ function runSync(command, args, options = {}) {
 }
 
 function runNodeScript(scriptPath, args = [], options = {}) {
+  const cwd = resolveSpawnCwd(options);
   return new Promise((resolve, reject) => {
     const child = spawn(process.execPath, [scriptPath, ...args], {
       stdio: 'inherit',
-      cwd: options.cwd || getMonorepoRoot(),
+      cwd,
       env: {
         ...process.env,
         REACTPRESS_LANG: process.env.REACTPRESS_LANG || resolveLocale(),
-        REACTPRESS_ORIGINAL_CWD:
-          options.cwd || process.env.REACTPRESS_ORIGINAL_CWD || process.cwd(),
+        REACTPRESS_ORIGINAL_CWD: cwd,
         ...options.env,
       },
     });
@@ -57,15 +62,15 @@ function runNodeScript(scriptPath, args = [], options = {}) {
 }
 
 function spawnDetached(scriptPath, args = [], options = {}) {
+  const cwd = resolveSpawnCwd(options);
   const child = spawn(process.execPath, [scriptPath, ...args], {
     stdio: options.stdio ?? 'ignore',
     detached: true,
-    cwd: options.cwd,
+    cwd,
     env: {
       ...process.env,
       REACTPRESS_LANG: process.env.REACTPRESS_LANG || resolveLocale(),
-      REACTPRESS_ORIGINAL_CWD:
-        options.cwd || process.env.REACTPRESS_ORIGINAL_CWD || process.cwd(),
+      REACTPRESS_ORIGINAL_CWD: cwd,
       ...options.env,
     },
   });

package/lib/status.js

@@ -37,7 +37,7 @@ async function printUnifiedStatus(projectRoot = ensureOriginalCwd()) {
     checkHealth(healthUrl),
   ]);
 
-  const apiSource = isUsingMonorepoServer()
+  const apiSource = isUsingMonorepoServer(projectRoot)
     ? t('status.apiSource.monorepo')
     : t('status.apiSource.bundle');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecommunity/reactpress",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "ReactPress 3.0 — zero-config CMS: one package, one reactpress command",
   "author": "fecommunity",
   "license": "MIT",
@@ -34,6 +34,10 @@
     "README.md",
     "LICENSE"
   ],
+  "scripts": {
+    "prepare": "node scripts/sync-bundled-core.mjs",
+    "prepack": "node scripts/sync-bundled-core.mjs"
+  },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
@@ -53,6 +57,5 @@
   },
   "devDependencies": {
     "@fecommunity/reactpress-cli-core": "npm:@fecommunity/reactpress-cli@0.1.0"
-  },
-  "scripts": {}
-}
+  }
+}

package/server/dist/app.module.js

@@ -36,12 +36,6 @@ const user_entity_1 = require("./modules/user/user.entity");
 const user_module_1 = require("./modules/user/user.module");
 const view_entity_1 = require("./modules/view/view.entity");
 const view_module_1 = require("./modules/view/view.module");
-const api_key_entity_1 = require("./modules/api-key/api-key.entity");
-const api_key_module_1 = require("./modules/api-key/api-key.module");
-const article_revision_entity_1 = require("./modules/article/article-revision.entity");
-const health_module_1 = require("./modules/health/health.module");
-const webhook_entity_1 = require("./modules/webhook/webhook.entity");
-const webhook_module_1 = require("./modules/webhook/webhook.module");
 let AppModule = class AppModule {
 };
 AppModule = __decorate([
@@ -53,23 +47,7 @@ AppModule = __decorate([
                 inject: [config_1.ConfigService],
                 useFactory: async (configService) => ({
                     type: 'mysql',
-                    entities: [
-                        user_entity_1.User,
-                        file_entity_1.File,
-                        knowledge_entity_1.Knowledge,
-                        article_entity_1.Article,
-                        article_revision_entity_1.ArticleRevision,
-                        category_entity_1.Category,
-                        tag_entity_1.Tag,
-                        comment_entity_1.Comment,
-                        setting_entity_1.Setting,
-                        smtp_entity_1.SMTP,
-                        page_entity_1.Page,
-                        view_entity_1.View,
-                        search_entity_1.Search,
-                        api_key_entity_1.ApiKey,
-                        webhook_entity_1.Webhook,
-                    ],
+                    entities: [user_entity_1.User, file_entity_1.File, knowledge_entity_1.Knowledge, article_entity_1.Article, category_entity_1.Category, tag_entity_1.Tag, comment_entity_1.Comment, setting_entity_1.Setting, smtp_entity_1.SMTP, page_entity_1.Page, view_entity_1.View, search_entity_1.Search],
                     host: configService.get('DB_HOST', '0.0.0.0'),
                     port: configService.get('DB_PORT', 3306),
                     username: configService.get('DB_USER', 'root'),
@@ -93,9 +71,6 @@ AppModule = __decorate([
             page_module_1.PageModule,
             view_module_1.ViewModule,
             search_module_1.SearchModule,
-            health_module_1.HealthModule,
-            api_key_module_1.ApiKeyModule,
-            webhook_module_1.WebhookModule,
         ],
         controllers: [],
         providers: [],

package/server/dist/app.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;AACA,2DAAyD;AACzD,2CAAwC;AACxC,2CAA6D;AAC7D,6CAAgD;AAEhD,qEAA2D;AAE3D,qEAAiE;AAEjE,4DAAwD;AACxD,wEAA8D;AAE9D,wEAAoE;AACpE,qEAA2D;AAE3D,qEAAiE;AACjE,4DAAkD;AAElD,4DAAwD;AACxD,2EAAiE;AAEjE,2EAAuE;AACvE,4DAAkD;AAElD,4DAAwD;AAExD,kEAAwD;AACxD,kEAA8D;AAC9D,qEAA2D;AAE3D,qEAAiE;AACjE,4DAAkD;AAElD,4DAAwD;AACxD,yDAA+C;AAE/C,yDAAqD;AACrD,4DAAkD;AAElD,4DAAwD;AACxD,4DAAkD;AAElD,4DAAwD;AACxD,qEAA0D;AAC1D,qEAAgE;AAChE,uFAA4E;AAC5E,kEAA8D;AAC9D,qEAA2D;AAC3D,qEAAiE;AAyDjE,IAAa,SAAS,GAAtB,MAAa,SAAS;CAAG,CAAA;AAAZ,SAAS;IAvDrB,eAAM,CAAC;QACN,OAAO,EAAE;YACP,qBAAY,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,2BAAM,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,CAAC;oBACnD,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE;wBACR,kBAAI;wBACJ,kBAAI;wBACJ,4BAAS;wBACT,wBAAO;wBACP,yCAAe;wBACf,0BAAQ;wBACR,gBAAG;wBACH,wBAAO;wBACP,wBAAO;wBACP,kBAAI;wBACJ,kBAAI;wBACJ,kBAAI;wBACJ,sBAAM;wBACN,uBAAM;wBACN,wBAAO;qBACR;oBACD,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC;oBAC7C,IAAI,EAAE,aAAa,CAAC,GAAG,CAAS,SAAS,EAAE,IAAI,CAAC;oBAChD,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC;oBAC9C,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC;oBAChD,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,aAAa,EAAE,YAAY,CAAC;oBACxD,OAAO,EAAE,SAAS;oBAClB,QAAQ,EAAE,QAAQ;oBAClB,WAAW,EAAE,IAAI;iBAClB,CAAC;aACH,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,6BAAY;YACZ,8BAAa;SACd;QACD,WAAW,EAAE,EAAE;QACf,SAAS,EAAE,EAAE;KACd,CAAC;GACW,SAAS,CAAG;AAAZ,8BAAS"}
+{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;AACA,2DAAyD;AACzD,2CAAwC;AACxC,2CAA6D;AAC7D,6CAAgD;AAEhD,qEAA2D;AAE3D,qEAAiE;AAEjE,4DAAwD;AACxD,wEAA8D;AAE9D,wEAAoE;AACpE,qEAA2D;AAE3D,qEAAiE;AACjE,4DAAkD;AAElD,4DAAwD;AACxD,2EAAiE;AAEjE,2EAAuE;AACvE,4DAAkD;AAElD,4DAAwD;AAExD,kEAAwD;AACxD,kEAA8D;AAC9D,qEAA2D;AAE3D,qEAAiE;AACjE,4DAAkD;AAElD,4DAAwD;AACxD,yDAA+C;AAE/C,yDAAqD;AACrD,4DAAkD;AAElD,4DAAwD;AACxD,4DAAkD;AAElD,4DAAwD;AAsCxD,IAAa,SAAS,GAAtB,MAAa,SAAS;CAAG,CAAA;AAAZ,SAAS;IApCrB,eAAM,CAAC;QACN,OAAO,EAAE;YACP,qBAAY,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,2BAAM,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,CAAC;oBACnD,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE,CAAC,kBAAI,EAAE,kBAAI,EAAE,4BAAS,EAAE,wBAAO,EAAE,0BAAQ,EAAE,gBAAG,EAAE,wBAAO,EAAE,wBAAO,EAAE,kBAAI,EAAE,kBAAI,EAAE,kBAAI,EAAE,sBAAM,CAAC;oBACrG,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC;oBAC7C,IAAI,EAAE,aAAa,CAAC,GAAG,CAAS,SAAS,EAAE,IAAI,CAAC;oBAChD,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC;oBAC9C,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC;oBAChD,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,aAAa,EAAE,YAAY,CAAC;oBACxD,OAAO,EAAE,SAAS;oBAClB,QAAQ,EAAE,QAAQ;oBAClB,WAAW,EAAE,IAAI;iBAClB,CAAC;aACH,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;SACb;QACD,WAAW,EAAE,EAAE;QACf,SAAS,EAAE,EAAE;KACd,CAAC;GACW,SAAS,CAAG;AAAZ,8BAAS"}

package/server/dist/modules/article/article.controller.d.ts

@@ -1,19 +1,14 @@
 import { JwtService } from '@nestjs/jwt';
-import { ApiKeyService } from '../api-key/api-key.service';
 import { UserService } from '../user/user.service';
 import { Article } from './article.entity';
 import { ArticleService } from './article.service';
 export declare class ArticleController {
     private readonly articleService;
-    private readonly apiKeyService;
     private readonly jwtService;
     private readonly userService;
-    constructor(articleService: ArticleService, apiKeyService: ApiKeyService, jwtService: JwtService, userService: UserService);
+    constructor(articleService: ArticleService, jwtService: JwtService, userService: UserService);
     create(article: any): Promise<Article>;
     findAll(queryParams: any): Promise<[Article[], number]>;
-    findHeadless(req: any, queryParams: any): Promise<[Article[], number]>;
-    listRevisions(id: string): Promise<import("./article-revision.entity").ArticleRevision[]>;
-    restoreRevision(id: string, revisionId: string): Promise<Article>;
     findArticlesByCategory(category: any, queryParams: any): Promise<(number | Article[])[]>;
     findArticlesByTag(tag: any, queryParams: any): Promise<(number | Article[])[]>;
     getRecommendArticles(): Promise<Article[]>;

package/server/dist/modules/article/article.controller.js

@@ -13,21 +13,17 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArticleController = void 0;
-const api_messages_1 = require("../../common/api-messages");
 const common_1 = require("@nestjs/common");
 const jwt_1 = require("@nestjs/jwt");
 const swagger_1 = require("@nestjs/swagger");
-const api_key_guard_1 = require("../api-key/api-key.guard");
-const api_key_service_1 = require("../api-key/api-key.service");
 const jwt_auth_guard_1 = require("../auth/jwt-auth.guard");
 const roles_guard_1 = require("../auth/roles.guard");
 const user_service_1 = require("../user/user.service");
 const article_entity_1 = require("./article.entity");
 const article_service_1 = require("./article.service");
 let ArticleController = class ArticleController {
-    constructor(articleService, apiKeyService, jwtService, userService) {
+    constructor(articleService, jwtService, userService) {
         this.articleService = articleService;
-        this.apiKeyService = apiKeyService;
         this.jwtService = jwtService;
         this.userService = userService;
     }
@@ -37,18 +33,6 @@ let ArticleController = class ArticleController {
     findAll(queryParams) {
         return this.articleService.findAll(queryParams);
     }
-    findHeadless(req, queryParams) {
-        if (!this.apiKeyService.hasScope(req.apiKey, 'read')) {
-            throw new common_1.ForbiddenException(api_messages_1.ApiMsg.API_KEY_MISSING_READ);
-        }
-        return this.articleService.findAll(Object.assign(Object.assign({}, queryParams), { status: 'publish' }));
-    }
-    listRevisions(id) {
-        return this.articleService.listRevisions(id);
-    }
-    restoreRevision(id, revisionId) {
-        return this.articleService.restoreRevision(id, revisionId);
-    }
     findArticlesByCategory(category, queryParams) {
         return this.articleService.findArticlesByCategory(category, queryParams);
     }
@@ -114,33 +98,6 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
 ], ArticleController.prototype, "findAll", null);
-__decorate([
-    common_1.Get('headless/list'),
-    common_1.UseGuards(api_key_guard_1.ApiKeyGuard),
-    common_1.HttpCode(common_1.HttpStatus.OK),
-    __param(0, common_1.Request()), __param(1, common_1.Query()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
-    __metadata("design:returntype", void 0)
-], ArticleController.prototype, "findHeadless", null);
-__decorate([
-    common_1.Get(':id/revisions'),
-    roles_guard_1.Roles('admin'),
-    common_1.UseGuards(jwt_auth_guard_1.JwtAuthGuard),
-    __param(0, common_1.Param('id')),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", void 0)
-], ArticleController.prototype, "listRevisions", null);
-__decorate([
-    common_1.Post(':id/revisions/:revisionId/restore'),
-    roles_guard_1.Roles('admin'),
-    common_1.UseGuards(jwt_auth_guard_1.JwtAuthGuard),
-    __param(0, common_1.Param('id')), __param(1, common_1.Param('revisionId')),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, String]),
-    __metadata("design:returntype", void 0)
-], ArticleController.prototype, "restoreRevision", null);
 __decorate([
     common_1.Get('/category/:id'),
     common_1.HttpCode(common_1.HttpStatus.OK),
@@ -234,7 +191,6 @@ ArticleController = __decorate([
     common_1.Controller('article'),
     common_1.UseGuards(roles_guard_1.RolesGuard),
     __metadata("design:paramtypes", [article_service_1.ArticleService,
-        api_key_service_1.ApiKeyService,
         jwt_1.JwtService,
         user_service_1.UserService])
 ], ArticleController);

package/server/dist/modules/article/article.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"article.controller.js","sourceRoot":"","sources":["../../../src/modules/article/article.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4DAAmD;AACnD,2CAcwB;AACxB,qCAAyC;AACzC,6CAAuD;AAEvD,4DAAuD;AACvD,gEAA2D;AAC3D,2DAAsD;AACtD,qDAAwD;AAExD,uDAAmD;AACnD,qDAA2C;AAC3C,uDAAmD;AAKnD,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAC5B,YACmB,cAA8B,EAC9B,aAA4B,EAC5B,UAAsB,EACtB,WAAwB;QAHxB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,kBAAa,GAAb,aAAa,CAAe;QAC5B,eAAU,GAAV,UAAU,CAAY;QACtB,gBAAW,GAAX,WAAW,CAAa;IACxC,CAAC;IAUJ,MAAM,CAAS,OAAO;QACpB,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;IAOD,OAAO,CAAU,WAAW;QAC1B,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;IAQD,YAAY,CAAY,GAAG,EAAW,WAAW;QAC/C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;YACpD,MAAM,IAAI,2BAAkB,CAAC,qBAAM,CAAC,oBAAoB,CAAC,CAAC;SAC3D;QACD,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,iCAAM,WAAW,KAAE,MAAM,EAAE,SAAS,IAAG,CAAC;IAC5E,CAAC;IAKD,aAAa,CAAc,EAAU;QACnC,OAAO,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAC/C,CAAC;IAKD,eAAe,CAAc,EAAU,EAAuB,UAAkB;QAC9E,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IAC7D,CAAC;IAOD,sBAAsB,CAAc,QAAQ,EAAW,WAAW;QAChE,OAAO,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC3E,CAAC;IAOD,iBAAiB,CAAc,GAAG,EAAW,WAAW;QACtD,OAAO,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IACjE,CAAC;IAOD,oBAAoB;QAClB,OAAO,IAAI,CAAC,cAAc,CAAC,oBAAoB,EAAE,CAAC;IACpD,CAAC;IAOD,WAAW;QACT,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC;IAC3C,CAAC;IAOD,SAAS,CAAqB,SAAS;QACrC,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAClD,CAAC;IAOD,KAAK,CAAC,QAAQ,CAAY,GAAG,EAAe,EAAE,EAAmB,MAAM;QACrE,IAAI,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;QAEtC,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YAExB,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;SAChC;QAED,IAAI;YACF,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAS,CAAC;YACxD,MAAM,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;YAC5B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACtD,MAAM,OAAO,GAAG,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC;YACjD,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;SAC1D;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;SACjD;IACH,CAAC;IASD,aAAa,CAAc,EAAE,EAAU,OAAO;QAC5C,OAAO,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;IAOD,eAAe,CAAc,EAAE;QAC7B,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IACjD,CAAC;IAOD,eAAe,CAAc,EAAE,EAAgB,IAAI;QACjD,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC;IAWD,UAAU,CAAc,EAAE,EAAU,OAAO;QACzC,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IASD,UAAU,CAAc,EAAE;QACxB,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAC5C,CAAC;CACF,CAAA;AAjKC;IAJC,qBAAW,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,wBAAO,CAAC,EAAE,CAAC;IAClE,aAAI,EAAE;IACN,mBAAK,CAAC,OAAO,CAAC;IACd,kBAAS,CAAC,6BAAY,CAAC;IAChB,WAAA,aAAI,EAAE,CAAA;;;;+CAEb;AAOD;IAFC,YAAG,EAAE;IACL,iBAAQ,CAAC,mBAAU,CAAC,EAAE,CAAC;IACf,WAAA,cAAK,EAAE,CAAA;;;;gDAEf;AAQD;IAHC,YAAG,CAAC,eAAe,CAAC;IACpB,kBAAS,CAAC,2BAAW,CAAC;IACtB,iBAAQ,CAAC,mBAAU,CAAC,EAAE,CAAC;IACV,WAAA,gBAAO,EAAE,CAAA,EAAO,WAAA,cAAK,EAAE,CAAA;;;;qDAKpC;AAKD;IAHC,YAAG,CAAC,eAAe,CAAC;IACpB,mBAAK,CAAC,OAAO,CAAC;IACd,kBAAS,CAAC,6BAAY,CAAC;IACT,WAAA,cAAK,CAAC,IAAI,CAAC,CAAA;;;;sDAEzB;AAKD;IAHC,aAAI,CAAC,mCAAmC,CAAC;IACzC,mBAAK,CAAC,OAAO,CAAC;IACd,kBAAS,CAAC,6BAAY,CAAC;IACP,WAAA,cAAK,CAAC,IAAI,CAAC,CAAA,EAAc,WAAA,cAAK,CAAC,YAAY,CAAC,CAAA;;;;wDAE5D;AAOD;IAFC,YAAG,CAAC,eAAe,CAAC;IACpB,iBAAQ,CAAC,mBAAU,CAAC,EAAE,CAAC;IACA,WAAA,cAAK,CAAC,IAAI,CAAC,CAAA,EAAY,WAAA,cAAK,EAAE,CAAA;;;;+DAErD;AAOD;IAFC,YAAG,CAAC,UAAU,CAAC;IACf,iBAAQ,CAAC,mBAAU,CAAC,EAAE,CAAC;IACL,WAAA,cAAK,CAAC,IAAI,CAAC,CAAA,EAAO,WAAA,cAAK,EAAE,CAAA;;;;0DAE3C;AAOD;IAFC,YAAG,CAAC,gBAAgB,CAAC;IACrB,iBAAQ,CAAC,mBAAU,CAAC,EAAE,CAAC;;;;6DAGvB;AAOD;IAFC,YAAG,CAAC,WAAW,CAAC;IAChB,iBAAQ,CAAC,mBAAU,CAAC,EAAE,CAAC;;;;oDAGvB;AAOD;IAFC,YAAG,CAAC,YAAY,CAAC;IACjB,iBAAQ,CAAC,mBAAU,CAAC,EAAE,CAAC;IACb,WAAA,cAAK,CAAC,WAAW,CAAC,CAAA;;;;kDAE5B;AAOD;IADC,YAAG,CAAC,KAAK,CAAC;IACK,WAAA,gBAAO,EAAE,CAAA,EAAO,WAAA,cAAK,CAAC,IAAI,CAAC,CAAA,EAAM,WAAA,cAAK,CAAC,QAAQ,CAAC,CAAA;;;;iDAiB/D;AASD;IAFC,aAAI,CAAC,mBAAmB,CAAC;IACzB,iBAAQ,CAAC,mBAAU,CAAC,EAAE,CAAC;IACT,WAAA,cAAK,CAAC,IAAI,CAAC,CAAA,EAAM,WAAA,aAAI,EAAE,CAAA;;;;sDAErC;AAOD;IAFC,aAAI,CAAC,WAAW,CAAC;IACjB,iBAAQ,CAAC,mBAAU,CAAC,EAAE,CAAC;IACP,WAAA,cAAK,CAAC,IAAI,CAAC,CAAA;;;;wDAE3B;AAOD;IAFC,aAAI,CAAC,WAAW,CAAC;IACjB,iBAAQ,CAAC,mBAAU,CAAC,EAAE,CAAC;IACP,WAAA,cAAK,CAAC,IAAI,CAAC,CAAA,EAAM,WAAA,aAAI,CAAC,MAAM,CAAC,CAAA;;;;wDAE7C;AAWD;IAJC,cAAK,CAAC,KAAK,CAAC;IACZ,mBAAK,CAAC,OAAO,CAAC;IACd,kBAAS,CAAC,6BAAY,CAAC;IACvB,iBAAQ,CAAC,mBAAU,CAAC,EAAE,CAAC;IACZ,WAAA,cAAK,CAAC,IAAI,CAAC,CAAA,EAAM,WAAA,aAAI,EAAE,CAAA;;;;mDAElC;AASD;IAHC,eAAM,CAAC,KAAK,CAAC;IACb,mBAAK,CAAC,OAAO,CAAC;IACd,kBAAS,CAAC,6BAAY,CAAC;IACZ,WAAA,cAAK,CAAC,IAAI,CAAC,CAAA;;;;mDAEtB;AAhLU,iBAAiB;IAH7B,iBAAO,CAAC,SAAS,CAAC;IAClB,mBAAU,CAAC,SAAS,CAAC;IACrB,kBAAS,CAAC,wBAAU,CAAC;qCAGe,gCAAc;QACf,+BAAa;QAChB,gBAAU;QACT,0BAAW;GALhC,iBAAiB,CAiL7B;AAjLY,8CAAiB"}
+{"version":3,"file":"article.controller.js","sourceRoot":"","sources":["../../../src/modules/article/article.controller.ts"],"names":[],"mappings":"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"}

package/server/dist/modules/article/article.entity.d.ts

@@ -18,7 +18,6 @@ export declare class Article {
     needPassword: boolean;
     isCommentable: boolean;
     publishAt: Date;
-    scheduledPublishAt: Date;
     createAt: Date;
     updateAt: Date;
 }

package/server/dist/modules/article/article.entity.js

@@ -103,11 +103,6 @@ __decorate([
     typeorm_1.Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' }),
     __metadata("design:type", Date)
 ], Article.prototype, "publishAt", void 0);
-__decorate([
-    swagger_1.ApiProperty({ description: '定时发布时间（草稿状态下生效）' }),
-    typeorm_1.Column({ type: 'timestamp', nullable: true }),
-    __metadata("design:type", Date)
-], Article.prototype, "scheduledPublishAt", void 0);
 __decorate([
     swagger_1.ApiProperty(),
     typeorm_1.CreateDateColumn({

package/server/dist/modules/article/article.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"article.entity.js","sourceRoot":"","sources":["../../../src/modules/article/article.entity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"article.entity.js","sourceRoot":"","sources":["../../../src/modules/article/article.entity.ts"],"names":[],"mappings":"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"}

package/server/dist/modules/article/article.module.js

@@ -9,32 +9,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArticleModule = void 0;
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
-const api_key_module_1 = require("../api-key/api-key.module");
 const auth_module_1 = require("../auth/auth.module");
 const category_module_1 = require("../category/category.module");
 const tag_module_1 = require("../tag/tag.module");
 const user_module_1 = require("../user/user.module");
-const webhook_module_1 = require("../webhook/webhook.module");
-const article_revision_entity_1 = require("./article-revision.entity");
 const article_controller_1 = require("./article.controller");
 const article_entity_1 = require("./article.entity");
 const article_service_1 = require("./article.service");
-const scheduled_publish_service_1 = require("./scheduled-publish.service");
 let ArticleModule = class ArticleModule {
 };
 ArticleModule = __decorate([
     common_1.Module({
-        imports: [
-            typeorm_1.TypeOrmModule.forFeature([article_entity_1.Article, article_revision_entity_1.ArticleRevision]),
-            category_module_1.CategoryModule,
-            tag_module_1.TagModule,
-            user_module_1.UserModule,
-            auth_module_1.AuthModule,
-            api_key_module_1.ApiKeyModule,
-            webhook_module_1.WebhookModule,
-        ],
+        imports: [typeorm_1.TypeOrmModule.forFeature([article_entity_1.Article]), category_module_1.CategoryModule, tag_module_1.TagModule, user_module_1.UserModule, auth_module_1.AuthModule],
         exports: [article_service_1.ArticleService],
-        providers: [article_service_1.ArticleService, scheduled_publish_service_1.ScheduledPublishService],
+        providers: [article_service_1.ArticleService],
         controllers: [article_controller_1.ArticleController],
     })
 ], ArticleModule);

package/server/dist/modules/article/article.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"article.module.js","sourceRoot":"","sources":["../../../src/modules/article/article.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAEhD,8DAAyD;AACzD,qDAAiD;AACjD,iEAA6D;AAC7D,kDAA8C;AAC9C,qDAAiD;AACjD,8DAA0D;AAC1D,uEAA4D;AAC5D,6DAAyD;AACzD,qDAA2C;AAC3C,uDAAmD;AACnD,2EAAsE;AAgBtE,IAAa,aAAa,GAA1B,MAAa,aAAa;CAAG,CAAA;AAAhB,aAAa;IAdzB,eAAM,CAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC,CAAC,wBAAO,EAAE,yCAAe,CAAC,CAAC;YACpD,gCAAc;YACd,sBAAS;YACT,wBAAU;YACV,wBAAU;YACV,6BAAY;YACZ,8BAAa;SACd;QACD,OAAO,EAAE,CAAC,gCAAc,CAAC;QACzB,SAAS,EAAE,CAAC,gCAAc,EAAE,mDAAuB,CAAC;QACpD,WAAW,EAAE,CAAC,sCAAiB,CAAC;KACjC,CAAC;GACW,aAAa,CAAG;AAAhB,sCAAa"}
+{"version":3,"file":"article.module.js","sourceRoot":"","sources":["../../../src/modules/article/article.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAEhD,qDAAiD;AACjD,iEAA6D;AAC7D,kDAA8C;AAC9C,qDAAiD;AACjD,6DAAyD;AACzD,qDAA2C;AAC3C,uDAAmD;AAQnD,IAAa,aAAa,GAA1B,MAAa,aAAa;CAAG,CAAA;AAAhB,aAAa;IANzB,eAAM,CAAC;QACN,OAAO,EAAE,CAAC,uBAAa,CAAC,UAAU,CAAC,CAAC,wBAAO,CAAC,CAAC,EAAE,gCAAc,EAAE,sBAAS,EAAE,wBAAU,EAAE,wBAAU,CAAC;QACjG,OAAO,EAAE,CAAC,gCAAc,CAAC;QACzB,SAAS,EAAE,CAAC,gCAAc,CAAC;QAC3B,WAAW,EAAE,CAAC,sCAAiB,CAAC;KACjC,CAAC;GACW,aAAa,CAAG;AAAhB,sCAAa"}

package/server/dist/modules/article/article.service.d.ts

@@ -1,18 +1,12 @@
 import { Repository } from 'typeorm';
 import { CategoryService } from '../category/category.service';
 import { TagService } from '../tag/tag.service';
-import { WebhookService } from '../webhook/webhook.service';
-import { ArticleRevision } from './article-revision.entity';
 import { Article } from './article.entity';
 export declare class ArticleService {
     private readonly articleRepository;
-    private readonly revisionRepository;
     private readonly tagService;
     private readonly categoryService;
-    private readonly webhookService;
-    constructor(articleRepository: Repository<Article>, revisionRepository: Repository<ArticleRevision>, tagService: TagService, categoryService: CategoryService, webhookService: WebhookService);
-    private saveRevision;
-    private notifyPublished;
+    constructor(articleRepository: Repository<Article>, tagService: TagService, categoryService: CategoryService);
     create(article: Partial<Article>): Promise<Article>;
     findAll(queryParams: any): Promise<[Article[], number]>;
     findArticlesByCategory(category: any, queryParams: any): Promise<(number | Article[])[]>;
@@ -28,8 +22,6 @@ export declare class ArticleService {
     }>;
     findById(id: any, status?: any, isAdmin?: boolean): Promise<Article>;
     updateById(id: any, article: Partial<Article>): Promise<Article>;
-    listRevisions(articleId: string): Promise<ArticleRevision[]>;
-    restoreRevision(articleId: string, revisionId: string): Promise<Article>;
     updateViewsById(id: any): Promise<Article>;
     updateLikesById(id: any, type: any): Promise<Article>;
     deleteById(id: any): Promise<Article>;

package/server/dist/modules/article/article.service.js

@@ -24,49 +24,28 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArticleService = void 0;
-const api_messages_1 = require("../../common/api-messages");
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_2 = require("typeorm");
 const date_util_1 = require("../../utils/date.util");
 const category_service_1 = require("../category/category.service");
 const tag_service_1 = require("../tag/tag.service");
-const webhook_service_1 = require("../webhook/webhook.service");
-const article_revision_entity_1 = require("./article-revision.entity");
 const article_entity_1 = require("./article.entity");
 const article_util_1 = require("./article.util");
 const Segment = require('segment');
 const segment = new Segment();
 segment.useDefault();
 let ArticleService = class ArticleService {
-    constructor(articleRepository, revisionRepository, tagService, categoryService, webhookService) {
+    constructor(articleRepository, tagService, categoryService) {
         this.articleRepository = articleRepository;
-        this.revisionRepository = revisionRepository;
         this.tagService = tagService;
         this.categoryService = categoryService;
-        this.webhookService = webhookService;
-    }
-    async saveRevision(article) {
-        const revision = this.revisionRepository.create({
-            articleId: article.id,
-            article,
-            title: article.title,
-            content: article.content,
-            html: article.html,
-            status: article.status,
-        });
-        await this.revisionRepository.save(revision);
-    }
-    async notifyPublished(article, extra = {}) {
-        if (article.status !== 'publish')
-            return;
-        await this.webhookService.dispatch('article.published', Object.assign({ id: article.id, title: article.title, status: article.status, publishAt: article.publishAt }, extra));
     }
     async create(article) {
         const { title } = article;
         const exist = await this.articleRepository.findOne({ where: { title } });
         if (exist) {
-            throw new common_1.HttpException(api_messages_1.ApiMsg.ARTICLE_TITLE_EXISTS, common_1.HttpStatus.BAD_REQUEST);
+            throw new common_1.HttpException('文章标题已存在', common_1.HttpStatus.BAD_REQUEST);
         }
         let { tags, category, status } = article;
         if (status === 'publish') {
@@ -78,7 +57,6 @@ let ArticleService = class ArticleService {
         const existCategory = await this.categoryService.findById(category);
         const newArticle = await this.articleRepository.create(Object.assign(Object.assign({}, article), { category: existCategory, tags, needPassword: !!article.password }));
         await this.articleRepository.save(newArticle);
-        await this.notifyPublished(newArticle);
         return newArticle;
     }
     async findAll(queryParams) {
@@ -220,47 +198,18 @@ let ArticleService = class ArticleService {
         return data;
     }
     async updateById(id, article) {
-        var _a;
         const oldArticle = await this.articleRepository.findOne(id);
-        await this.saveRevision(oldArticle);
         let { tags, category, status } = article;
         if (tags) {
             tags = await this.tagService.findByIds(('' + tags).split(','));
         }
         const existCategory = await this.categoryService.findById(category);
-        const becomingPublish = oldArticle.status === 'draft' && status === 'publish';
-        const newArticle = Object.assign(Object.assign({}, article), { views: oldArticle.views, category: existCategory, needPassword: !!article.password, publishAt: becomingPublish ? date_util_1.dateFormat() : oldArticle.publishAt, scheduledPublishAt: status === 'publish' ? null : (_a = article.scheduledPublishAt) !== null && _a !== void 0 ? _a : oldArticle.scheduledPublishAt });
+        const newArticle = Object.assign(Object.assign({}, article), { views: oldArticle.views, category: existCategory, needPassword: !!article.password, publishAt: oldArticle.status === 'draft' && status === 'publish' ? date_util_1.dateFormat() : oldArticle.publishAt });
         if (tags) {
             Object.assign(newArticle, { tags });
         }
         const updatedArticle = await this.articleRepository.merge(oldArticle, newArticle);
-        const saved = await this.articleRepository.save(updatedArticle);
-        if (becomingPublish) {
-            await this.notifyPublished(saved);
-        }
-        return saved;
-    }
-    async listRevisions(articleId) {
-        return this.revisionRepository.find({
-            where: { articleId },
-            order: { createAt: 'DESC' },
-            take: 50,
-        });
-    }
-    async restoreRevision(articleId, revisionId) {
-        const revision = await this.revisionRepository.findOne(revisionId);
-        if (!revision || revision.articleId !== articleId) {
-            throw new common_1.HttpException(api_messages_1.ApiMsg.REVISION_NOT_FOUND, common_1.HttpStatus.NOT_FOUND);
-        }
-        const article = await this.articleRepository.findOne(articleId);
-        await this.saveRevision(article);
-        const restored = await this.articleRepository.merge(article, {
-            title: revision.title,
-            content: revision.content,
-            html: revision.html,
-            status: revision.status,
-        });
-        return this.articleRepository.save(restored);
+        return this.articleRepository.save(updatedArticle);
     }
     async updateViewsById(id) {
         const oldArticle = await this.articleRepository.findOne(id);
@@ -346,12 +295,9 @@ let ArticleService = class ArticleService {
 ArticleService = __decorate([
     common_1.Injectable(),
     __param(0, typeorm_1.InjectRepository(article_entity_1.Article)),
-    __param(1, typeorm_1.InjectRepository(article_revision_entity_1.ArticleRevision)),
     __metadata("design:paramtypes", [typeorm_2.Repository,
-        typeorm_2.Repository,
         tag_service_1.TagService,
-        category_service_1.CategoryService,
-        webhook_service_1.WebhookService])
+        category_service_1.CategoryService])
 ], ArticleService);
 exports.ArticleService = ArticleService;
 //# sourceMappingURL=article.service.js.map