Merge pull request #9345 from weseek/master

Release v7.1.1

.devcontainer/postCreateCommand.sh

@@ -3,7 +3,6 @@ sudo chown -R vscode:vscode /workspace;
 # Instal additional packages
 sudo apt update
 sudo apt-get install -y --no-install-recommends \
-  git-lfs \
   iputils-ping net-tools dnsutils
 sudo apt-get clean -y
 

.github/workflows/reusable-app-prod.yml

@@ -11,6 +11,18 @@ on:
     secrets:
       SLACK_WEBHOOK_URL:
         required: true
+  workflow_dispatch:
+    inputs:
+      node-version:
+        required: true
+        type: string
+        default: 20.x
+      skip-e2e-test:
+        type: boolean
+        default: false
+    secrets:
+      SLACK_WEBHOOK_URL:
+        required: true
 
 jobs:
 
@@ -23,10 +35,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Install Git LFS
-      run: |
-        git lfs install
-
     - uses: pnpm/action-setup@v4
 
     - uses: actions/setup-node@v4
@@ -165,6 +173,10 @@ jobs:
   run-playwright:
     needs: [build-prod]
 
+    if: |
+      github.event_name == 'workflow_dispatch' ||
+      (!inputs.skip-e2e-test && startsWith(github.head_ref, 'mergify/merge-queue/'))
+
     runs-on: ubuntu-latest
     container:
       # Match the Playwright version
@@ -227,6 +239,7 @@ jobs:
       run: |
         pnpm playwright test --project=chromium/installer
       env:
+        DEBUG: pw:api
         HOME: /root # ref: https://github.com/microsoft/playwright/issues/6500
         MONGO_URI: mongodb://mongodb:27017/growi-playwright-installer
         ELASTICSEARCH_URI: http://localhost:${{ job.services.elasticsearch.ports['9200'] }}/growi
@@ -241,6 +254,7 @@ jobs:
       run: |
         pnpm playwright test --project=${{ matrix.browser }} --shard=${{ matrix.shard }}
       env:
+        DEBUG: pw:api
         HOME: /root # ref: https://github.com/microsoft/playwright/issues/6500
         MONGO_URI: mongodb://mongodb:27017/growi-playwright
         ELASTICSEARCH_URI: http://localhost:${{ job.services.elasticsearch.ports['9200'] }}/growi
@@ -255,10 +269,19 @@ jobs:
       run: |
         pnpm playwright test --project=${{ matrix.browser }}/guest-mode --shard=${{ matrix.shard }}
       env:
+        DEBUG: pw:api
         HOME: /root # ref: https://github.com/microsoft/playwright/issues/6500
         MONGO_URI: mongodb://mongodb:27017/growi-playwright-guest-mode
         ELASTICSEARCH_URI: http://localhost:${{ job.services.elasticsearch.ports['9200'] }}/growi
 
+    - name: Upload test results
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: blob-report-${{ matrix.shard }}
+        path: blob-report
+        retention-days: 30
+
     - name: Slack Notification
       uses: weseek/ghaction-slack-notification@master
       if: failure()
@@ -268,3 +291,35 @@ jobs:
         channel: '#ci'
         isCompactMode: true
         url: ${{ secrets.SLACK_WEBHOOK_URL }}
+
+
+  report-playwright:
+    needs: [run-playwright]
+
+    if: always() && needs.run-playwright.result != 'skipped'
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - uses: pnpm/action-setup@v4
+
+    - uses: actions/setup-node@v4
+      with:
+        node-version: ${{ inputs.node-version }}
+        cache: 'pnpm'
+
+    - name: Install dependencies
+      run: |
+        pnpm install --frozen-lockfile
+
+    - name: Merge into HTML Report
+      run: pnpm playwright merge-reports --reporter html ./all-blob-reports
+
+    - name: Upload HTML report
+      uses: actions/upload-artifact@v4
+      with:
+        name: html-report
+        path: playwright-report
+        retention-days: 30

.vscode/settings.json

@@ -19,5 +19,12 @@
 
   "githubPullRequests.ignoredPullRequestBranches": [
     "master"
-  ]
+  ],
+
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "typescript.enablePromptUseWorkspaceTsdk": true,
+  "typescript.preferences.autoImportFileExcludePatterns": ["node_modules/*"],
+  "typescript.validate.enable": true,
+  "typescript.surveys.enabled": false
+
 }

CHANGELOG.md

@@ -6,76 +6,47 @@
 
 ## [v7.1.0](https://github.com/weseek/growi/compare/v7.0.23...v7.1.0) - 2024-10-31
 
-### 💎 Features
+### BREAKING CHANGES
 
-* feat: GROWI OpenAI Integration (#9246) @yuki-takei
+* imprv: Update default value for S3\_OBJECT\_ACL (#9332) @yuki-takei
 
-### BREAKING CHANGES
+### 💎 Features
 
-* feat: Generate vector store inside GROWI (#9217) @miya
-
-* feat: Separate markdown into headings and paragraphs (#9173) @nHigashiWeseek
-
-* imprv: Update default value for S3_OBJECT_ACL (#9332) @yuki-takei
-
+* feat: GROWI OpenAI Integration (#9246) @yuki-takei
 
 ### 🚀 Improvement
 
-* support: Evaluate whether env vars are secret or not by the `isSecret` property (#9226) @yuki-takei
-* imprv: Update default value for S3_OBJECT_ACL (#9332) @yuki-takei
-* imprv: Update Recent Changes when a page is created, updated, or deleted (#9092) @nHigashiWeseek
-* imprv: Sandbox (#9330) @yuki-takei
 * imprv: Add GitHub Markdown alerts  (#9127) @reiji-h
-* support: JSDoc for OpenAPI document (#9311) @yuki-takei
-* imprv: Documentation URL for g2gtransfer (#9183) @moekumasaka
-* imprv: The color of the dropdown list when it is activated (#9102) @WNomunomu
-* imprv: PageTitleHeader max-width (#9166) @yuki-takei
-* imprv: Documentation URL for g2gtransfer (#9157) @yuki-takei
-* imprv: Corrected wording on admin page (/admin/data-transfer) (#9106) @miya
 * imprv: Upgrade unified and remark-growi-directive (#9048) @reiji-h
 * imprv: ROM users can manage comments (#9101) @WNomunomu
+* imprv: Update default value for S3\_OBJECT\_ACL (#9332) @yuki-takei
+* imprv: Sandbox (#9330) @yuki-takei
+* support: JSDoc for OpenAPI document (#9311) @yuki-takei
+
 
 ### 🐛 Bug Fixes
 
-* fix: Add validators to lsx API (#9182) @WNomunomu
 * fix: Couldn't show old revision (#9296) @yuki-takei
-* fix: Set an unknown label when the user is not found (#9232) @yuki-takei
 * fix: Replace the word ROM (#9295) @satof3
-* fix: Display revisions only if they are not corrupted (#9099) @WNomunomu
 * fix: forgot-password API (#9257) @reiji-h
-* fix: Make it impossible to overwrite grants on descendant pages when 'anyone with the link' is selected. (#9125) @WNomunomu
 * fix: Edit button appear for the side of header (#9270) @yuki-takei
-* fix: Forgot password API - reject requests with invalid email format (#9179) @abichan99911111
 * fix: Ensure text-only paste for mixed content from various sources (#9096) @reiji-h
 * fix: Notification count badge (#9124) @shironegi39
-* fix: Make PageAccessoriesModal responsive (#9171) @moekumasaka
-* fix: PageControls unexpectedly move in response to opening and closing the sidebar (#9094) @WNomunomu
-* fix: Make CustomNavTab responsive (#9123) @moekumasaka
+* fix(ogp): Set an unknown label when the user is not found (#9232) @yuki-takei
 
 ### 🧰 Maintenance
 
-* support: Merge dev/7.1.x into master (#9247) @yuki-takei
+* support: Migrate to pnpm from yarn v1 (#9249) @yuki-takei
 * support: Omit MongoDB 4.x compatible code (#9334) @yuki-takei
-* support: Hide env vars for OpenAI (#9228) @yuki-takei
 * support: Pull LFS files with turbo (#9325) @yuki-takei
-* support: Evaluate whether env vars are secret or not by the `isSecret` property (#9226) @yuki-takei
 * support: Use `pnpm deploy` instead of `turbo prune` (#9323) @yuki-takei
+* support: Maintenance API docs generation (#9302) @yuki-takei
 * support: Improve typings for PageService (#9220) @yuki-takei
 * support: Typescriptize accessTokenParser (#9320) @yuki-takei
-* support: Upgrade codemirror and yjs packages (#9218) @yuki-takei
 * support: Migrate to pnpm from yarn v1 (#9249) @yuki-takei
-* support: Upgrade codemirror and yjs packages (#9215) @yuki-takei
 * support: JSDoc for OpenAPI document (#9311) @yuki-takei
-* ci(deps): bump rollup from 4.22.0 to 4.22.4 (#9160) @dependabot
 * support: Maintenance API docs generation (#9302) @yuki-takei
-* ci(deps): bump google-github-actions/setup-gcloud from 1 to 2 (#9153) @dependabot
 * support: Omit docs route (#9299) @yuki-takei
-* ci(deps): bump softprops/action-gh-release from 1 to 2 (#9152) @dependabot
-* support: Improve vitest environment (#9144) @yuki-takei
-* ci(deps): bump next from 14.1.3 to 14.2.13 (#9154) @dependabot
-* support: Upgrade @testing-library/react (#9141) @yuki-takei
-* support: Update logo image in README.md for the official docker image (#9139) @satof3
-* ci(deps-dev): bump vite from 5.2.9 to 5.2.14 (#9134) @dependabot
 
 ## [v7.0.23](https://github.com/weseek/growi/compare/v7.0.22...v7.0.23) - 2024-10-24
 

apps/app/config/i18next.config.js

@@ -1,6 +1,6 @@
-const { Lang, AllLang } = require('@growi/core');
+const { Lang, AllLang } = require('@growi/core/dist/interfaces');
 
-/** @type {Lang} */
+/** @type {import('@growi/core/dist/interfaces').Lang} */
 const defaultLang = Lang.en_US;
 
 /** @type {import('i18next').InitOptions} */
@@ -10,7 +10,5 @@ const initOptions = {
   defaultNS: 'translation',
 };
 
-module.exports = {
-  defaultLang,
-  initOptions,
-};
+exports.defaultLang = defaultLang;
+exports.initOptions = initOptions;

apps/app/docker/Dockerfile

@@ -13,11 +13,6 @@ WORKDIR ${optDir}
 # install tools
 RUN apt-get update && apt-get install -y ca-certificates wget curl --no-install-recommends
 
-# install git and git-lfs
-RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash \
-  && apt-get update && apt-get install -y git git-lfs --no-install-recommends \
-  && git lfs install
-
 # install pnpm
 RUN wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.shrc" SHELL="$(which sh)" sh -
 ENV PNPM_HOME="/root/.local/share/pnpm"
@@ -85,13 +80,6 @@ RUN set -eux; \
 # verify that the binary works
 	gosu nobody true
 
-# Add pnpm for 'node' user
-RUN apt-get update && apt-get install -y sudo ca-certificates wget --no-install-recommends \
-  && wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.shrc" SHELL="$(which sh)" sudo -u node sh - \
-  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false
-ENV PNPM_HOME="/home/node/.local/share/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-
 COPY --from=builder --chown=node:node \
   ${optDir}/packages.tar.gz ${appDir}/
 
@@ -109,4 +97,4 @@ VOLUME /data
 EXPOSE 3000
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["pnpm run migrate && node -r dotenv-flow/config --expose_gc dist/server/app.js"]
+CMD ["npm run migrate && node -r dotenv-flow/config --expose_gc dist/server/app.js"]

apps/app/docker/codebuild/buildspec.yml

@@ -10,11 +10,6 @@ env:
 phases:
   pre_build:
     commands:
-      # install Git LFS
-      - curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash
-      - yum install -y git-lfs
-      # fetch LFS files
-      - git-lfs pull
       # login to docker.io
       - echo ${DOCKER_REGISTRY_PASSWORD} | docker login --username wsmoogle --password-stdin
   build:

apps/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@growi/app",
-  "version": "7.1.0",
+  "version": "7.1.1-RC.0",
   "license": "MIT",
   "private": "true",
   "scripts": {
@@ -15,7 +15,6 @@
     "server:ci": "pnpm run server --ci",
     "preserver": "cross-env NODE_ENV=production pnpm run migrate",
     "pre:styles": "vite build -c vite.styles-prebuilt.config.ts",
-    "pre:lfs": "git lfs pull",
     "migrate": "node -r dotenv-flow/config node_modules/migrate-mongo/bin/migrate-mongo up -f config/migrate-mongo-config.js",
     "//// for development": "",
     "dev": "cross-env NODE_ENV=development nodemon --exec pnpm run ts-node --inspect src/server/app.ts",
@@ -28,7 +27,7 @@
     "dev:migrate:down": "pnpm run dev:migrate-mongo down -f config/migrate-mongo-config.js",
     "//// for CI": "",
     "launch-dev:ci": "cross-env NODE_ENV=development pnpm run dev:migrate && pnpm run ts-node src/server/app.ts --ci",
-    "lint:typecheck": "npx -y tspc",
+    "lint:typecheck": "vue-tsc --noEmit",
     "lint:eslint": "eslint --quiet \"**/*.{js,jsx,ts,tsx}\"",
     "lint:styles": "stylelint \"src/**/*.scss\"",
     "lint:swagger2openapi:apiv3": "node node_modules/swagger2openapi/oas-validate tmp/openapi-spec-apiv3.json",
@@ -43,7 +42,8 @@
     "reg:run": "reg-suit run",
     "previtest:run:integ": "vitest run -c test-with-vite/download-mongo-binary/vitest.config.ts test-with-vite/download-mongo-binary",
     "//// misc": "",
-    "console": "cross-env NODE_ENV=development pnpm run ts-node --experimental-repl-await src/server/console.js",
+    "console": "npm run repl",
+    "repl": "cross-env NODE_ENV=development npm run ts-node src/server/repl.ts",
     "swagger2openapi:apiv3": "sh bin/swagger-jsdoc/generate-spec-apiv3.sh",
     "swagger2openapi:apiv1": "sh bin/swagger-jsdoc/generate-spec-apiv1.sh",
     "ts-node": "node -r ts-node/register/transpile-only -r tsconfig-paths/register -r dotenv-flow/config",
@@ -126,9 +126,10 @@
     "graceful-fs": "^4.1.11",
     "hast-util-sanitize": "^5.0.1",
     "hast-util-select": "^6.0.2",
+    "hastscript": "^8.0.0",
     "helmet": "^4.6.0",
     "http-errors": "^2.0.0",
-    "i18next": "^23.10.1",
+    "i18next": "^23.16.5",
     "i18next-resources-to-backend": "^1.2.1",
     "is-absolute-url": "^4.0.1",
     "is-iso-date": "^0.0.1",
@@ -158,7 +159,7 @@
     "mustache": "^4.2.0",
     "next": "^14.2.13",
     "next-dynamic-loading-props": "^0.1.1",
-    "next-i18next": "^15.2.0",
+    "next-i18next": "^15.3.1",
     "next-superjson": "^0.0.4",
     "next-themes": "^0.2.1",
     "nocache": "^4.0.0",
@@ -184,7 +185,7 @@
     "react-disable": "^0.1.1",
     "react-dom": "^18.2.0",
     "react-error-boundary": "^3.1.4",
-    "react-i18next": "^14.1.0",
+    "react-i18next": "^15.1.1",
     "react-image-crop": "^8.3.0",
     "react-markdown": "^9.0.1",
     "react-multiline-clamp": "^2.0.0",
@@ -208,7 +209,6 @@
     "remark-parse": "^11.0.0",
     "remark-rehype": "^11.1.1",
     "remark-stringify": "^11.0.0",
-    "remark-toc": "^9.0.0",
     "sanitize-filename": "^1.6.3",
     "socket.io": "^4.7.5",
     "stream-to-promise": "^3.0.0",
@@ -228,6 +228,7 @@
     "unzip-stream": "^0.3.2",
     "url-join": "^4.0.0",
     "usehooks-ts": "^2.6.0",
+    "uuid": "^11.0.3",
     "validator": "^13.7.0",
     "ws": "^8.17.1",
     "xss": "^1.0.15",
@@ -272,6 +273,7 @@
     "@types/unist": "^3.0.3",
     "@types/unzip-stream": "^0.3.4",
     "@types/url-join": "^4.0.2",
+    "@types/uuid": "^10.0.0",
     "babel-loader": "^8.2.5",
     "bootstrap": "=5.3.2",
     "connect-browser-sync": "^2.1.0",
@@ -284,8 +286,8 @@
     "handsontable": "=6.2.2",
     "happy-dom": "^15.7.4",
     "i18next-chained-backend": "^4.6.2",
-    "i18next-hmr": "^3.0.4",
-    "i18next-http-backend": "^2.5.0",
+    "i18next-hmr": "^3.1.3",
+    "i18next-http-backend": "^2.6.2",
     "i18next-localstorage-backend": "^4.2.0",
     "jest": "^29.5.0",
     "jest-date-mock": "^1.0.8",