diff --git a/.github/workflows/build-app-beta.yaml b/.github/workflows/build-app-beta.yaml index 24b326342..1b645bb42 100644 --- a/.github/workflows/build-app-beta.yaml +++ b/.github/workflows/build-app-beta.yaml @@ -30,6 +30,9 @@ 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 25b4ac545..4de459c1b 100644 --- a/.github/workflows/build-app-pro-beta.yaml +++ b/.github/workflows/build-app-pro-beta.yaml @@ -55,6 +55,9 @@ jobs: cd .. cd dbgate-merged yarn adjustPackageJson + - name: yarn adjustAppPackageJson + run: | + yarn adjustAppPackageJson - name: adjustPackageJsonPremium run: | cd .. diff --git a/.github/workflows/build-app-pro.yaml b/.github/workflows/build-app-pro.yaml index ff1630b9b..9311e4973 100644 --- a/.github/workflows/build-app-pro.yaml +++ b/.github/workflows/build-app-pro.yaml @@ -56,6 +56,9 @@ jobs: cd .. cd dbgate-merged yarn adjustPackageJson + - name: yarn adjustAppPackageJson + run: | + yarn adjustAppPackageJson - name: yarn adjustPackageJsonPremium run: | cd .. diff --git a/.github/workflows/build-app.yaml b/.github/workflows/build-app.yaml index 4e3b56e0c..83c6169d0 100644 --- a/.github/workflows/build-app.yaml +++ b/.github/workflows/build-app.yaml @@ -34,6 +34,9 @@ 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/adjustAppPackageJson.js b/adjustAppPackageJson.js new file mode 100644 index 000000000..6fabe31c0 --- /dev/null +++ b/adjustAppPackageJson.js @@ -0,0 +1,9 @@ +const fs = require('fs'); + +function adjustFile(file) { + const json = JSON.parse(fs.readFileSync(file, { encoding: 'utf-8' })); + json.workspaces.push('app'); + fs.writeFileSync(file, JSON.stringify(json, null, 2), 'utf-8'); +} + +adjustFile('app/package.json'); diff --git a/package.json b/package.json index 14ad77092..7434daf89 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "build:filterparser": "yarn workspace dbgate-filterparser build", "build:tools": "yarn workspace dbgate-tools build", "build:lib": "yarn build:sqltree && yarn build:tools && yarn build:filterparser && yarn build:datalib", - "build:app": "yarn plugins:copydist && cd app && yarn install && yarn build", + "build:app": "yarn plugins:copydist && cd app && yarn build", "build:api": "yarn workspace dbgate-api build", "build:web": "yarn workspace dbgate-web build", "build:plugins:frontend": "workspaces-run --only=\"dbgate-plugin-*\" -- yarn build:frontend", @@ -47,6 +47,7 @@ "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",