Skip to content

Commit 5c92dc1

Browse files
authored
Merge pull request #10013 from weseek/imprv/build-openapi-utils
imprv: Build OpenAPI utils to generate spec
2 parents c766212 + fa2a258 commit 5c92dc1

File tree

12 files changed

+49
-24
lines changed

12 files changed

+49
-24
lines changed

.eslintignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

.eslintrc.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/**
2+
* @type {import('eslint').Linter.Config}
3+
*/
14
module.exports = {
25
root: true, // https://eslint.org/docs/user-guide/configuring/configuration-files#cascading-and-hierarchy
36
extends: [
@@ -7,6 +10,9 @@ module.exports = {
710
plugins: [
811
'regex',
912
],
13+
ignorePatterns: [
14+
'node_modules/**',
15+
],
1016
rules: {
1117
'import/prefer-default-export': 'off',
1218
'import/order': [
@@ -73,7 +79,7 @@ module.exports = {
7379
overrides: [
7480
{
7581
// enable the rule specifically for TypeScript files
76-
files: ['*.ts', '*.tsx'],
82+
files: ['*.ts', '*.mts', '*.tsx'],
7783
rules: {
7884
'@typescript-eslint/explicit-module-boundary-types': ['error'],
7985
},

apps/app/.eslintignore

Lines changed: 0 additions & 6 deletions
This file was deleted.

apps/app/.eslintrc.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
1+
/**
2+
* @type {import('eslint').Linter.Config}
3+
*/
14
module.exports = {
25
extends: [
36
'next/core-web-vitals',
47
'weseek/react',
58
],
69
plugins: [
710
],
11+
ignorePatterns: [
12+
'dist/**',
13+
'**/dist/**',
14+
'transpiled/**',
15+
'public/**',
16+
'src/linter-checker/**',
17+
'tmp/**',
18+
'next-env.d.ts',
19+
],
820
settings: {
921
// resolve path aliases by eslint-import-resolver-typescript
1022
'import/resolver': {
@@ -25,7 +37,7 @@ module.exports = {
2537
overrides: [
2638
{
2739
// enable the rule specifically for JavaScript files
28-
files: ['*.js', '*.jsx'],
40+
files: ['*.js', '*.mjs', '*.jsx'],
2941
rules: {
3042
// set 'warn' temporarily -- 2023.08.14 Yuki Takei
3143
'react/prop-types': 'warn',
@@ -35,7 +47,7 @@ module.exports = {
3547
},
3648
{
3749
// enable the rule specifically for TypeScript files
38-
files: ['*.ts', '*.tsx'],
50+
files: ['*.ts', '*.mts', '*.tsx'],
3951
rules: {
4052
'no-unused-vars': 'off',
4153
// set 'warn' temporarily -- 2023.08.14 Yuki Takei

apps/app/bin/openapi/generate-operation-ids/cli.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ export const main = async(): Promise<void> => {
2424
}
2525
};
2626

27-
if (require.main === module) {
27+
if (import.meta.url === `file://${process.argv[1]}`) {
2828
main();
2929
}

apps/app/bin/openapi/generate-spec-apiv3.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ swagger-jsdoc \
1919
"${APP_PATH}/src/server/models/openapi/**/*.{js,ts}"
2020

2121
if [ $? -eq 0 ]; then
22-
ts-node "${APP_PATH}/bin/openapi/generate-operation-ids/cli.ts" "${OUT}" --out "${OUT}" --overwrite-existing
22+
pnpm dlx tsx "${APP_PATH}/bin/openapi/generate-operation-ids/cli.ts" "${OUT}" --out "${OUT}" --overwrite-existing
2323
echo "OpenAPI spec generated and transformed: ${OUT}"
2424
fi

apps/app/package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
"//// for CI": "",
2828
"launch-dev:ci": "cross-env NODE_ENV=development pnpm run dev:migrate && pnpm run ts-node src/server/app.ts --ci",
2929
"lint:typecheck": "vue-tsc --noEmit",
30-
"lint:eslint": "eslint --quiet \"**/*.{js,jsx,ts,tsx}\"",
30+
"lint:eslint": "eslint --quiet \"**/*.{js,mjs,jsx,ts,mts,tsx}\"",
3131
"lint:styles": "stylelint \"src/**/*.scss\"",
32-
"lint:swagger2openapi:apiv3": "node node_modules/swagger2openapi/oas-validate tmp/openapi-spec-apiv3.json",
33-
"lint:swagger2openapi:apiv1": "node node_modules/swagger2openapi/oas-validate tmp/openapi-spec-apiv1.json",
32+
"lint:openapi:apiv3": "node node_modules/swagger2openapi/oas-validate tmp/openapi-spec-apiv3.json",
33+
"lint:openapi:apiv1": "node node_modules/swagger2openapi/oas-validate tmp/openapi-spec-apiv1.json",
3434
"lint": "run-p lint:**",
35-
"prelint:swagger2openapi:apiv3": "pnpm run swagger2openapi:apiv3",
36-
"prelint:swagger2openapi:apiv1": "pnpm run swagger2openapi:apiv1",
35+
"prelint:openapi:apiv3": "pnpm run openapi:generate-spec:apiv3",
36+
"prelint:openapi:apiv1": "pnpm run openapi:generate-spec:apiv1",
3737
"test": "run-p test:*",
3838
"test:jest": "cross-env NODE_ENV=test TS_NODE_PROJECT=test/integration/tsconfig.json jest",
3939
"test:vitest": "vitest run --coverage",
@@ -43,8 +43,9 @@
4343
"//// misc": "",
4444
"console": "npm run repl",
4545
"repl": "cross-env NODE_ENV=development npm run ts-node src/server/repl.ts",
46-
"swagger2openapi:apiv3": "sh bin/openapi/generate-spec-apiv3.sh",
47-
"swagger2openapi:apiv1": "sh bin/openapi/generate-spec-apiv1.sh",
46+
"openapi:build:generate-operation-ids": "vite build -c bin/openapi/generate-operation-ids/vite.config.ts",
47+
"openapi:generate-spec:apiv3": "sh bin/openapi/generate-spec-apiv3.sh",
48+
"openapi:generate-spec:apiv1": "sh bin/openapi/generate-spec-apiv1.sh",
4849
"ts-node": "node -r ts-node/register/transpile-only -r tsconfig-paths/register -r dotenv-flow/config",
4950
"version:patch": "pnpm version patch",
5051
"version:prerelease": "pnpm version prerelease --preid=RC",

apps/app/vitest.workspace.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const configShared = defineConfig({
1515
'test/**',
1616
'test-with-vite/**',
1717
'playwright/**',
18-
]
18+
],
1919
},
2020
});
2121

apps/pdf-converter/.eslintignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

apps/pdf-converter/.eslintrc.cjs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1+
/**
2+
* @type {import('eslint').Linter.Config}
3+
*/
14
module.exports = {
25
extends: '../../.eslintrc.js',
6+
ignorePatterns: [
7+
'dist/**',
8+
],
39
rules: {
410
'no-useless-constructor': 'off',
511
'@typescript-eslint/consistent-type-imports': 'off',

0 commit comments

Comments
 (0)