Merge pull request #9489 from weseek/imprv/159173-159174-independent-pdf-converter-client-package

Imprv/159173 159174 independent pdf converter client package

apps/app/package.json

@@ -83,7 +83,7 @@
     "@growi/remark-growi-directive": "workspace:^",
     "@growi/remark-lsx": "workspace:^",
     "@growi/slack": "workspace:^",
-    "@growi/pdf-converter": "workspace:^",
+    "@growi/pdf-converter-client": "workspace:^",
     "@keycloak/keycloak-admin-client": "^18.0.0",
     "@slack/web-api": "^6.2.4",
     "@slack/webhook": "^6.0.0",

apps/app/src/features/page-bulk-export/server/service/page-bulk-export-job-cron/request-pdf-converter.ts

@@ -1,4 +1,4 @@
-import { PdfCtrlSyncJobStatus202Status, PdfCtrlSyncJobStatusBodyStatus, pdfCtrlSyncJobStatus } from '^/../pdf-converter/dist/client-library';
+import { PdfCtrlSyncJobStatus202Status, PdfCtrlSyncJobStatusBodyStatus, pdfCtrlSyncJobStatus } from '@growi/pdf-converter-client';
 
 import { configManager } from '~/server/service/config-manager';
 

apps/app/turbo.json

@@ -45,7 +45,7 @@
       "outputLogs": "new-only"
     },
     "dev": {
-      "dependsOn": ["^dev", "dev:migrate", "dev:pre:styles", "@growi/pdf-converter#build"],
+      "dependsOn": ["^dev", "dev:migrate", "dev:pre:styles"],
       "cache": false,
       "persistent": true
     },
@@ -56,7 +56,7 @@
     },
 
     "lint": {
-      "dependsOn": ["^dev", "dev:pre:styles", "@growi/pdf-converter#build"]
+      "dependsOn": ["^dev", "dev:pre:styles"]
     },
 
     "test": {

apps/pdf-converter/.eslintignore

@@ -1,2 +1 @@
 /dist/**
-/src/client-library/**

apps/pdf-converter/orval.config.js

@@ -1,6 +0,0 @@
-module.exports = {
-  'client-library': {
-    input: './specs/v3/docs/swagger.yaml',
-    output: './src/client-library/index.ts',
-  },
-};

apps/pdf-converter/package.json

@@ -11,8 +11,8 @@
     "start:prod:ci": "pnpm start:prod --ci",
     "start:prod": "node dist/index.js",
     "lint": "pnpm eslint **/*.{js,ts}",
-    "gen:client-code": "SWAGGER_GENERATION=true tsed run generate-swagger --output ./specs && orval",
-    "build": "pnpm gen:client-code && tsc -p tsconfig.build.json"
+    "gen:swagger-spec": "SWAGGER_GENERATION=true tsed run generate-swagger --output ./specs",
+    "build": "pnpm tsc -p tsconfig.build.json"
   },
   "dependencies": {
     "@godaddy/terminus": "^4.12.1",
@@ -39,7 +39,6 @@
     "@types/connect": "^3.4.38",
     "@types/express": "^4.17.21",
     "@types/multer": "^1.4.12",
-    "@types/node": "^22.5.4",
-    "orval": "=7.2.0"
+    "@types/node": "^22.5.4"
   }
 }

apps/pdf-converter/turbo.json

@@ -2,6 +2,10 @@
   "$schema": "https://turbo.build/schema.json",
   "extends": ["//"],
   "tasks": {
+    "gen:swagger-spec": {
+      "outputs": ["specs/**"],
+      "outputLogs": "new-only"
+    },
     "dev:pdf-converter": {
       "cache": false,
       "persistent": true

packages/pdf-converter-client/.eslintignore

@@ -0,0 +1,3 @@
+src/index.ts
+dist/index.d.ts
+dist/index.js

packages/pdf-converter-client/.gitignore

@@ -0,0 +1 @@
+dist/

packages/pdf-converter-client/orval.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  'client-library': {
+    input: '../../apps/pdf-converter/specs/v3/docs/swagger.yaml',
+    output: './src/index.ts',
+  },
+};

packages/pdf-converter-client/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "@growi/pdf-converter-client",
+  "version": "1.0.0",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "license": "MIT",
+  "private": true,
+  "scripts": {
+    "lint": "pnpm eslint **/*.{js,ts}",
+    "gen:client-code": "orval",
+    "dev": "pnpm gen:client-code && tsc -p tsconfig.json",
+    "build": "pnpm gen:client-code && tsc -p tsconfig.json"
+  },
+  "dependencies": {
+    "axios": "^0.24.0"
+  },
+  "devDependencies": {
+    "orval": "=7.2.0"
+  }
+}

packages/pdf-converter-client/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "outDir": "dist",
+    "declaration": true,
+    "rootDir": "src",
+    "noEmit": false
+  },
+  "include": ["./src/**/*"]
+}

packages/pdf-converter-client/turbo.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "https://turbo.build/schema.json",
+  "extends": ["//"],
+  "tasks": {
+    "build": {
+      "dependsOn": ["@growi/pdf-converter#gen:swagger-spec"],
+      "outputs": ["dist/**"],
+      "outputLogs": "new-only"
+    },
+    "dev": {
+      "dependsOn": ["@growi/pdf-converter#gen:swagger-spec"],
+      "outputs": ["dist/**"],
+      "outputLogs": "new-only"
+    }
+  }
+}

pnpm-lock.yaml

@@ -231,9 +231,9 @@ importers:
       '@growi/core':
         specifier: workspace:^
         version: link:../../packages/core
-      '@growi/pdf-converter':
+      '@growi/pdf-converter-client':
         specifier: workspace:^
-        version: link:../pdf-converter
+        version: link:../../packages/pdf-converter-client
       '@growi/pluginkit':
         specifier: workspace:^
         version: link:../../packages/pluginkit
@@ -1010,9 +1010,6 @@ importers:
       '@types/node':
         specifier: ^22.5.4
         version: 22.8.7
-      orval:
-        specifier: '=7.2.0'
-        version: 7.2.0(encoding@0.1.13)(openapi-types@12.1.3)(typescript@5.4.2)
 
   apps/slackbot-proxy:
     dependencies:
@@ -1309,6 +1306,16 @@ importers:
         specifier: ^13.6.19
         version: 13.6.19
 
+  packages/pdf-converter-client:
+    dependencies:
+      axios:
+        specifier: ^0.24.0
+        version: 0.24.0
+    devDependencies:
+      orval:
+        specifier: '=7.2.0'
+        version: 7.2.0(encoding@0.1.13)(openapi-types@12.1.3)(typescript@5.4.2)
+
   packages/pluginkit:
     dependencies:
       '@growi/core':