Merge pull request #7664 from weseek/master

Release v6.1.0 (2)

.devcontainer/Dockerfile

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-16
+FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-18
 
 # The node image includes a non-root user with sudo access. Use the
 # "remoteUser" property in devcontainer.json to use it. On Linux, update
@@ -14,9 +14,9 @@ ARG USER_UID=1000
 ARG USER_GID=$USER_UID
 
 RUN mkdir -p /workspace/growi/node_modules
-RUN mkdir -p /workspace/growi/packages/app/node_modules
-RUN mkdir -p /workspace/growi/packages/slackbot-proxy/node_modules
-RUN mkdir -p /workspace/growi/packages/app/.next
+RUN mkdir -p /workspace/growi/apps/app/node_modules
+RUN mkdir -p /workspace/growi/apps/slackbot-proxy/node_modules
+RUN mkdir -p /workspace/growi/apps/app/.next
 
 # [Optional] Update UID/GID if needed
 RUN if [ "$USER_GID" != "1000" ] || [ "$USER_UID" != "1000" ]; then \
@@ -37,17 +37,20 @@ RUN sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable
 RUN wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
 
 RUN apt-get update \
-   && apt-get -y install --no-install-recommends git-lfs \
-      # Chrome
-      google-chrome-stable \
-      # for Cypress
-      libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb fonts-noto-cjk \
-
-   # Clean up
-   && apt-get autoremove -y \
-   && apt-get clean -y \
-   && rm -rf /var/lib/apt/lists/*
+    && apt-get -y install --no-install-recommends git-lfs \
+
+    # Uncomment below lines to install Chrome and libs for Cypress
+    # --- works only on AMD64 ---
+    # && apt-get -y install --no-install-recommends google-chrome-stable \
+    #    libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb fonts-noto-cjk \
+
+    # Clean up
+    && apt-get autoremove -y \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/*
 ENV DEBIAN_FRONTEND=dialog
 
+RUN yarn global add turbo
+
 # Uncomment to default to non-root user
 # USER $USER_UID

.devcontainer/devcontainer.json

@@ -35,7 +35,7 @@
   // "shutdownAction": "none",
 
   // Use 'postCreateCommand' to run commands after the container is created.
-  // "postCreateCommand": "yarn install",
+  "postCreateCommand": "yarn global add turbo && yarn install",
 
   // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
   "remoteUser": "node"

.devcontainer/docker-compose.yml

@@ -20,15 +20,15 @@ services:
     volumes:
       - ..:/workspace/growi:delegated
       - node_modules:/workspace/growi/node_modules
-      - node_modules_app:/workspace/growi/packages/app/node_modules
-      - node_modules_slackbot-proxy:/workspace/growi/packages/slackbot-proxy/node_modules
-      - buildcache_app:/workspace/growi/packages/app/.next
+      - node_modules_app:/workspace/growi/apps/app/node_modules
+      - node_modules_slackbot-proxy:/workspace/growi/apps/slackbot-proxy/node_modules
+      - buildcache_app:/workspace/growi/apps/app/.next
       - ../../growi-docker-compose:/workspace/growi-docker-compose:delegated
 
     tty: true
 
   mongo:
-    image: mongo:4.4
+    image: mongo:6.0
     restart: unless-stopped
     ports:
       - 27017:27017
@@ -49,7 +49,7 @@ services:
       context: ../../growi-docker-compose/elasticsearch
       dockerfile: ./Dockerfile
       args:
-        - version=7.16.1
+        - version=8.7.0
     restart: unless-stopped
     ports:
       - 9200:9200
@@ -67,7 +67,7 @@ services:
 
   #need to adjust kibana version based on elasticsearch version (use same version as elasticsearch version)
   kibana:
-    image: docker.elastic.co/kibana/kibana:7.16.1
+    image: docker.elastic.co/kibana/kibana:8.7.0
     restart: unless-stopped
     environment:
       ELASTICSEARCH_HOSTS: 'http://elasticsearch:9200'

.gitattributes

@@ -1 +1,2 @@
 *.gz filter=lfs diff=lfs merge=lfs -text
+*.woff2 filter=lfs diff=lfs merge=lfs -text

.github/workflows/cache-clear.yml

@@ -0,0 +1,9 @@
+name: Cache Clear
+
+on: workflow_dispatch
+
+jobs:
+  clear:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: snnaplab/delete-branch-cache-action@v1

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

@@ -9,16 +9,12 @@ on:
       - .github/workflows/reusable-app-prod.yml
       - .github/workflows/reusable-app-reg-suit.yml
       - tsconfig.base.json
+      - turbo.json
       - yarn.lock
-      - packages/app/**
-      - '!packages/app/docker/**'
-      - packages/codemirror-textlint/**
-      - packages/core/**
-      - packages/preset-themes/**
-      - packages/presentation/**
-      - packages/remark-*/**
-      - packages/slack/**
-      - packages/ui/**
+      - package.json
+      - apps/app/**
+      - '!apps/app/docker/**'
+      - packages/**
   pull_request:
     branches:
       - master
@@ -29,14 +25,11 @@ on:
       - .github/workflows/reusable-app-reg-suit.yml
       - tsconfig.base.json
       - yarn.lock
-      - packages/app/**
-      - '!packages/app/docker/**'
-      - packages/codemirror-textlint/**
-      - packages/core/**
-      - packages/preset-themes/**
-      - packages/remark-*/**
-      - packages/slack/**
-      - packages/ui/**
+      - turbo.json
+      - package.json
+      - apps/app/**
+      - '!apps/app/docker/**'
+      - packages/**
   workflow_call:
     inputs:
       cypress-config-video:
@@ -51,19 +44,19 @@ concurrency:
 
 jobs:
 
-  test-prod-node14:
+  test-prod-node16:
     uses: weseek/growi/.github/workflows/reusable-app-prod.yml@master
     with:
-      node-version: 14.x
+      node-version: 16.x
       skip-cypress: true
     secrets:
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
 
 
-  test-prod-node16:
+  test-prod-node18:
     uses: weseek/growi/.github/workflows/reusable-app-prod.yml@master
     with:
-      node-version: 16.x
+      node-version: 18.x
       skip-cypress: ${{ contains( github.event.pull_request.labels.*.name, 'dependencies' ) }}
       cypress-report-artifact-name: Cypress report
       cypress-config-video: ${{ inputs.cypress-config-video || false }}
@@ -71,15 +64,15 @@ jobs:
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
 
 
-  run-reg-suit-node16:
-    needs: [test-prod-node16]
+  run-reg-suit-node18:
+    needs: [test-prod-node18]
 
     uses: weseek/growi/.github/workflows/reusable-app-reg-suit.yml@master
 
     if: always()
 
     with:
-      node-version: 16.x
+      node-version: 18.x
       skip-reg-suit: ${{ contains( github.event.pull_request.labels.*.name, 'dependencies' ) }}
       cypress-report-artifact-name: Cypress report
     secrets:

.github/workflows/ci-app.yml

@@ -9,16 +9,12 @@ on:
       - .github/workflows/ci-app.yml
       - .eslint*
       - tsconfig.base.json
+      - turbo.json
       - yarn.lock
-      - packages/app/**
-      - '!packages/app/docker/**'
-      - packages/codemirror-textlint/**
-      - packages/core/**
-      - packages/preset-themes/**
-      - packages/presentation/**
-      - packages/remark-*/**
-      - packages/slack/**
-      - packages/ui/**
+      - package.json
+      - apps/app/**
+      - '!apps/app/docker/**'
+      - packages/**
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -31,7 +27,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
 
     steps:
       - uses: actions/checkout@v3
@@ -43,29 +39,33 @@ jobs:
           cache-dependency-path: '**/yarn.lock'
 
       - name: Cache/Restore node_modules
-        id: cache-dependencies
         uses: actions/cache@v3
         with:
           path: |
             **/node_modules
-          key: node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('packages/app/package.json') }}
+          key: node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('apps/app/package.json') }}
           restore-keys: |
             node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}-
             node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-
 
-      - name: lerna bootstrap
-        run: |
-          npx lerna bootstrap -- --frozen-lockfile
+      - name: Restore dist
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            **/.turbo
+            **/dist
+          key: dist-app-ci-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('node_modules/.cache/turbo/*-meta.json') }}
+          restore-keys: |
+            dist-app-ci-${{ runner.OS }}-node${{ matrix.node-version }}-
 
-      - name: lerna run lint for dependent packages
-        run: |
-          yarn lerna run lint --scope @growi/codemirror-textlint --scope @growi/core --scope @growi/hackmd --scope @growi/preset-themes --scope @growi/remark-* --scope @growi/slack --scope @growi/ui
-      - name: build dependent packages
+      - name: Install dependencies
         run: |
-          yarn lerna run build --scope @growi/preset-themes
-      - name: lerna run lint for app
+          yarn global add turbo
+          yarn --frozen-lockfile
+
+      - name: Lint
         run: |
-          yarn lerna run lint --scope @growi/app
+          turbo run lint --filter=!@growi/slackbot-proxy
 
       - name: Slack Notification
         uses: weseek/ghaction-slack-notification@master
@@ -77,12 +77,21 @@ jobs:
           isCompactMode: true
           url: ${{ secrets.SLACK_WEBHOOK_URL }}
 
+      - name: Cache dist
+        uses: actions/cache/save@v3
+        with:
+          path: |
+            **/.turbo
+            **/dist
+          key: dist-app-ci-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('node_modules/.cache/turbo/*-meta.json') }}
+
+
   test:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
 
     services:
       mongodb:
@@ -105,23 +114,29 @@ jobs:
         with:
           path: |
             **/node_modules
-          key: node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('packages/app/package.json') }}
+          key: node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('apps/app/package.json') }}
           restore-keys: |
             node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}-
             node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-
 
-      - name: lerna bootstrap
-        run: |
-          npx lerna bootstrap -- --frozen-lockfile
+      - name: Restore dist
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            **/.turbo
+            **/dist
+          key: dist-app-ci-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('node_modules/.cache/turbo/*-meta.json') }}
+          restore-keys: |
+            dist-app-ci-${{ runner.OS }}-node${{ matrix.node-version }}-
 
-      - name: lerna run test for plugins
+      - name: Install dependencies
         run: |
-          yarn lerna run test --scope @growi/remark-*
+          yarn global add turbo
+          yarn --frozen-lockfile
 
-      - name: Test app
-        working-directory: ./packages/app
+      - name: Test
         run: |
-          yarn test:ci --selectProjects unit server ; yarn test:ci --selectProjects server-v5
+          turbo run test --filter=!@growi/slackbot-proxy
         env:
           MONGO_URI: mongodb://localhost:${{ job.services.mongodb.ports['27017'] }}/growi_test
 
@@ -130,7 +145,7 @@ jobs:
         with:
           name: Coverage Report
           path: |
-            packages/app/coverage
+            apps/app/coverage
             packages/remark-growi-directive/coverage
 
       - name: Slack Notification
@@ -143,12 +158,21 @@ jobs:
           isCompactMode: true
           url: ${{ secrets.SLACK_WEBHOOK_URL }}
 
+      - name: Cache dist
+        uses: actions/cache/save@v3
+        with:
+          path: |
+            **/.turbo
+            **/dist
+          key: dist-app-ci-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('node_modules/.cache/turbo/*-meta.json') }}
+
+
   launch-dev:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
 
     services:
       mongodb:
@@ -165,27 +189,38 @@ jobs:
           cache: 'yarn'
           cache-dependency-path: '**/yarn.lock'
 
-      - name: Cache/Restore node_modules and next cache files
+      - name: Cache/Restore node_modules
         id: cache-dependencies
         uses: actions/cache@v3
         with:
           path: |
             **/node_modules
-            ${{ github.workspace }}/packages/app/.next/cache
-          key: dev-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('packages/app/package.json') }}
+          key: node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('apps/app/package.json') }}
+          restore-keys: |
+            node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}-
+            node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-
+
+      - name: Restore dist
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            **/.turbo
+            **/dist
+            ${{ github.workspace }}/apps/app/.next
+          key: dist-app-dev-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('node_modules/.cache/turbo/*-meta.json') }}
           restore-keys: |
-            dev-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}-
-            dev-${{ runner.OS }}-node${{ matrix.node-version }}-
+            dist-app-dev-${{ runner.OS }}-node${{ matrix.node-version }}-
 
-      - name: lerna bootstrap
+      - name: Install dependencies
         run: |
-          npx lerna bootstrap -- --frozen-lockfile
+          yarn global add turbo
+          yarn --frozen-lockfile
 
-      - name: yarn dev:ci
-        working-directory: ./packages/app
+      - name: turbo run dev:ci
+        working-directory: ./apps/app
         run: |
           cp config/ci/.env.local.for-ci .env.development.local
-          yarn dev:ci
+          turbo run dev:ci
         env:
           MONGO_URI: mongodb://localhost:${{ job.services.mongodb.ports['27017'] }}/growi_dev
 
@@ -198,3 +233,12 @@ jobs:
           channel: '#ci'
           isCompactMode: true
           url: ${{ secrets.SLACK_WEBHOOK_URL }}
+
+      - name: Cache dist
+        uses: actions/cache/save@v3
+        with:
+          path: |
+            **/.turbo
+            **/dist
+            ${{ github.workspace }}/apps/app/.next
+          key: dist-app-dev-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('node_modules/.cache/turbo/*-meta.json') }}

.github/workflows/ci-slackbot-proxy.yml

@@ -10,9 +10,11 @@ on:
       - .github/workflows/ci-slackbot-proxy.yml
       - .eslint*
       - tsconfig.base.json
+      - turbo.json
       - yarn.lock
-      - packages/slackbot-proxy/**
-      - '!packages/slackbot-proxy/docker/**'
+      - package.json
+      - apps/slackbot-proxy/**
+      - '!apps/slackbot-proxy/docker/**'
       - packages/slack/**
 
 concurrency:
@@ -22,12 +24,12 @@ concurrency:
 
 jobs:
 
-  test:
+  lint:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
 
     steps:
     - uses: actions/checkout@v3
@@ -39,25 +41,33 @@ jobs:
         cache-dependency-path: '**/yarn.lock'
 
     - name: Cache/Restore node_modules
-      id: cache-dependencies
       uses: actions/cache@v3
       with:
         path: |
           **/node_modules
-        key: node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
+        key: node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('apps/slackbot-proxy/package.json') }}
         restore-keys: |
+          node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}-
           node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-
 
-    - name: lerna bootstrap
-      run: |
-        npx lerna bootstrap -- --frozen-lockfile
+    - name: Restore dist
+      uses: actions/cache/restore@v3
+      with:
+        path: |
+          **/.turbo
+          **/dist
+        key: dist-slackbot-proxy-ci-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('node_modules/.cache/turbo/*-meta.json') }}
+        restore-keys: |
+          dist-slackbot-proxy-ci-${{ runner.OS }}-node${{ matrix.node-version }}-
 
-    - name: yarn lint
+    - name: Install dependencies
       run: |
-        yarn lerna run lint --scope @growi/slack --scope @growi/slackbot-proxy
-    - name: yarn test
+        yarn global add turbo
+        yarn --frozen-lockfile
+
+    - name: Lint
       run: |
-        yarn lerna run test --scope @growi/slack --scope @growi/slackbot-proxy
+        turbo run lint --filter=@growi/slackbot-proxy
 
     - name: Slack Notification
       uses: weseek/ghaction-slack-notification@master
@@ -69,13 +79,21 @@ jobs:
         isCompactMode: true
         url: ${{ secrets.SLACK_WEBHOOK_URL }}
 
+    - name: Cache dist
+      uses: actions/cache/save@v3
+      with:
+        path: |
+          **/.turbo
+          **/dist
+        key: dist-slackbot-proxy-ci-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('node_modules/.cache/turbo/*-meta.json') }}
+
 
   launch-dev:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
 
     services:
       mysql:
@@ -97,24 +115,35 @@ jobs:
         cache-dependency-path: '**/yarn.lock'
 
     - name: Cache/Restore node_modules
-      id: cache-dependencies
       uses: actions/cache@v3
       with:
         path: |
           **/node_modules
-        key: node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
+        key: node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('apps/slackbot-proxy/package.json') }}
         restore-keys: |
+          node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}-
           node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-
 
-    - name: lerna bootstrap
+    - name: Restore dist
+      uses: actions/cache/restore@v3
+      with:
+        path: |
+          **/.turbo
+          **/dist
+        key: dist-slackbot-proxy-ci-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('node_modules/.cache/turbo/*-meta.json') }}
+        restore-keys: |
+          dist-slackbot-proxy-ci-${{ runner.OS }}-node${{ matrix.node-version }}-
+
+    - name: Install dependencies
       run: |
-        npx lerna bootstrap -- --frozen-lockfile
+        yarn global add turbo
+        yarn --frozen-lockfile
 
     - name: yarn dev:ci
-      working-directory: ./packages/slackbot-proxy
+      working-directory: ./apps/slackbot-proxy
       run: |
         cp config/ci/.env.local.for-ci .env.development.local
-        yarn dev:ci
+        turbo run dev:ci
       env:
         SERVER_URI: http://localhost:8080
         TYPEORM_CONNECTION: mysql
@@ -134,13 +163,21 @@ jobs:
         isCompactMode: true
         url: ${{ secrets.SLACK_WEBHOOK_URL }}
 
+    - name: Cache dist
+      uses: actions/cache/save@v3
+      with:
+        path: |
+          **/.turbo
+          **/dist
+        key: dist-slackbot-proxy-ci-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('node_modules/.cache/turbo/*-meta.json') }}
+
 
   launch-prod:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
 
     services:
       mysql:
@@ -161,31 +198,51 @@ jobs:
         cache: 'yarn'
         cache-dependency-path: '**/yarn.lock'
 
-    - name: Remove unnecessary packages
-      working-directory: ./packages
+    - name: Install turbo
       run: |
-        ls | egrep -v '^(slack|slackbot-proxy)$' | xargs rm -r
-    - name: lerna bootstrap
-      run: |
-        npx lerna bootstrap
-    - name: Print dependencies
+        yarn global add turbo
+
+    - name: Prune repositories
       run: |
-        echo -n "node " && node -v
-        echo -n "npm " && npm -v
-        yarn list --depth=0
-    - name: lerna run build
+        turbo prune --scope=@growi/slackbot-proxy
+        rm -rf apps packages
+        mv out/* .
+
+    - name: Cache/Restore node_modules
+      id: cache-dependencies
+      uses: actions/cache@v3
+      with:
+        path: |
+          **/node_modules
+        key: node_modules-slackbot-prxy-build-prod-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/yarn.lock') }}
+        restore-keys: |
+          node_modules-slackbot-proxy-build-prod-${{ runner.OS }}-node${{ inputs.node-version }}-
+
+    - name: Install dependencies
       run: |
-        yarn lerna run build
-    - name: lerna bootstrap --production
+        yarn --frozen-lockfile
+
+    - name: Restore dist
+      uses: actions/cache/restore@v3
+      with:
+        path: |
+          **/.turbo
+          **/dist
+        key: dist-slackbot-proxy-prod-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('node_modules/.cache/turbo/*-meta.json') }}
+        restore-keys: |
+          dist-slackbot-proxy-prod-${{ runner.OS }}-node${{ matrix.node-version }}-
+
+    - name: Build
+      working-directory: ./apps/slackbot-proxy
       run: |
-        npx lerna bootstrap -- --production
-    - name: Print dependencies
+        turbo run build
+
+    - name: Install dependencies for production
       run: |
-        echo -n "node " && node -v
-        echo -n "npm " && npm -v
-        yarn list --production --depth=0
+        yarn --production
+
     - name: yarn start:prod:ci
-      working-directory: ./packages/slackbot-proxy
+      working-directory: ./apps/slackbot-proxy
       run: |
         cp config/ci/.env.local.for-ci .env.production.local
         yarn start:prod:ci
@@ -207,3 +264,11 @@ jobs:
         channel: '#ci'
         isCompactMode: true
         url: ${{ secrets.SLACK_WEBHOOK_URL }}
+
+    - name: Cache dist
+      uses: actions/cache/save@v3
+      with:
+        path: |
+          **/.turbo
+          **/dist
+        key: dist-slackbot-proxy-prod-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('node_modules/.cache/turbo/*-meta.json') }}

.github/workflows/codeql-analysis.yml

@@ -16,12 +16,14 @@ on:
     branches: [ master, dev/*, release/current ]
     paths:
       - .github/workflows/codeql-analysis.yml
+      - apps/**
       - packages/**
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ master ]
     paths:
       - .github/workflows/codeql-analysis.yml
+      - apps/**
       - packages/**
   schedule:
     - cron: '28 20 * * 6'

.github/workflows/release-slackbot-proxy.yml

@@ -20,7 +20,7 @@ jobs:
       uses: myrotvorets/info-from-package-json-action@1.2.0
       id: package-json
       with:
-        workingDir: packages/slackbot-proxy
+        workingDir: apps/slackbot-proxy
 
     - name: Docker meta
       id: meta
@@ -61,7 +61,7 @@ jobs:
       uses: docker/build-push-action@v4
       with:
         context: .
-        file: ./packages/slackbot-proxy/docker/Dockerfile
+        file: ./apps/slackbot-proxy/docker/Dockerfile
         platforms: linux/amd64
         push: true
         builder: ${{ steps.buildx.outputs.name }}
@@ -87,7 +87,7 @@ jobs:
         username: wsmoogle
         password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
         repository: weseek/growi-slackbot-proxy
-        readme-filepath: ./packages/slackbot-proxy/docker/README.md
+        readme-filepath: ./apps/slackbot-proxy/docker/README.md
 
 
   create-pr-for-next-rc:
@@ -108,7 +108,8 @@ jobs:
 
     - name: Install dependencies
       run: |
-        npx lerna bootstrap
+        yarn global add turbo
+        yarn --frozen-lockfile
 
     - name: Bump versions for next RC
       run: |
@@ -118,7 +119,7 @@ jobs:
       uses: myrotvorets/info-from-package-json-action@1.2.0
       id: package-json
       with:
-        workingDir: packages/slackbot-proxy
+        workingDir: apps/slackbot-proxy
 
     - name: Commit
       uses: github-actions-x/commit@v2.9

.github/workflows/release.yml

@@ -24,18 +24,19 @@ jobs:
 
     - uses: actions/setup-node@v3
       with:
-        node-version: '16'
+        node-version: '18'
         cache: 'yarn'
         cache-dependency-path: '**/yarn.lock'
 
     - name: Install dependencies
       run: |
-        npx lerna bootstrap
+        yarn global add turbo
+        yarn --frozen-lockfile
 
     - name: Bump versions
       run: |
         yarn bump-versions:patch
-        sh ./packages/app/bin/github-actions/update-readme.sh
+        sh ./apps/app/bin/github-actions/update-readme.sh
 
     - name: Retrieve information from package.json
       uses: myrotvorets/info-from-package-json-action@1.2.0
@@ -48,7 +49,7 @@ jobs:
         release-notes: ${{ github.event.pull_request.body }}
 
     - name: Update README.md for docker image
-      working-directory: ./packages/app
+      working-directory: ./apps/app
       run: |
         sh ./bin/github-actions/update-readme.sh
       env:
@@ -85,13 +86,14 @@ jobs:
 
     - uses: actions/setup-node@v3
       with:
-        node-version: '16'
+        node-version: '18'
         cache: 'yarn'
         cache-dependency-path: '**/yarn.lock'
 
     - name: Install dependencies
       run: |
-        npx lerna bootstrap
+        yarn global add turbo
+        yarn --frozen-lockfile
 
     - name: Bump versions for next RC
       run: |
@@ -213,7 +215,7 @@ jobs:
         username: wsmoogle
         password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
         repository: weseek/growi
-        readme-filepath: ./packages/app/docker/README.md
+        readme-filepath: ./apps/app/docker/README.md
 
     - name: Slack Notification
       uses: weseek/ghaction-release-slack-notification@master

.github/workflows/reusable-app-build-image.yml

@@ -48,7 +48,7 @@ jobs:
         projectName: growi-official-image-builder
       env:
         CODEBUILD__sourceVersion: ${{ inputs.source-version }}
-        CODEBUILD__imageOverride: ${{ (matrix.platform == 'amd64' && 'aws/codebuild/standard:6.0') || 'aws/codebuild/amazonlinux2-aarch64-standard:2.0' }}
+        CODEBUILD__imageOverride: ${{ (matrix.platform == 'amd64' && 'aws/codebuild/amazonlinux2-x86_64-standard:4.0') || 'aws/codebuild/amazonlinux2-aarch64-standard:2.0' }}
         CODEBUILD__environmentTypeOverride: ${{ (matrix.platform == 'amd64' && 'LINUX_CONTAINER') || 'ARM_CONTAINER' }}
         CODEBUILD__environmentVariablesOverride: '[
           { "name": "IMAGE_TAG", "type": "PLAINTEXT", "value": "docker.io/${{ inputs.image-name }}:${{ inputs.tag-temporary }}-${{ matrix.platform }}" },

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

@@ -34,29 +34,45 @@ jobs:
         cache: 'yarn'
         cache-dependency-path: '**/yarn.lock'
 
+    - name: Install turbo
+      run: |
+        yarn global add turbo
+
+    - name: Prune repositories
+      run: |
+        turbo prune --scope=@growi/app
+        rm -rf apps packages
+        mv out/* .
+
     - name: Cache/Restore node_modules
       id: cache-dependencies
       uses: actions/cache@v3
       with:
         path: |
           **/node_modules
-        key: node_modules-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('packages/app/package.json') }}
+        key: node_modules-app-build-prod-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/yarn.lock') }}
         restore-keys: |
-          node_modules-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/yarn.lock') }}-
-          node_modules-${{ runner.OS }}-node${{ inputs.node-version }}-
+          node_modules-app-build-prod-${{ runner.OS }}-node${{ inputs.node-version }}-
 
-    - name: lerna bootstrap
+    - name: Install dependencies
       run: |
-        npx lerna bootstrap -- --frozen-lockfile
+        yarn --frozen-lockfile
 
-    - name: Remove unnecessary packages
-      run: |
-        rm -rf packages/slackbot-proxy
-        rm -f "node_modules/@growi/slackbot-proxy"
+    - name: Restore dist
+      uses: actions/cache/restore@v3
+      with:
+        path: |
+          **/.turbo
+          **/dist
+          ${{ github.workspace }}/apps/app/.next
+        key: dist-app-prod-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('node_modules/.cache/turbo/*-meta.json') }}
+        restore-keys: |
+          dist-app-prod-${{ runner.OS }}-node${{ matrix.node-version }}-
 
     - name: Build
+      working-directory: ./apps/app
       run: |
-        yarn lerna run build
+        turbo run build
       env:
         ANALYZE_BUNDLE_SIZE: 1
 
@@ -65,14 +81,16 @@ jobs:
       run: |
         tar -zcf production.tar.gz \
           package.json \
-          packages/app/.next \
-          packages/app/config \
-          packages/app/public \
-          packages/app/resource \
-          packages/app/tmp \
-          packages/app/.env.production* \
-          packages/*/package.json \
-          packages/*/dist
+          apps/app/.next \
+          apps/app/config \
+          apps/app/dist \
+          apps/app/public \
+          apps/app/resource \
+          apps/app/tmp \
+          apps/app/.env.production* \
+          apps/app/package.json \
+          packages/*/dist \
+          packages/*/package.json
         echo "file=production.tar.gz" >> $GITHUB_OUTPUT
 
     - name: Upload production files as artifact
@@ -86,8 +104,8 @@ jobs:
       with:
         name: Bundle Analyzing Report
         path: |
-          packages/app/.next/analyze/client.html
-          packages/app/.next/analyze/server.html
+          apps/app/.next/analyze/client.html
+          apps/app/.next/analyze/server.html
 
     - name: Slack Notification
       uses: weseek/ghaction-slack-notification@master
@@ -99,6 +117,14 @@ jobs:
         isCompactMode: true
         url: ${{ secrets.SLACK_WEBHOOK_URL }}
 
+    - name: Cache dist
+      uses: actions/cache/save@v3
+      with:
+        path: |
+          **/.turbo
+          **/dist
+          ${{ github.workspace }}/apps/app/.next
+        key: dist-app-prod-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('node_modules/.cache/turbo/*-meta.json') }}
 
 
   launch-prod:
@@ -126,34 +152,29 @@ jobs:
         cache: 'yarn'
         cache-dependency-path: '**/yarn.lock'
 
-    - name: Get Date
-      id: get-date
+    - name: Install turbo
       run: |
-        echo "dateYmdHM=$(/bin/date -u "+%Y%m%d%H%M")" >> $GITHUB_OUTPUT
-        echo "dateYm=$(/bin/date -u "+%Y%m")" >> $GITHUB_OUTPUT
+        yarn global add turbo
 
-    - name: Cache/Restore node_modules (not reused)
+    - name: Prune repositories
+      run: |
+        turbo prune --scope=@growi/app
+        rm -rf apps packages
+        mv out/* .
+
+    - name: Cache/Restore node_modules
       id: cache-dependencies
       uses: actions/cache@v3
       with:
         path: |
           **/node_modules
-        key: node_modules-build-prod-${{ runner.OS }}-node${{ inputs.node-version }}-${{ steps.get-date.outputs.dateYmdHM }}
+        key: node_modules-app-launch-prod-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/yarn.lock') }}
         restore-keys: |
-          node_modules-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('packages/app/package.json') }}
-          node_modules-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/yarn.lock') }}
-          node_modules-${{ runner.OS }}-node${{ inputs.node-version }}-
-          node_modules-build-prod-${{ runner.OS }}-node${{ inputs.node-version }}-${{ steps.get-date.outputs.dateYm }}
-          node_modules-build-prod-${{ runner.OS }}-node${{ inputs.node-version }}-
-
-    - name: Remove unnecessary packages
-      run: |
-        rm -rf packages/slackbot-proxy
-        rm -f "node_modules/@growi/slackbot-proxy"
+          node_modules-app-launch-prod-${{ runner.OS }}-node${{ inputs.node-version }}-
 
-    - name: lerna bootstrap --production
+    - name: Install dependencies
       run: |
-        npx lerna bootstrap -- --production
+        yarn --production
 
     - name: Download production files artifact
       uses: actions/download-artifact@v3
@@ -165,7 +186,7 @@ jobs:
         tar -xf ${{ needs.build-prod.outputs.PROD_FILES }}
 
     - name: yarn server:ci
-      working-directory: ./packages/app
+      working-directory: ./apps/app
       run: |
         cp config/ci/.env.local.for-ci .env.production.local
         yarn server:ci
@@ -222,24 +243,39 @@ jobs:
         cache: 'yarn'
         cache-dependency-path: '**/yarn.lock'
 
-    - name: Cache/Restore dependencies
+    - name: Install turbo
+      run: |
+        yarn global add turbo
+
+    - name: Prune repositories
+      run: |
+        turbo prune --scope=@growi/app
+        rm -rf apps packages
+        mv out/* .
+
+    - name: Cache/Restore node_modules
+      id: cache-dependencies
       uses: actions/cache@v3
       with:
         path: |
           **/node_modules
-          ~/.cache/Cypress
-        key: deps-for-cypress-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('packages/app/package.json') }}
+        key: node_modules-app-build-prod-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/yarn.lock') }}
         restore-keys: |
-          deps-for-cypress-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/yarn.lock') }}-
-          deps-for-cypress-${{ runner.OS }}-node${{ inputs.node-version }}
+          node_modules-app-build-prod-${{ runner.OS }}-node${{ inputs.node-version }}-
 
-    - name: lerna bootstrap
-      run: |
-        npx lerna bootstrap -- --production
+    - name: Cache/Restore Cypress files
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cache/Cypress
+        key: deps-for-cypress-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/yarn.lock') }}
+        restore-keys: |
+          deps-for-cypress-${{ runner.OS }}-node${{ inputs.node-version }}-
 
-    - name: lerna add packages needed for CI
+    - name: Install dependencies
       run: |
-        npx lerna add yargs
+        yarn --frozen-lockfile
+        yarn cypress install
 
     - name: Download production files artifact
       uses: actions/download-artifact@v3
@@ -253,32 +289,33 @@ jobs:
     - name: Determine spec expression
       id: determine-spec-exp
       run: |
-        SPEC=`node bin/github-actions/generate-cypress-spec-arg.js --prefix="test/cypress/integration/" --suffix="-*/**" "${{ matrix.spec-group }}"`
+        SPEC=`node bin/github-actions/generate-cypress-spec-arg.mjs --prefix="test/cypress/integration/" --suffix="-*/**" "${{ matrix.spec-group }}"`
         echo "value=$SPEC" >> $GITHUB_OUTPUT
 
     - name: Copy dotenv file for ci
-      working-directory: ./packages/app
+      working-directory: ./apps/app
       run: |
         cat config/ci/.env.local.for-ci >> .env.production.local
 
     - name: Copy dotenv file for automatic installation
       if: ${{ matrix.spec-group != '10' }}
-      working-directory: ./packages/app
+      working-directory: ./apps/app
       run: |
         cat config/ci/.env.local.for-auto-install >> .env.production.local
 
     - name: Copy dotenv file for automatic installation with allowing guest mode
       if: ${{ matrix.spec-group == '21' }}
-      working-directory: ./packages/app
+      working-directory: ./apps/app
       run: |
         cat config/ci/.env.local.for-auto-install-with-allowing-guest >> .env.production.local
 
     - name: Cypress Run
-      uses: cypress-io/github-action@v3
+      uses: cypress-io/github-action@v5
       with:
         browser: chrome
-        working-directory: ./packages/app
+        working-directory: ./apps/app
         spec: '${{ steps.determine-spec-exp.outputs.value }}'
+        install: false
         start: yarn server
         wait-on: 'http://localhost:3000'
         config: video=${{ inputs.cypress-config-video }}
@@ -292,8 +329,8 @@ jobs:
       with:
         name: ${{ inputs.cypress-report-artifact-name }}
         path: |
-          packages/app/test/cypress/screenshots
-          packages/app/test/cypress/videos
+          apps/app/test/cypress/screenshots
+          apps/app/test/cypress/videos
 
     - name: Slack Notification
       uses: weseek/ghaction-slack-notification@master

.github/workflows/reusable-app-reg-suit.yml

@@ -60,28 +60,38 @@ jobs:
         cache: 'yarn'
         cache-dependency-path: '**/yarn.lock'
 
+    - name: Install turbo
+      run: |
+        yarn global add turbo
+
+    - name: Prune repositories
+      run: |
+        turbo prune --scope=@growi/app
+        rm -rf apps packages
+        mv out/* .
+
     - name: Cache/Restore node_modules
+      id: cache-dependencies
       uses: actions/cache@v3
       with:
         path: |
           **/node_modules
-        key: node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('packages/app/package.json') }}
+        key: node_modules-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/yarn.lock') }}
         restore-keys: |
-          node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}-
-          node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-
+          node_modules-${{ runner.OS }}-node${{ inputs.node-version }}-
 
-    - name: lerna bootstrap
+    - name: Install dependencies
       run: |
-        npx lerna bootstrap -- --frozen-lockfile
+        yarn --frozen-lockfile
 
     - name: Download screenshots taken by cypress
       uses: actions/download-artifact@v3
       with:
         name: ${{ inputs.cypress-report-artifact-name }}
-        path: packages/app/test/cypress
+        path: apps/app/test/cypress
 
     - name: Run reg-suit
-      working-directory: ./packages/app
+      working-directory: ./apps/app
       run: |
         yarn reg:run
 

.gitignore

@@ -31,10 +31,13 @@ yarn-error.log*
 
 # Terraform
 **/.terraform/*
-# *.tfstate
 *.tfstate.*
 
 # IDE, dev #
 .idea
 *.orig
 *.code-workspace
+
+# turborepo
+.turbo
+out

.swcrc

@@ -0,0 +1,8 @@
+{
+  "jsc": {
+    "parser": {
+      "syntax": "typescript",
+      "tsx": true
+    }
+  }
+}

.vscode/launch.json

@@ -6,9 +6,9 @@
         "request": "attach",
         "name": "Debug: Attach Debugger to Server",
         "port": 9229,
-        "cwd": "${workspaceFolder}/packages/app",
+        "cwd": "${workspaceFolder}/apps/app",
         "sourceMapPathOverrides": {
-          "webpack://@growi/app/*": "${workspaceFolder}/packages/app/*"
+          "webpack://@growi/app/*": "${workspaceFolder}/apps/app/*"
         }
       },
       {
@@ -20,9 +20,9 @@
         ],
         "console": "integratedTerminal",
         "cwd": "${fileDirname}",
-        "runtimeExecutable": "yarn",
+        "runtimeExecutable": "node",
         "runtimeArgs": [
-          "ts-node",
+          "-r", "@swc-node/register",
           "${file}"
         ]
       },
@@ -30,7 +30,7 @@
         "type": "pwa-node",
         "request": "launch",
         "name": "Debug: Server",
-        "cwd": "${workspaceFolder}/packages/app",
+        "cwd": "${workspaceFolder}/apps/app",
         "runtimeExecutable": "yarn",
         "runtimeArgs": [
           "dev"
@@ -42,7 +42,7 @@
         "console": "integratedTerminal",
         "internalConsoleOptions": "neverOpen",
         "sourceMapPathOverrides": {
-          "webpack://@growi/app/*": "${workspaceFolder}/packages/app/*"
+          "webpack://@growi/app/*": "${workspaceFolder}/apps/app/*"
         }
       },
       {
@@ -51,9 +51,9 @@
         "name": "Debug: Chrome",
         "sourceMaps": true,
         "sourceMapPathOverrides": {
-          "webpack://_N_E/*": "${workspaceFolder}/packages/app/*"
+          "webpack://_N_E/*": "${workspaceFolder}/apps/app/*"
         },
-        "webRoot": "${workspaceFolder}/packages/app/public",
+        "webRoot": "${workspaceFolder}/apps/app/public",
         "url": "http://localhost:3000"
       },
       {
@@ -61,12 +61,12 @@
         "request": "launch",
         "name": "Debug: Firefox",
         "reAttach": true,
-        "webRoot": "${workspaceFolder}/packages/app/public",
+        "webRoot": "${workspaceFolder}/apps/app/public",
         "url": "http://localhost:3000",
         "pathMappings": [
           {
             "url": "webpack://_n_e/src",
-            "path": "${workspaceFolder}/packages/app/src"
+            "path": "${workspaceFolder}/apps/app/src"
           },
           {
             "url": "webpack://_n_e/core",
@@ -78,7 +78,7 @@
           },
           {
             "url": "webpack://_n_e/slack",
-            "path": "${workspaceFolder}/packages/app/slack"
+            "path": "${workspaceFolder}/apps/app/slack"
           },
           {
             "url": "webpack://_n_e/ui",
@@ -86,7 +86,7 @@
           },
           {
             "url": "http://localhost:3000",
-            "path": "${workspaceFolder}/packages/app/public"
+            "path": "${workspaceFolder}/apps/app/public"
           }
         ]
       }

README.md

@@ -80,9 +80,10 @@ See [GROWI Docs: Environment Variables](https://docs.growi.org/en/admin-guide/ad
 
 ## Dependencies
 
-- Node.js v14.x or v16.x
+- Node.js v16.x or v18.x
 - npm 6.x
 - yarn
+- [Turborepo](https://turbo.build/repo)
 - MongoDB 4.x
 
 ### Optional Dependencies
@@ -101,7 +102,7 @@ See [GROWI Docs: Environment Variables](https://docs.growi.org/en/admin-guide/ad
 | `yarn app:server` | Launch GROWI app server                                 |
 | `yarn start`      | Invoke `yarn app:build` and `yarn app:server`           |
 
-For more info, see [GROWI Docs: List of npm Commands](https://docs.growi.org/en/dev/startup-v2/launch-system.html#list-of-npm-commands).
+For more info, see [GROWI Docs: List of npm Scripts](https://docs.growi.org/en/dev/startup-v5/start-development.html#list-of-npm-scripts).
 
 # Documentation
 

README_JP.md

@@ -79,9 +79,10 @@ Crowi からの移行は **[こちら](https://docs.growi.org/en/admin-guide/mig
 
 ## 依存関係
 
-- Node.js v14.x or v16.x
+- Node.js v16.x or v18.x
 - npm 6.x
 - yarn
+- [Turborepo](https://turbo.build/repo)
 - MongoDB 4.x
 
 ### オプションの依存関係
@@ -100,7 +101,7 @@ Crowi からの移行は **[こちら](https://docs.growi.org/en/admin-guide/mig
 | `yarn app:server` | GROWI app サーバーを起動します。                        |
 | `yarn start`      | `yarn app:build` と `yarn app:server` を呼び出します。  |
 
-詳しくは [GROWI Docs: List of npm Commands](https://docs.growi.org/ja/dev/startup-v2/launch-system.html#npm-コマンドリスト)をご覧ください。
+詳しくは [GROWI Docs: npm スクリプトリスト](https://docs.growi.org/ja/dev/startup-v5/start-development.html#npm-%E3%82%B9%E3%82%AF%E3%83%AA%E3%83%95%E3%82%9A%E3%83%88%E3%83%AA%E3%82%B9%E3%83%88)をご覧ください。
 
 # ドキュメント
 

THIRD-PARTY-NOTICES.md

@@ -19,6 +19,8 @@ https://github.com/weseek/growi.
 1. Lato (https://fonts.google.com/specimen/Lato)
 1. Press Start 2P (https://fonts.google.com/specimen/Press+Start+2P)
 1. stephenhutchings/typicons.font (https://github.com/stephenhutchings/typicons.font)
+1. Source Han Code JP (https://github.com/adobe-fonts/source-han-code-jp)
+
 
 
 License Notice for Apache License, Version 2.0 Derivative Works
@@ -115,7 +117,7 @@ Designed by Łukasz Dziedzic
 License Notice for Press Start 2P
 ------------------------------
 
-https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL
+http://scripts.sil.org/OFL
 
 ```
 Designed by CodeMan38
@@ -129,4 +131,14 @@ https://creativecommons.org/licenses/by-sa/3.0/
 
 ```
 Copyright (c) 2018 Stephen Hutchings
+```
+
+
+License Notice for Source Han Code JP
+----------------------------------
+
+http://scripts.sil.org/OFL
+
+```
+Copyright (c) 2014-2020 Adobe Systems Incorporated
 ```

packages/app/.env.development → apps/app/.env.development

@@ -16,6 +16,7 @@ ELASTICSEARCH_REJECT_UNAUTHORIZED=true
 HACKMD_URI="http://localhost:3010"
 HACKMD_URI_FOR_SERVER="http://hackmd:3000"
 OGP_URI="http://ogp:8088"
+QUESTIONNAIRE_SERVER_ORIGIN="http://host.docker.internal:3003"
 # DRAWIO_URI="http://localhost:8080/?offline=1&https=0"
 # S2SMSG_PUBSUB_SERVER_TYPE=nchan
 # PUBLISH_OPEN_API=true

packages/app/.eslintignore → apps/app/.eslintignore

@@ -2,10 +2,8 @@
 /dist/**
 /transpiled/**
 /public/**
-/config/next-i18next.config.js
 /src/client/legacy/thirdparty-js/**
 /src/client/util/reveal/plugins/markdown.js
 /src/linter-checker/**
-/src/utils/next.config.utils.js
 /tmp/**
 /next-env.d.ts

apps/app/.gitignore

@@ -0,0 +1,18 @@
+# next.js
+/.next/
+/out/
+
+# test
+test/cypress/screenshots
+test/cypress/videos
+.reg
+
+# dist
+/build/
+/dist/
+/transpiled/
+/public/static/js
+/public/static/styles
+/public/uploads
+/src/styles/prebuilt
+/tmp/

packages/app/.stylelintrc.json → apps/app/.stylelintrc.json

@@ -4,7 +4,7 @@
   ],
   "customSyntax": "postcss-scss",
   "ignoreFiles": [
-    "src/styles/_override-bootstrap-variables.scss",
+    "src/styles/prebuilt/*.css",
     "src/linter-checker/test.scss"
   ],
   "rules": {

packages/app/bin/github-actions/update-readme.sh → apps/app/bin/github-actions/update-readme.sh

@@ -2,4 +2,4 @@
 
 cd docker
 
-sed -i -e "s/^\([*] \[\`\)[^\`]\+\(\`, \`6\.0\`, .\+\]\)\(.\+\/blob\/v\).\+\(\/packages\/app\/docker\/Dockerfile.\+\)$/\1${RELEASED_VERSION}\2\3${RELEASED_VERSION}\4/" README.md
+sed -i -e "s/^\([*] \[\`\)[^\`]\+\(\`, \`6\.1\`, .\+\]\)\(.\+\/blob\/v\).\+\(\/packages\/app\/docker\/Dockerfile.\+\)$/\1${RELEASED_VERSION}\2\3${RELEASED_VERSION}\4/" README.md

apps/app/config/next-i18next.config.js

@@ -0,0 +1,29 @@
+const path = require('path');
+
+const { isServer, AllLang, Lang } = require('@growi/core');
+const I18nextChainedBackend = require('i18next-chained-backend').default;
+const I18NextHttpBackend = require('i18next-http-backend');
+const I18NextLocalStorageBackend = require('i18next-localstorage-backend').default;
+
+const isDev = process.env.NODE_ENV === 'development';
+
+module.exports = {
+  defaultLang: Lang.en_US,
+  i18n: {
+    defaultLocale: Lang.en_US,
+    locales: AllLang,
+  },
+  defaultNS: 'translation',
+  localePath: path.resolve('./public/static/locales'),
+  serializeConfig: false,
+  use: isServer() ? [] : [I18nextChainedBackend],
+  backend: {
+    backends: isServer() ? [] : [I18NextLocalStorageBackend, I18NextHttpBackend],
+    backendOptions: [
+      // options for i18next-localstorage-backend
+      { expirationTime: isDev ? 0 : 24 * 60 * 60 * 1000 }, // 1 day in production
+      // options for i18next-http-backend
+      { loadPath: '/static/locales/{{lng}}/{{ns}}.json' },
+    ],
+  },
+};

apps/app/docker/Dockerfile

@@ -0,0 +1,146 @@
+# syntax = docker/dockerfile:1.4
+
+
+##
+## base
+##
+FROM node:18-slim AS base
+
+ENV optDir /opt
+
+WORKDIR ${optDir}
+
+RUN yarn global add turbo
+COPY . .
+RUN turbo prune --scope=@growi/app --docker
+
+
+##
+## deps-resolver
+##
+FROM node:18-slim AS deps-resolver
+
+ENV optDir /opt
+
+WORKDIR ${optDir}
+
+RUN set -eux; \
+	apt-get update; \
+	apt-get install -y python3 build-essential;
+
+# copy files
+COPY --from=base ${optDir}/out/json/ .
+COPY --from=base ${optDir}/out/yarn.lock ./yarn.lock
+
+# setup (with network-timeout = 1 hour)
+RUN yarn config set network-timeout 3600000
+RUN yarn --frozen-lockfile
+
+# make artifacts
+RUN tar -cf node_modules.tar \
+  node_modules \
+  apps/*/node_modules \
+  packages/*/node_modules
+
+
+
+##
+## deps-resolver-prod
+##
+FROM deps-resolver AS deps-resolver-prod
+
+RUN yarn --production
+# make artifacts
+RUN tar -cf node_modules.tar \
+  node_modules \
+  apps/*/node_modules \
+  packages/*/node_modules
+
+
+
+##
+## builder
+##
+FROM node:18-slim AS builder
+
+ENV optDir /opt
+
+WORKDIR ${optDir}
+
+RUN yarn global add turbo
+
+# copy files
+COPY --from=base ${optDir}/out/full/ .
+COPY --from=base ${optDir}/out/yarn.lock ./yarn.lock
+COPY ["tsconfig.base.json", "./"]
+
+# copy dependent packages
+COPY --from=deps-resolver \
+  ${optDir}/node_modules.tar ${optDir}/
+
+# extract node_modules.tar
+RUN tar -xf node_modules.tar
+RUN rm node_modules.tar
+
+# build
+RUN turbo run build
+
+# make artifacts
+RUN tar -cf packages.tar \
+  package.json \
+  apps/app/.next \
+  apps/app/config \
+  apps/app/dist \
+  apps/app/public \
+  apps/app/resource \
+  apps/app/tmp \
+  apps/app/.env.production* \
+  apps/app/next.config.js \
+  apps/app/package.json \
+  packages/*/package.json \
+  packages/*/dist
+
+
+
+##
+## release
+##
+FROM node:18-slim
+LABEL maintainer Yuki Takei <yuki@weseek.co.jp>
+
+ENV NODE_ENV production
+
+ENV optDir /opt
+ENV appDir ${optDir}/growi
+
+# Add gosu
+# see: https://github.com/tianon/gosu/blob/1.13/INSTALL.md
+RUN set -eux; \
+	apt-get update; \
+	apt-get install -y gosu; \
+	rm -rf /var/lib/apt/lists/*; \
+# verify that the binary works
+	gosu nobody true
+
+COPY --from=deps-resolver-prod --chown=node:node \
+  ${optDir}/node_modules.tar ${appDir}/
+COPY --from=builder --chown=node:node \
+  ${optDir}/packages.tar ${appDir}/
+
+# extract artifacts as 'node' user
+USER node
+WORKDIR ${appDir}
+RUN tar -xf node_modules.tar
+RUN tar -xf packages.tar
+RUN rm node_modules.tar packages.tar
+
+COPY --chown=node:node --chmod=700 apps/app/docker/docker-entrypoint.sh /
+
+USER root
+WORKDIR ${appDir}/apps/app
+
+VOLUME /data
+EXPOSE 3000
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["yarn migrate && node -r dotenv-flow/config --expose_gc dist/server/app.js"]

packages/slackbot-proxy/docker/Dockerfile.dockerignore → apps/app/docker/Dockerfile.dockerignore

@@ -3,3 +3,7 @@
 **/coverage
 **/Dockerfile
 **/*.dockerignore
+**/.next
+**/.turbo
+out
+apps/slackbot-proxy

packages/app/docker/README.md → apps/app/docker/README.md

@@ -10,7 +10,8 @@ GROWI Official docker image
 Supported tags and respective Dockerfile links
 ------------------------------------------------
 
-* [`6.0.15`, `6.0`, `6`, `latest` (Dockerfile)](https://github.com/weseek/growi/blob/v6.0.15/packages/app/docker/Dockerfile)
+* [`6.1.0`, `6.1`, `6`, `latest` (Dockerfile)](https://github.com/weseek/growi/blob/v6.1.0/apps/app/docker/Dockerfile)
+* [`6.0.15`, `6.0`](https://github.com/weseek/growi/blob/v6.0.15/packages/app/docker/Dockerfile)
 * [`5.1.7`, `5.1`, `5`](https://github.com/weseek/growi/blob/v5.1.7/packages/app/docker/Dockerfile)
 * [`5.1.7-nocdn`, `5.1-nocdn`, `5-nocdn`](https://github.com/weseek/growi/blob/v5.1.7/packages/app/docker/Dockerfile)
 * [`4.5.23`, `4.5`, `4`, `latest` (Dockerfile)](https://github.com/weseek/growi/blob/v4.5.23/packages/app/docker/Dockerfile)

packages/app/docker/codebuild/buildspec.yml → apps/app/docker/codebuild/buildspec.yml

@@ -12,13 +12,18 @@ 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
       # login to ghcr.io
       - echo ${DOCKER_REGISTRY_ON_GITHUB_PAT} | docker login ghcr.io --username wsmoogle --password-stdin
   build:
     commands:
-      - docker build -t ${IMAGE_TAG} -f ./packages/app/docker/Dockerfile .
+      - docker build -t ${IMAGE_TAG} -f ./apps/app/docker/Dockerfile .
       - docker tag ${IMAGE_TAG} ${IMAGE_TAG_GHCR}
 
   post_build:
@@ -29,4 +34,5 @@ phases:
 cache:
   paths:
     - node_modules/**/*
+    - apps/*/node_modules/**/*
     - packages/*/node_modules/**/*

packages/app/docker/codebuild/codebuild.tf → apps/app/docker/codebuild/codebuild.tf

@@ -11,10 +11,10 @@ module "codebuild" {
   source_version      = "refs/heads/master"
   git_clone_depth     = 1
 
-  buildspec           = "packages/app/docker/codebuild/buildspec.yml"
+  buildspec           = "apps/app/docker/codebuild/buildspec.yml"
 
   # https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-available.html
-  build_image         = "aws/codebuild/amazonlinux2-x86_64-standard:3.0"
+  build_image         = "aws/codebuild/amazonlinux2-x86_64-standard:4.0"
   build_compute_type  = "BUILD_GENERAL1_LARGE"
 
   privileged_mode     = true

packages/app/jest.config.js → apps/app/jest.config.js

@@ -1,30 +1,26 @@
 // For a detailed explanation regarding each configuration property, visit:
 // https://jestjs.io/docs/en/configuration.html
-// https://kulshekhar.github.io/ts-jest/user/config/
 
 const MODULE_NAME_MAPPING = {
   '^\\^/(.+)$': '<rootDir>/$1',
   '^~/(.+)$': '<rootDir>/src/$1',
-  '^@growi/([^/]+)$': '<rootDir>/../$1/src',
-  '^@growi/([^/]+)/(.+)$': '<rootDir>/../$1/src/$2',
 };
 
 module.exports = {
   // Indicates whether each individual test should be reported during the run
   verbose: true,
 
-  preset: 'ts-jest/presets/js-with-ts',
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
 
   projects: [
     {
       displayName: 'unit',
 
-      preset: 'ts-jest/presets/js-with-ts',
-
-      // transform ESM to CJS
-      transformIgnorePatterns: [
-        '/node_modules/(?!remark-gfm)/',
-      ],
+      transform: {
+        '^.+\\.(t|j)sx?$': '@swc/jest',
+      },
+      // transform ESM to CJS (includes all packages in node_modules)
+      transformIgnorePatterns: [],
 
       rootDir: '.',
       roots: ['<rootDir>'],
@@ -40,7 +36,9 @@ module.exports = {
     {
       displayName: 'server',
 
-      preset: 'ts-jest/presets/js-with-ts',
+      transform: {
+        '^.+\\.(t|j)sx?$': '@swc-node/jest',
+      },
 
       rootDir: '.',
       roots: ['<rootDir>'],
@@ -59,7 +57,9 @@ module.exports = {
     {
       displayName: 'server-v5',
 
-      preset: 'ts-jest/presets/js-with-ts',
+      transform: {
+        '^.+\\.(t|j)sx?$': '@swc-node/jest',
+      },
 
       rootDir: '.',
       roots: ['<rootDir>'],

packages/app/next.config.js → apps/app/next.config.js

@@ -5,34 +5,33 @@
  * See: https://github.com/vercel/next.js/discussions/35969#discussioncomment-2522954
  */
 
+const path = require('path');
+
 const { withSuperjson } = require('next-superjson');
 const { PHASE_PRODUCTION_BUILD, PHASE_PRODUCTION_SERVER } = require('next/constants');
 
 
 const getTranspilePackages = () => {
-  const eazyLogger = require('eazy-logger');
-  const { listScopedPackages, listPrefixedPackages } = require('./src/utils/next.config.utils');
-
-  // setup logger
-  const logger = eazyLogger.Logger({
-    prefix: '[{green:next.config.js}] ',
-    useLevelPrefixes: false,
-  });
+  const { listPrefixedPackages } = require('./src/utils/next.config.utils');
 
-  // define transpiled packages for '@growi/*'
   const packages = [
-    ...listScopedPackages(['@growi'], { ignorePackageNames: ['@growi/app'] }),
     // listing ESM packages until experimental.esmExternals works correctly to avoid ERR_REQUIRE_ESM
     'react-markdown',
     'unified',
     'markdown-table',
+    'bail',
+    'ccount',
+    'character-entities',
     'character-entities-html4',
+    'character-entities-legacy',
     'comma-separated-tokens',
     'decode-named-character-reference',
+    'escape-string-regexp',
     'hastscript',
     'html-void-elements',
     'is-absolute-url',
     'longest-streak',
+    'micromark',
     'property-information',
     'space-separated-tokens',
     'stringify-entities',
@@ -49,6 +48,11 @@ const getTranspilePackages = () => {
     ...listPrefixedPackages(['remark-', 'rehype-', 'hast-', 'mdast-', 'micromark-', 'unist-']),
   ];
 
+  // const eazyLogger = require('eazy-logger');
+  // const logger = eazyLogger.Logger({
+  //   prefix: '[{green:next.config.js}] ',
+  //   useLevelPrefixes: false,
+  // });
   // logger.info('{bold:Listing scoped packages for transpiling:}');
   // logger.unprefixed('info', `{grey:${JSON.stringify(packages, null, 2)}}`);
 
@@ -81,16 +85,35 @@ module.exports = async(phase, { defaultConfig }) => {
 
     /** @param config {import('next').NextConfig} */
     webpack(config, options) {
-      // Avoid "Module not found: Can't resolve 'fs'"
-      // See: https://stackoverflow.com/a/68511591
       if (!options.isServer) {
+        // Avoid "Module not found: Can't resolve 'fs'"
+        // See: https://stackoverflow.com/a/68511591
         config.resolve.fallback.fs = false;
+
+        // exclude packages from the output bundles
+        config.module.rules.push(
+          ...[
+            /dtrace-provider/,
+            /mongoose/,
+            /mathjax-full/, // required from marp
+          ].map((packageRegExp) => {
+            return {
+              test: packageRegExp,
+              use: 'null-loader',
+            };
+          }),
+        );
       }
 
-      // See: https://webpack.js.org/configuration/externals/
-      // This provides a way of excluding dependencies from the output bundles
-      config.externals.push('dtrace-provider');
-      config.externals.push('mongoose');
+      // extract sourcemap
+      if (options.dev) {
+        config.module.rules.push({
+          test: /.(c|m)?js$/,
+          exclude: [/node_modules/, path.resolve(__dirname)],
+          enforce: 'pre',
+          use: ['source-map-loader'],
+        });
+      }
 
       // setup i18next-hmr
       if (!options.isServer && options.dev) {

packages/app/package.json → apps/app/package.json

@@ -1,58 +1,51 @@
 {
   "name": "@growi/app",
-  "version": "6.0.15",
+  "version": "6.1.0-RC.2",
   "license": "MIT",
   "scripts": {
     "//// for production": "",
     "build": "run-p build:*",
     "start": "yarn next start",
     "build:client": "yarn next build",
-    "prebuild:client": "tsc -p tsconfig.build.next.config.json",
     "build:server": "yarn cross-env NODE_ENV=production tsc -p tsconfig.build.server.json && tsc-alias -p tsconfig.build.server-tsc-alias.json",
-    "postbuild:server": "npx -y shx echo \"Listing files under transpiled\" && npx -y shx ls transpiled && npx -y shx mv transpiled/src dist && npx -y shx cp -r transpiled/config/* config && npx -y shx rm -rf transpiled",
+    "postbuild:server": "npx -y shx echo \"Listing files under transpiled\" && npx -y shx ls transpiled && npx -y shx rm -rf dist && npx -y shx mv transpiled/src dist && npx -y shx rm -rf transpiled",
     "clean": "npx -y shx rm -rf dist transpiled",
-    "prebuild": "yarn cross-env NODE_ENV=production run-p clean resources:*",
     "server": "yarn cross-env NODE_ENV=production node -r dotenv-flow/config dist/server/app.js",
     "server:ci": "yarn server --ci",
     "preserver": "yarn cross-env NODE_ENV=production yarn migrate",
+    "styles-prebuilt": "vite build -c vite.styles-prebuilt.config.ts",
     "migrate": "node -r dotenv-flow/config node_modules/.bin/migrate-mongo up -f config/migrate-mongo-config.js",
     "//// for development": "",
-    "dev": "yarn cross-env NODE_ENV=development ts-node-dev -r tsconfig-paths/register -r dotenv-flow/config --inspect --transpile-only src/server/app.ts",
-    "predev": "yarn cross-env NODE_ENV=development run-p resources:* dev:migrate:up",
-    "dev:analyze": "yarn cross-env ANALYZE=true yarn dev",
+    "dev": "yarn cross-env NODE_ENV=development yarn ts-node-dev --inspect --transpile-only src/server/app.ts",
+    "dev:styles-prebuilt": "yarn styles-prebuilt --mode dev",
     "dev:migrate-mongo": "yarn cross-env NODE_ENV=development yarn ts-node node_modules/.bin/migrate-mongo",
-    "dev:migrate": "yarn dev:migrate:up",
+    "dev:migrate": "yarn dev:migrate:status > tmp/cache/migration-status.out && yarn dev:migrate:up",
     "dev:migrate:create": "yarn dev:migrate-mongo create -f config/migrate-mongo-config.js",
     "dev:migrate:status": "yarn dev:migrate-mongo status -f config/migrate-mongo-config.js",
     "dev:migrate:up": "yarn dev:migrate-mongo up -f config/migrate-mongo-config.js",
     "dev:migrate:down": "yarn dev:migrate-mongo down -f config/migrate-mongo-config.js",
     "cy:run": "cypress run --browser chrome",
     "//// for CI": "",
-    "dev:ci": "yarn dev --ci",
-    "predev:ci": "run-p resources:*",
+    "dev:ci": "yarn cross-env NODE_ENV=development yarn ts-node src/server/app.ts --ci",
     "lint:typecheck": "npx -y tsc",
-    "lint:eslint": "eslint --quiet \"**/*.{js,jsx,ts,tsx}\"",
+    "lint:eslint": "yarn eslint --quiet \"**/*.{js,jsx,ts,tsx}\"",
     "lint:styles": "stylelint src/**/*.scss",
     "lint:swagger2openapi": "node node_modules/.bin/oas-validate tmp/swagger.json",
     "lint": "run-p lint:*",
-    "test": "cross-env NODE_ENV=test jest --passWithNoTests -- ",
-    "test:ci": "cross-env NODE_ENV=test jest",
-    "// prelint:eslint": "yarn resources:plugin",
     "prelint:swagger2openapi": "yarn openapi:v3",
+    "test": "cross-env NODE_ENV=test NODE_OPTIONS=\"--max-old-space-size=4096\" jest --logHeapUsage",
+    "jest:run": "cross-env NODE_ENV=test jest --passWithNoTests -- ",
     "reg:run": "reg-suit run",
     "//// misc": "",
     "console": "yarn cross-env NODE_ENV=development yarn ts-node --experimental-repl-await src/server/console.js",
     "swagger-jsdoc": "swagger-jsdoc -o tmp/swagger.json -d config/swagger-definition.js",
     "openapi:v3": "yarn cross-env API_VERSION=3 yarn swagger-jsdoc -- \"src/server/routes/apiv3/**/*.js\" \"src/server/models/**/*.js\"",
     "openapi:v1": "yarn cross-env API_VERSION=1 yarn swagger-jsdoc -- \"src/server/*/*.js\" \"src/server/models/**/*.js\"",
-    "resources:hackmd": "yarn lerna run build --scope=@growi/hackmd",
-    "resources:preset-themes": "yarn lerna run dev:nowatch --scope=@growi/preset-themes",
-    "// resources:dl-resources": "yarn ts-node bin/download-cdn-resources.ts",
-    "ts-node": "node -r ts-node/register -r tsconfig-paths/register -r dotenv-flow/config"
+    "ts-node": "node -r ts-node/register -r tsconfig-paths/register -r dotenv-flow/config",
+    "ts-node-dev": "ts-node-dev -r tsconfig-paths/register -r dotenv-flow/config"
   },
   "// comments for dependencies": {
     "escape-string-regexp": "5.0.0 or above exports only ESM",
-    "next": ">=13.1.2 with Node v14 have the problem => https://github.com/vercel/next.js/issues/45052",
     "string-width": "5.0.0 or above exports only ESM.",
     "prom-client": "!!DO NOT REMOVE!! A peer dependency of @promster.",
     "remark-wiki-link": "!!DO NOT REMOVE!! including 'mdast-util-wiki-link' and 'micromark-extension-wiki-link' required by pukiwiki-like-linker"
@@ -62,18 +55,18 @@
     "@aws-sdk/client-s3": "^3.58.0",
     "@aws-sdk/s3-request-presigner": "^3.58.0",
     "@browser-bunyan/console-formatted-stream": "^1.8.0",
-    "@elastic/elasticsearch6": "npm:@elastic/elasticsearch@^6.8.8",
     "@elastic/elasticsearch7": "npm:@elastic/elasticsearch@^7.17.0",
+    "@elastic/elasticsearch8": "npm:@elastic/elasticsearch@^8.7.0",
     "@godaddy/terminus": "^4.9.0",
     "@google-cloud/storage": "^5.8.5",
-    "@growi/codemirror-textlint": "^6.0.15",
-    "@growi/core": "^6.0.15",
-    "@growi/hackmd": "^6.0.15",
-    "@growi/preset-themes": "^6.0.15",
-    "@growi/remark-drawio": "^6.0.15",
-    "@growi/remark-growi-directive": "^6.0.15",
-    "@growi/remark-lsx": "^6.0.15",
-    "@growi/slack": "^6.0.15",
+    "@growi/core": "^6.1.0-RC.2",
+    "@growi/hackmd": "^6.1.0-RC.2",
+    "@growi/preset-themes": "^6.1.0-RC.2",
+    "@growi/remark-attachment-refs": "^6.1.0-RC.2",
+    "@growi/remark-drawio": "^6.1.0-RC.2",
+    "@growi/remark-growi-directive": "^6.1.0-RC.2",
+    "@growi/remark-lsx": "^6.1.0-RC.2",
+    "@growi/slack": "^6.1.0-RC.2",
     "@promster/express": "^7.0.6",
     "@promster/server": "^7.0.8",
     "@slack/web-api": "^6.2.4",
@@ -86,7 +79,7 @@
     "axios-retry": "^3.2.4",
     "body-parser": "^1.18.2",
     "browser-bunyan": "^1.8.0",
-    "bson-objectid": "^2.0.3",
+    "bson-objectid": "^2.0.4",
     "bunyan": "^1.8.15",
     "check-node-version": "^4.1.0",
     "compression": "^1.7.4",
@@ -103,7 +96,7 @@
     "diff_match_patch": "^0.1.1",
     "ejs": "^3.1.8",
     "esa-node": "^0.2.2",
-    "escape-string-regexp": "=4.0.0",
+    "escape-string-regexp": "^4.0.0",
     "eslint-plugin-regex": "^1.8.0",
     "expose-gc": "^1.0.0",
     "express": "^4.16.1",
@@ -126,23 +119,25 @@
     "lucene-query-parser": "^1.2.0",
     "markdown-table": "^1.1.1",
     "md5": "^2.2.1",
+    "mermaid": "^10.1.0",
     "method-override": "^3.0.0",
     "migrate-mongo": "^8.2.3",
     "mkdirp": "^1.0.3",
-    "mongoose": "^6.0.13",
+    "mongoose": "^6.5.0",
     "mongoose-gridfs": "^1.2.42",
     "mongoose-paginate-v2": "^1.3.9",
     "mongoose-unique-validator": "^2.0.3",
     "multer": "~1.4.0",
     "multer-autoreap": "^1.0.3",
-    "next": "=13.1.1",
+    "next": "^13.3.0",
     "next-i18next": "^13.2.1",
     "next-superjson": "^0.0.4",
     "next-themes": "^0.2.1",
     "nocache": "^3.0.1",
+    "node-cron": "^3.0.2",
     "nodemailer": "^6.6.2",
     "nodemailer-ses-transport": "~1.5.0",
-    "openid-client": "^5.1.2",
+    "openid-client": "^5.4.0",
     "p-retry": "^4.0.0",
     "passport": "^0.6.0",
     "passport-github": "^1.1.0",
@@ -151,6 +146,7 @@
     "passport-local": "^1.0.0",
     "passport-saml": "^3.2.0",
     "prom-client": "^14.1.1",
+    "qs": "^6.11.1",
     "rate-limiter-flexible": "^2.3.7",
     "react": "^18.2.0",
     "react-bootstrap-typeahead": "^5.2.2",
@@ -163,7 +159,7 @@
     "react-error-boundary": "^3.1.4",
     "react-i18next": "^12.2.0",
     "react-image-crop": "^8.3.0",
-    "react-markdown": "^8.0.3",
+    "react-markdown": "^8.0.7",
     "react-multiline-clamp": "^2.0.0",
     "react-scroll": "^1.8.7",
     "react-syntax-highlighter": "^15.5.0",
@@ -199,15 +195,15 @@
     "usehooks-ts": "^2.6.0",
     "validator": "^13.7.0",
     "ws": "^8.3.0",
-    "xss": "^1.0.6"
+    "xss": "^1.0.14"
   },
   "// comments for defDependencies": {
     "@handsontable/react": "v3 requires handsontable >= 7.0.0.",
     "handsontable": "v7.0.0 or above is no loger MIT lisence."
   },
   "devDependencies": {
-    "@growi/presentation": "^6.0.15",
-    "@growi/ui": "^6.0.15",
+    "@growi/presentation": "^6.1.0-RC.2",
+    "@growi/ui": "^6.1.0-RC.2",
     "@handsontable/react": "=2.1.0",
     "@icon/themify-icons": "1.0.1-alpha.3",
     "@next/bundle-analyzer": "^13.2.3",
@@ -219,7 +215,7 @@
     "codemirror": "^5.64.0",
     "connect-browser-sync": "^2.1.0",
     "core-js": "=2.6.9",
-    "diff2html": "^3.1.2",
+    "diff2html": "^3.4.35",
     "eazy-logger": "^3.1.0",
     "emoji-mart": "npm:panta82-emoji-mart@^3.0.1",
     "eslint-plugin-cypress": "^2.12.1",
@@ -229,10 +225,10 @@
     "i18next-hmr": "^1.11.0",
     "jquery-slimscroll": "^1.3.8",
     "jquery.cookie": "~1.4.1",
-    "jshint": "^2.13.0",
     "load-css-file": "^1.0.0",
     "material-icons": "^1.11.3",
     "morgan": "^1.10.0",
+    "null-loader": "^4.0.1",
     "penpal": "^4.0.0",
     "plantuml-encoder": "^1.2.5",
     "prettier": "^1.19.1",
@@ -247,9 +243,8 @@
     "simple-load-script": "^1.0.2",
     "simplebar-react": "^2.3.6",
     "socket.io-client": "^4.2.0",
-    "sticky-events": "^3.4.11",
+    "source-map-loader": "^4.0.1",
     "swagger2openapi": "^5.3.1",
-    "ts-node-dev": "^2.0.0",
     "tsc-alias": "^1.2.9"
   }
 }