From 21df66f83a8609babaaee6ff72c817e3d65ff20f Mon Sep 17 00:00:00 2001 From: Pugma Date: Thu, 18 Jan 2024 16:40:52 +0900 Subject: [PATCH 1/2] =?UTF-8?q?API=E5=8F=82=E7=85=A7=E5=85=88=E3=82=92GitH?= =?UTF-8?q?ub=E4=B8=8A=E5=85=AC=E9=96=8B=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E5=A4=89=E6=9B=B4=20=E5=85=B7=E4=BD=93=E7=9A=84?= =?UTF-8?q?=E3=81=AB=E3=81=AF=E3=83=90=E3=83=83=E3=82=AF=E3=82=A8=E3=83=B3?= =?UTF-8?q?=E3=83=89=E3=83=AA=E3=83=9D=E3=82=B8=E3=83=88=E3=83=AA=E3=81=AE?= =?UTF-8?q?main=E3=83=96=E3=83=A9=E3=83=B3=E3=83=81=E3=81=AE=E3=82=82?= =?UTF-8?q?=E3=81=AE=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/generateApi.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generateApi.js b/scripts/generateApi.js index bba7a69..ba233e6 100644 --- a/scripts/generateApi.js +++ b/scripts/generateApi.js @@ -7,7 +7,7 @@ const { promisify } = require('util') const execPromise = promisify(exec) const addApis = require('./addApis') -const SWAGGER_PATH = 'scripts/traPortfolio.v1.yaml' +const SWAGGER_PATH = 'https://raw.githubusercontent.com/traPtitech/traPortfolio/main/docs/swagger/traPortfolio.v1.yaml' const GENERATED_DIR = 'src/lib/apis/generated' const npx = process.platform === 'win32' ? 'npx.cmd' : 'npx' From 30a2827f5bc09b05311c388273400ef862e246ba Mon Sep 17 00:00:00 2001 From: Pugma Date: Thu, 18 Jan 2024 22:31:04 +0900 Subject: [PATCH 2/2] =?UTF-8?q?`setup-node`=E3=81=A8`artifact`=E3=82=92v4?= =?UTF-8?q?=E3=81=AB=20/=20=E4=B8=8D=E8=A6=81=E3=81=AAnpm=E3=82=B3?= =?UTF-8?q?=E3=83=9E=E3=83=B3=E3=83=89=E3=81=AE=E5=BB=83=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/main.yml | 25 ++++++++++++------------- package.json | 6 ++---- scripts/fetchOpenapi.js | 21 --------------------- 3 files changed, 14 insertions(+), 38 deletions(-) delete mode 100644 scripts/fetchOpenapi.js diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 561bc0c..f3966f7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: .node-version cache: npm @@ -22,13 +22,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: .node-version cache: npm - - run: SKIP_GENAPI=1 npm ci - - run: npm run postinstall - - uses: actions/upload-artifact@v3 + - run: npm ci + - uses: actions/upload-artifact@v4 with: name: apis path: ./src/lib/apis/generated @@ -38,12 +37,12 @@ jobs: needs: [packages, genApi] steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: .node-version cache: npm - run: SKIP_GENAPI=1 npm ci - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: apis path: ./src/lib/apis/generated @@ -56,12 +55,12 @@ jobs: needs: [packages, genApi] steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: .node-version cache: npm - run: SKIP_GENAPI=1 npm ci - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: apis path: ./src/lib/apis/generated @@ -72,12 +71,12 @@ jobs: needs: [packages, genApi] steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: .node-version cache: npm - run: SKIP_GENAPI=1 npm ci - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: apis path: ./src/lib/apis/generated @@ -88,12 +87,12 @@ jobs: needs: [packages, genApi] steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: .node-version cache: npm - run: SKIP_GENAPI=1 npm ci - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: apis path: ./src/lib/apis/generated diff --git a/package.json b/package.json index 5f1a021..5daae6c 100644 --- a/package.json +++ b/package.json @@ -9,11 +9,9 @@ "fix:format": "prettier --write src", "lint": "eslint --ext .ts,.vue src", "type-check": "tsc", - "fetch-openapi": "node scripts/fetchOpenapi.js", "gen-api": "node scripts/generateApi.js", - "start-mock": "prism mock -p 4010 -d scripts/traPortfolio.v1.yaml", - "clean": "rimraf scripts/traPorfolio.v1.yaml src/lib/apis/generated", - "postinstall": "npm run fetch-openapi && npm run gen-api" + "start-mock": "prism mock -p 4010 -d https://github.com/traPtitech/traPortfolio/blob/main/docs/swagger/traPortfolio.v1.yaml", + "postinstall": "npm run gen-api" }, "dependencies": { "@iconify/iconify": "^3.1.1", diff --git a/scripts/fetchOpenapi.js b/scripts/fetchOpenapi.js deleted file mode 100644 index 215b0d0..0000000 --- a/scripts/fetchOpenapi.js +++ /dev/null @@ -1,21 +0,0 @@ -/* eslint-disable @typescript-eslint/no-var-requires */ -/* eslint-disable no-undef */ -const fetch = require('node-fetch') -const fs = require('fs').promises -const path = require('path') - -const URL = - 'https://raw.githubusercontent.com/traPtitech/traPortfolio/master/docs/swagger/traPortfolio.v1.yaml' -const dist = './traPortfolio.v1.yaml' - -if (process.env.SKIP_GENAPI) { - // eslint-disable-next-line no-console - console.log('Skipped fetching openapi.') - return -} - -;(async () => { - const res = await fetch(URL) - const body = await res.text() - await fs.writeFile(path.resolve(__dirname, dist), body) -})()