Skip to content

Commit

Permalink
Merge pull request #9489 from weseek/imprv/159173-159174-independent-…
Browse files Browse the repository at this point in the history
…pdf-converter-client-package

Imprv/159173 159174 independent pdf converter client package
  • Loading branch information
arafubeatbox authored Dec 19, 2024
2 parents 3c0ceea + add4a92 commit 7fcd8e2
Show file tree
Hide file tree
Showing 15 changed files with 80 additions and 20 deletions.
2 changes: 1 addition & 1 deletion apps/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
4 changes: 2 additions & 2 deletions apps/app/turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand All @@ -56,7 +56,7 @@
},

"lint": {
"dependsOn": ["^dev", "dev:pre:styles", "@growi/pdf-converter#build"]
"dependsOn": ["^dev", "dev:pre:styles"]
},

"test": {
Expand Down
1 change: 0 additions & 1 deletion apps/pdf-converter/.eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
/dist/**
/src/client-library/**
6 changes: 0 additions & 6 deletions apps/pdf-converter/orval.config.js

This file was deleted.

7 changes: 3 additions & 4 deletions apps/pdf-converter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
4 changes: 4 additions & 0 deletions apps/pdf-converter/turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions packages/pdf-converter-client/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
src/index.ts
dist/index.d.ts
dist/index.js
1 change: 1 addition & 0 deletions packages/pdf-converter-client/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dist/
6 changes: 6 additions & 0 deletions packages/pdf-converter-client/orval.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
'client-library': {
input: '../../apps/pdf-converter/specs/v3/docs/swagger.yaml',
output: './src/index.ts',
},
};
20 changes: 20 additions & 0 deletions packages/pdf-converter-client/package.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
File renamed without changes.
11 changes: 11 additions & 0 deletions packages/pdf-converter-client/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "dist",
"declaration": true,
"rootDir": "src",
"noEmit": false
},
"include": ["./src/**/*"]
}
16 changes: 16 additions & 0 deletions packages/pdf-converter-client/turbo.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
17 changes: 12 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7fcd8e2

Please sign in to comment.