diff --git a/.github/workflows/generate-and-test-sdk.yaml b/.github/workflows/generate-and-test-sdk.yaml index 14791272..9b78a33f 100644 --- a/.github/workflows/generate-and-test-sdk.yaml +++ b/.github/workflows/generate-and-test-sdk.yaml @@ -29,6 +29,10 @@ jobs: with: name: core path: core + - uses: actions/upload-artifact@v3 + with: + name: dependencies + path: generator/src/main/resources/dependencies/package.json - uses: actions/upload-artifact@v3 with: name: sdk @@ -41,6 +45,10 @@ jobs: with: name: sdk path: generator/target/sdk + - uses: actions/download-artifact@v3 + with: + name: dependencies + path: generator/src/main/resources/dependencies/package.json - uses: actions/download-artifact@v3 with: name: core diff --git a/generator/src/main/resources/dependencies/package.json b/generator/src/main/resources/dependencies/package.json new file mode 100644 index 00000000..17fe6008 --- /dev/null +++ b/generator/src/main/resources/dependencies/package.json @@ -0,0 +1,19 @@ +{ + "main": "lib/index.js", + "publishConfig": { + "access": "public" + }, + "dependencies": { + "@types/node": "20.1.2", + "@types/uuid": "9.0.1", + "uuid": "9.0.0", + "typescript-json-serializer": "6.0.0" + }, + "devDependencies": { + "prettier": "2.8.7", + "prettier-plugin-organize-imports": "3.2.2", + "typedoc": "0.25.0", + "typedoc-plugin-markdown": "4.0.0-next.17", + "typedoc-plugin-missing-exports": "2.1.0" + } +} diff --git a/generator/src/main/resources/templates/expediagroup-sdk/package.mustache b/generator/src/main/resources/templates/expediagroup-sdk/package.mustache index 75d4956c..b79214c9 100644 --- a/generator/src/main/resources/templates/expediagroup-sdk/package.mustache +++ b/generator/src/main/resources/templates/expediagroup-sdk/package.mustache @@ -7,24 +7,8 @@ "clean": "rm -rf .openapi-generator apis auth http types", "build": "prettier --write '**/*.ts'", "fetch-core": "mkdir -p core/src && cp -r ../../../core/src ./core/ && cp -r ../../../core/index.ts ./core/index.ts", - "merge-packages": "npm install -g merge-packages && npx merge-packages -o package.json package.json ../../../core/package.json", + "merge-packages": "npm install -g merge-packages && npx merge-packages -o package.json package.json ../../src/main/resources/dependencies/package.json ../../../core/package.json", "generate-docs": "npx typedoc", "prepare-sdk": "npm run merge-packages && npm run fetch-core && npm run clean && npm i && npm run build" - }, - "publishConfig": { - "access": "public" - }, - "dependencies": { - "@types/node": "20.1.2", - "@types/uuid": "9.0.1", - "uuid": "9.0.0", - "typescript-json-serializer": "6.0.0" - }, - "devDependencies": { - "prettier": "2.8.7", - "prettier-plugin-organize-imports": "3.2.2", - "typedoc": "0.25.0", - "typedoc-plugin-markdown": "4.0.0-next.17", - "typedoc-plugin-missing-exports": "2.1.0" } }