build scripts

.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

.github/workflows/build-app-pro-beta.yaml

@@ -55,14 +55,11 @@ jobs:
           cd ..
           cd dbgate-merged
           yarn adjustPackageJson
-      - name: yarn adjustAppPackageJson
+      - name: adjustAppPackageJsonPremium
-        run: |
-          yarn adjustAppPackageJson
-      - name: adjustPackageJsonPremium
         run: |
           cd ..
           cd dbgate-merged
-          node adjustPackageJsonPremium
+          node adjustAppPackageJsonPremium
       - name: setUpdaterChannel premium-beta
         run: |
           cd ..

.github/workflows/build-app-pro.yaml

@@ -56,14 +56,11 @@ jobs:
           cd ..
           cd dbgate-merged
           yarn adjustPackageJson
-      - name: yarn adjustAppPackageJson
+      - name: adjustAppPackageJsonPremium
-        run: |
-          yarn adjustAppPackageJson
-      - name: yarn adjustPackageJsonPremium
         run: |
           cd ..
           cd dbgate-merged
-          node adjustPackageJsonPremium
+          node adjustAppPackageJsonPremium
       - name: setUpdaterChannel premium
         run: |
           cd ..

.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

.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 ..

.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 ..

.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

.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
+      - name: Publish dbgate-web-premium
-        working-directory: packages/datalib
-        run: |
-          npm publish
-
-      - name: Publish filterparser
-        working-directory: packages/filterparser
-        run: |
-          npm publish
-
-      - name: Publish web
         working-directory: packages/web
         run: |
           npm publish
 
-      - name: Publish dbgate (obsolete)
+      - name: Publish dbgate-serve-premium
-        working-directory: packages/dbgate
-        run: |
-          npm publish
-
-      - name: Publish dbgate-serve
         working-directory: packages/serve
         run: |
           npm publish
 
-      - name: Publish dbmodel
+      - name: Publish dbgate-plugin-cosmosdb
-        working-directory: packages/dbmodel
+        working-directory: plugins/dbgate-plugin-cosmosdb
-        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
         run: |
           npm publish

adjustAppPackageJson.js

@@ -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');

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",