diff --git a/.github/workflows/build-app-beta.yaml b/.github/workflows/build-app-beta.yaml index 1b645bb42..24b326342 100644 --- a/.github/workflows/build-app-beta.yaml +++ b/.github/workflows/build-app-beta.yaml @@ -30,9 +30,6 @@ jobs: - name: yarn adjustPackageJson run: | yarn adjustPackageJson - - name: yarn adjustAppPackageJson - run: | - yarn adjustAppPackageJson - name: setUpdaterChannel beta run: | node setUpdaterChannel beta diff --git a/.github/workflows/build-app-pro-beta.yaml b/.github/workflows/build-app-pro-beta.yaml index 4de459c1b..df2a1712d 100644 --- a/.github/workflows/build-app-pro-beta.yaml +++ b/.github/workflows/build-app-pro-beta.yaml @@ -55,14 +55,11 @@ jobs: cd .. cd dbgate-merged yarn adjustPackageJson - - name: yarn adjustAppPackageJson - run: | - yarn adjustAppPackageJson - - name: adjustPackageJsonPremium + - name: adjustAppPackageJsonPremium run: | cd .. cd dbgate-merged - node adjustPackageJsonPremium + node adjustAppPackageJsonPremium - name: setUpdaterChannel premium-beta run: | cd .. diff --git a/.github/workflows/build-app-pro.yaml b/.github/workflows/build-app-pro.yaml index 9311e4973..e505bb90b 100644 --- a/.github/workflows/build-app-pro.yaml +++ b/.github/workflows/build-app-pro.yaml @@ -56,14 +56,11 @@ jobs: cd .. cd dbgate-merged yarn adjustPackageJson - - name: yarn adjustAppPackageJson - run: | - yarn adjustAppPackageJson - - name: yarn adjustPackageJsonPremium + - name: adjustAppPackageJsonPremium run: | cd .. cd dbgate-merged - node adjustPackageJsonPremium + node adjustAppPackageJsonPremium - name: setUpdaterChannel premium run: | cd .. diff --git a/.github/workflows/build-app.yaml b/.github/workflows/build-app.yaml index 83c6169d0..4e3b56e0c 100644 --- a/.github/workflows/build-app.yaml +++ b/.github/workflows/build-app.yaml @@ -34,9 +34,6 @@ jobs: - name: yarn adjustPackageJson run: | yarn adjustPackageJson - - name: yarn adjustAppPackageJson - run: | - yarn adjustAppPackageJson - name: yarn set timeout run: | yarn config set network-timeout 100000 diff --git a/.github/workflows/build-aws-pro-beta.yaml b/.github/workflows/build-aws-pro-beta.yaml index 2467552da..13fb7b0a0 100644 --- a/.github/workflows/build-aws-pro-beta.yaml +++ b/.github/workflows/build-aws-pro-beta.yaml @@ -54,6 +54,12 @@ jobs: node sync.js --nowatch cd .. + - name: yarn adjustPackageJson + run: | + cd .. + cd dbgate-merged + yarn adjustPackageJson + - name: yarn install run: | cd .. diff --git a/.github/workflows/build-docker-pro.yaml b/.github/workflows/build-docker-pro.yaml index f6f6eee61..af6476cfe 100644 --- a/.github/workflows/build-docker-pro.yaml +++ b/.github/workflows/build-docker-pro.yaml @@ -62,6 +62,12 @@ jobs: node sync.js --nowatch cd .. + - name: yarn adjustPackageJson + run: | + cd .. + cd dbgate-merged + yarn adjustPackageJson + - name: yarn install run: | cd .. diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index dd72ec537..9745324c8 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -56,6 +56,13 @@ jobs: uses: actions/setup-node@v1 with: node-version: 18.x + + - name: yarn adjustPackageJson + run: | + cd .. + cd dbgate-merged + yarn adjustPackageJson + - name: yarn install run: | # yarn --version diff --git a/.github/workflows/build-npm-pro.yaml b/.github/workflows/build-npm-pro.yaml index 17fb61288..a23c061c4 100644 --- a/.github/workflows/build-npm-pro.yaml +++ b/.github/workflows/build-npm-pro.yaml @@ -54,6 +54,12 @@ jobs: node sync.js --nowatch cd .. + - name: adjustNpmPackageJsonPremium + run: | + cd .. + cd dbgate-merged + node adjustNpmPackageJsonPremium + - name: Configure NPM token env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} @@ -82,92 +88,22 @@ jobs: env: GIST_UPLOAD_SECRET : ${{secrets.GIST_UPLOAD_SECRET}} - - name: Publish api + - name: Publish dbgate-api-premium working-directory: packages/api run: | npm publish - - name: Publish datalib - working-directory: packages/datalib - run: | - npm publish - - - name: Publish filterparser - working-directory: packages/filterparser - run: | - npm publish - - - name: Publish web + - name: Publish dbgate-web-premium working-directory: packages/web run: | npm publish - - name: Publish dbgate (obsolete) - working-directory: packages/dbgate - run: | - npm publish - - - name: Publish dbgate-serve + - name: Publish dbgate-serve-premium working-directory: packages/serve run: | npm publish - - name: Publish dbmodel - working-directory: packages/dbmodel - run: | - npm publish - - - name: Publish dbgate-plugin-csv - working-directory: plugins/dbgate-plugin-csv - run: | - npm publish - - - name: Publish dbgate-plugin-xml - working-directory: plugins/dbgate-plugin-xml - run: | - npm publish - - - name: Publish dbgate-plugin-excel - working-directory: plugins/dbgate-plugin-excel - run: | - npm publish - - - name: Publish dbgate-plugin-mssql - working-directory: plugins/dbgate-plugin-mssql - run: | - npm publish - - - name: Publish dbgate-plugin-mysql - working-directory: plugins/dbgate-plugin-mysql - run: | - npm publish - - - name: Publish dbgate-plugin-mongo - working-directory: plugins/dbgate-plugin-mongo - run: | - npm publish - - - name: Publish dbgate-plugin-postgres - working-directory: plugins/dbgate-plugin-postgres - run: | - npm publish - - - name: Publish dbgate-plugin-sqlite - working-directory: plugins/dbgate-plugin-sqlite - run: | - npm publish - - - name: Publish dbgate-plugin-redis - working-directory: plugins/dbgate-plugin-redis - run: | - npm publish - - - name: Publish dbgate-plugin-oracle - working-directory: plugins/dbgate-plugin-oracle - run: | - npm publish - - - name: Publish dbgate-plugin-clickhouse - working-directory: plugins/dbgate-plugin-clickhouse + - name: Publish dbgate-plugin-cosmosdb + working-directory: plugins/dbgate-plugin-cosmosdb run: | npm publish diff --git a/adjustAppPackageJson.js b/adjustAppPackageJson.js deleted file mode 100644 index a970c001d..000000000 --- a/adjustAppPackageJson.js +++ /dev/null @@ -1,9 +0,0 @@ -const fs = require('fs'); - -function adjustAppPackageJson(file) { - const json = JSON.parse(fs.readFileSync(file, { encoding: 'utf-8' })); - json.workspaces = ['../packages/tools', '../packages/types', '../packages/sqltree']; - fs.writeFileSync(file, JSON.stringify(json, null, 2), 'utf-8'); -} - -adjustAppPackageJson('app/package.json'); diff --git a/package.json b/package.json index 85cd4ba8c..b531667ba 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,6 @@ "printSecrets": "node printSecrets", "generatePadFile": "node generatePadFile", "adjustPackageJson": "node adjustPackageJson", - "adjustAppPackageJson": "node adjustAppPackageJson", "fillPackagedPlugins": "node fillPackagedPlugins", "resetPackagedPlugins": "node resetPackagedPlugins", "prettier": "prettier --write packages/api/src && prettier --write packages/datalib/src && prettier --write packages/filterparser/src && prettier --write packages/sqltree/src && prettier --write packages/tools/src && prettier --write packages/types && prettier --write packages/web/src && prettier --write app/src",