From f0bb48c9c8e948a9836fdd844e27d4ea272f720f Mon Sep 17 00:00:00 2001 From: MangaOtaku Date: Sat, 4 Nov 2023 18:20:54 -0400 Subject: [PATCH 1/7] fix: nav items expect to be of type array (#6813) Co-authored-by: Mangaokaku --- server/models/sites.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/models/sites.mjs b/server/models/sites.mjs index 2d71edf7..97bf6d08 100644 --- a/server/models/sites.mjs +++ b/server/models/sites.mjs @@ -152,7 +152,7 @@ export class Site extends Model { await WIKI.db.navigation.query().insert({ id: newSite.id, siteId: newSite.id, - items: JSON.stringify([]) + items: [] }) WIKI.logger.debug(`Creating new DB storage for site ${newSite.id}`) From de14e7c4decd608f8f9d1aa4cd5f678b28179bd1 Mon Sep 17 00:00:00 2001 From: NGPixel Date: Sat, 4 Nov 2023 23:09:27 +0000 Subject: [PATCH 2/7] ci: fix build chunks + blocks import --- ux/quasar.config.js | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/ux/quasar.config.js b/ux/quasar.config.js index bd7f7764..6d5d36be 100644 --- a/ux/quasar.config.js +++ b/ux/quasar.config.js @@ -95,12 +95,24 @@ module.exports = configure(function (ctx) { viteConf.build.rollupOptions = { ...viteConf.build.rollupOptions ?? {}, output: { - manualChunks: { - lodash: ['lodash-es', 'lodash'], - quasar: ['quasar', 'quasar/src/components'] + manualChunks (id) { + if (id.includes('lodash')) { + return 'lodash' + } else if (id.includes('quasar')) { + return 'quasar' + } else if (id.includes('pages/Admin')) { + return 'admin' + } else if (id.includes('pages/Profile')) { + return 'profile' + } } } } + viteConf.build.chunkSizeWarningLimit = 5000 + viteConf.build.dynamicImportVarsOptions = { + warnOnError: true, + include: ['!/_blocks/**'] + } viteConf.optimizeDeps.include = [ 'prosemirror-state', 'prosemirror-transform', From 5677d853054f143e334a3dc47fcbf60131508af4 Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Sat, 4 Nov 2023 19:24:18 -0400 Subject: [PATCH 3/7] ci: Update build.yml workflow --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 49ee7dc8..57fcf582 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,10 +13,10 @@ jobs: packages: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Node.js environment - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20.x @@ -27,12 +27,12 @@ jobs: - name: Set Build Variables run: | - echo "REL_VERSION=3.0.0-alpha.$GITHUB_RUN_NUMBER" >> $GITHUB_ENV + echo "REL_VERSION=3.0.0-alpha.$GITHUB_RUN_NUMBER" >> $GITHUB_ENV - name: Disable DEV Flag + Set Version working-directory: server run: | - sudo apt-get install jq -y + brew install jq mv package.json pkg-temp.json jq --arg vs "$REL_VERSION_STRICT" -r '. + {dev:false, version:$vs}' pkg-temp.json > package.json rm pkg-temp.json From 7895a2130a713ceae1b06c4272295b5efb9aed2e Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Sat, 4 Nov 2023 19:26:19 -0400 Subject: [PATCH 4/7] ci: Update build.yml workflow --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 57fcf582..0ca02085 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,6 +32,7 @@ jobs: - name: Disable DEV Flag + Set Version working-directory: server run: | + ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" < /dev/null 2> /dev/null brew install jq mv package.json pkg-temp.json jq --arg vs "$REL_VERSION_STRICT" -r '. + {dev:false, version:$vs}' pkg-temp.json > package.json From 0395e453e6bae20218cc30c530b7bd4b1b30e787 Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Sat, 4 Nov 2023 19:28:40 -0400 Subject: [PATCH 5/7] ci: Update build.yml workflow --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ca02085..6020e64e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: - name: Disable DEV Flag + Set Version working-directory: server run: | - ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" < /dev/null 2> /dev/null + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" brew install jq mv package.json pkg-temp.json jq --arg vs "$REL_VERSION_STRICT" -r '. + {dev:false, version:$vs}' pkg-temp.json > package.json From b1b295c0be7b4adead30c9914773e7dd29e2277c Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Sat, 4 Nov 2023 19:35:36 -0400 Subject: [PATCH 6/7] ci: Update build.yml workflow --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6020e64e..9b1809b9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,6 +33,8 @@ jobs: working-directory: server run: | /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + (echo; echo 'eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"') >> /home/runner/.bashrc + eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" brew install jq mv package.json pkg-temp.json jq --arg vs "$REL_VERSION_STRICT" -r '. + {dev:false, version:$vs}' pkg-temp.json > package.json From 4f4b05e551104f83de70343fc6dac60db9d5b3c7 Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Sat, 4 Nov 2023 19:41:29 -0400 Subject: [PATCH 7/7] ci: Update build.yml workflow --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b1809b9..a960da4c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: working-directory: ux run: | pnpm install --frozen-lockfile --shamefully-hoist - pnpm build + NODE_OPTIONS=--max-old-space-size=8192 pnpm build - name: Build Blocks working-directory: blocks