Skip to content

Commit

Permalink
Merge pull request #9343 from weseek/master
Browse files Browse the repository at this point in the history
Release v7.1.0
  • Loading branch information
yuki-takei authored Oct 31, 2024
2 parents 8b8c31b + 420a2ab commit 9b07e46
Show file tree
Hide file tree
Showing 383 changed files with 34,553 additions and 23,866 deletions.
7 changes: 5 additions & 2 deletions .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@
"@growi/custom-icons",
"@growi/editor",
"@growi/presentation",
"@growi/preset-*",
"@growi/remark-*",
"@growi/preset-templates",
"@growi/preset-themes",
"@growi/remark-attachment-refs",
"@growi/remark-drawio",
"@growi/remark-lsx",
"@growi/slack",
"@growi/ui"
]
Expand Down
59 changes: 0 additions & 59 deletions .devcontainer/Dockerfile

This file was deleted.

25 changes: 3 additions & 22 deletions .devcontainer/docker-compose.yml → .devcontainer/compose.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,12 @@
#-------------------------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------

version: '3'
services:
node:
# Uncomment the next line to use a non-root user for all processes. You can also
# simply use the "remoteUser" property in devcontainer.json if you just want VS Code
# and its sub-processes (terminals, tasks, debugging) to execute as the user. On Linux,
# you may need to update USER_UID and USER_GID in .devcontainer/Dockerfile to match your
# user if not 1000. See https://aka.ms/vscode-remote/containers/non-root for details.
user: node

build:
context: .
dockerfile: Dockerfile

image: mcr.microsoft.com/devcontainers/base:ubuntu
volumes:
- ..:/workspace/growi:delegated
- pnpm-store:/workspace/growi/.pnpm-store
- node_modules:/workspace/growi/node_modules
- 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:
Expand Down Expand Up @@ -59,7 +41,6 @@ services:
- ../../growi-docker-compose/elasticsearch/v8/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml

volumes:
pnpm-store:
node_modules:
node_modules_app:
node_modules_slackbot-proxy:
buildcache_app:
67 changes: 34 additions & 33 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,44 +1,45 @@
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.117.1/containers/javascript-node-12-mongo
// If you want to run as a non-root user in the container, see .devcontainer/docker-compose.yml.
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
{
"name": "GROWI-Dev",
"dockerComposeFile": "docker-compose.yml",
"dockerComposeFile": "compose.yml",
"service": "node",
"workspaceFolder": "/workspace/growi",

// Set *default* container specific settings.json values on container create.
"settings": {
"terminal.integrated.defaultProfile.linux": "bash"
"features": {
"ghcr.io/devcontainers/features/node:1": {
"version": "20.18.0"
}
},

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"dbaeumer.vscode-eslint",
"mhutchie.git-graph",
"eamodio.gitlens",
"github.vscode-pull-request-github",
"cschleiden.vscode-github-actions",
"cweijan.vscode-database-client2",
"mongodb.mongodb-vscode",
"msjsdiag.debugger-for-chrome",
"firefox-devtools.vscode-firefox-debug",
"editorconfig.editorconfig",
"shinnn.stylelint",
"stylelint.vscode-stylelint",
"vitest.explorer",
"ms-playwright.playwright"
],

// Uncomment the next line if you want start specific services in your Docker Compose config.
// "runServices": [],

// Uncomment the line below if you want to keep your containers running after VS Code shuts down.
// "shutdownAction": "none",
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "git-lfs pull & turbo run bootstrap",
"postCreateCommand": "/bin/bash ./.devcontainer/postCreateCommand.sh",

// Configure tool-specific properties.
"customizations": {
"vscode": {
"extensions": [
"dbaeumer.vscode-eslint",
"mhutchie.git-graph",
"eamodio.gitlens",
"github.vscode-pull-request-github",
"cschleiden.vscode-github-actions",
"cweijan.vscode-database-client2",
"mongodb.mongodb-vscode",
"msjsdiag.debugger-for-chrome",
"firefox-devtools.vscode-firefox-debug",
"editorconfig.editorconfig",
"shinnn.stylelint",
"stylelint.vscode-stylelint",
"vitest.explorer",
"ms-playwright.playwright"
],
}
},

// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "node"
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
18 changes: 18 additions & 0 deletions .devcontainer/postCreateCommand.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
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

# Setup pnpm
SHELL=bash pnpm setup
eval "$(cat /home/vscode/.bashrc)"

# Install turbo
pnpm install turbo --global

# Install dependencies
turbo run bootstrap
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ updates:
- dependency-name: handsontable
- dependency-name: typeorm
- dependency-name: mysql2

- dependency-name: "@codemirror/*"

5 changes: 2 additions & 3 deletions .github/workflows/ci-app-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ on:
branches:
- master
- dev/7.*.x
- dev/6.*.x
paths:
- .github/mergify.yml
- .github/workflows/ci-app-prod.yml
- .github/workflows/reusable-app-prod.yml
- .github/workflows/reusable-app-reg-suit.yml
- tsconfig.base.json
- turbo.json
- yarn.lock
- pnpm-lock.yaml
- package.json
- apps/app/**
- '!apps/app/docker/**'
Expand All @@ -26,7 +25,7 @@ on:
- .github/workflows/reusable-app-prod.yml
- .github/workflows/reusable-app-reg-suit.yml
- tsconfig.base.json
- yarn.lock
- pnpm-lock.yaml
- turbo.json
- package.json
- apps/app/**
Expand Down
63 changes: 16 additions & 47 deletions .github/workflows/ci-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
- .eslint*
- tsconfig.base.json
- turbo.json
- yarn.lock
- pnpm-lock.yaml
- package.json
- apps/app/**
- '!apps/app/docker/**'
Expand All @@ -34,21 +34,12 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v4

- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
cache-dependency-path: '**/yarn.lock'

- name: Cache/Restore node_modules
uses: actions/cache@v4
with:
path: |
**/node_modules
!**/node_modules/.cache/turbo
key: node_modules-app-devdependencies-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
node_modules-app-devdependencies-${{ runner.OS }}-node${{ matrix.node-version }}-
cache: 'pnpm'

- name: Cache/Restore dist
uses: actions/cache@v4
Expand All @@ -63,9 +54,8 @@ jobs:
- name: Install dependencies
run: |
yarn global add turbo
yarn global add node-gyp
yarn --frozen-lockfile
pnpm add turbo --global
pnpm install --frozen-lockfile
- name: Lint
run: |
Expand Down Expand Up @@ -98,21 +88,12 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v4

- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
cache-dependency-path: '**/yarn.lock'

- name: Cache/Restore node_modules
uses: actions/cache@v4
with:
path: |
**/node_modules
!**/node_modules/.cache/turbo
key: node_modules-app-devdependencies-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
node_modules-app-devdependencies-${{ runner.OS }}-node${{ matrix.node-version }}-
cache: 'pnpm'

- name: Cache/Restore dist
uses: actions/cache@v4
Expand All @@ -127,9 +108,8 @@ jobs:
- name: Install dependencies
run: |
yarn global add turbo
yarn global add node-gyp
yarn --frozen-lockfile
pnpm add turbo --global
pnpm install --frozen-lockfile
- name: Test
run: |
Expand Down Expand Up @@ -172,22 +152,12 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v4

- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
cache-dependency-path: '**/yarn.lock'

- name: Cache/Restore node_modules
uses: actions/cache@v4
with:
path: |
**/node_modules
!**/node_modules/.cache/turbo
key: node_modules-app-devdependencies-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
node_modules-app-devdependencies-${{ runner.OS }}-node${{ matrix.node-version }}-
node_modules-app-devdependencies-${{ runner.OS }}-node${{ matrix.node-version }}-
cache: 'pnpm'

- name: Cache/Restore dist
uses: actions/cache@v4
Expand All @@ -202,9 +172,8 @@ jobs:
- name: Install dependencies
run: |
yarn global add turbo
yarn global add node-gyp
yarn --frozen-lockfile
pnpm add turbo --global
pnpm install --frozen-lockfile
- name: turbo run launch-dev:ci
working-directory: ./apps/app
Expand Down
Loading

0 comments on commit 9b07e46

Please sign in to comment.