Skip to content
This repository has been archived by the owner on Nov 26, 2024. It is now read-only.

Commit

Permalink
Merge pull request #1124 from koedame/release/v2.0.5
Browse files Browse the repository at this point in the history
Release/v2.0.5
  • Loading branch information
unchidev authored Jul 5, 2022
2 parents e5194fa + 91664dd commit 2b784f1
Show file tree
Hide file tree
Showing 46 changed files with 1,371 additions and 220 deletions.
45 changes: 45 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.238.0/containers/docker-existing-docker-compose
// If you want to run as a non-root user in the container, see .devcontainer/docker-compose.yml.
{
"name": "Existing Docker Compose (Extend)",

// Update the 'dockerComposeFile' list if you have more compose files or use different names.
// The .devcontainer/docker-compose.yml file contains any overrides you need/want to make.
"dockerComposeFile": [
"../docker-compose.yml",
"docker-compose.yml"
],

// The 'service' property is the name of the service for the container that VS Code should
// use. Update this value and .devcontainer/docker-compose.yml to the real service name.
"service": "app",

// The optional 'workspaceFolder' property is the path VS Code should open by default when
// connected. This is typically a file mount in .devcontainer/docker-compose.yml
"workspaceFolder": "/workspace",
"customizations": {
"vscode": {
"extensions": [
"esbenp.prettier-vscode",
"remimarsal.prettier-now",
"mrmlnc.vscode-duplicate"
]
}
}

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

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

// Uncomment the next line if you want to keep your containers running after VS Code shuts down.
// "shutdownAction": "none",

// Uncomment the next line to run commands after the container is created - for example installing curl.
// "postCreateCommand": "apt-get update && apt-get install -y curl",

// Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root.
// "remoteUser": "vscode"
}
38 changes: 38 additions & 0 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
version: '3.3'
services:
# Update this to the name of the service you want to work with in your docker-compose.yml file
app:
# If you want add a non-root user to your Dockerfile, you can use the "remoteUser"
# property in devcontainer.json to cause VS Code its sub-processes (terminals, tasks,
# debugging) to execute as the user. Uncomment the next line if you want the entire
# container to run as this user instead. Note that, on Linux, you may need to
# ensure the UID and GID of the container user you create matches your local user.
# See https://aka.ms/vscode-remote/containers/non-root for details.
#
# user: vscode

# Uncomment if you want to override the service's Dockerfile to one in the .devcontainer
# folder. Note that the path of the Dockerfile and context is relative to the *primary*
# docker-compose.yml file (the first in the devcontainer.json "dockerComposeFile"
# array). The sample below assumes your primary file is in the root of your project.
#
# build:
# context: .
# dockerfile: .devcontainer/Dockerfile

volumes:
# Update this to wherever you want VS Code to mount the folder of your project
- .:/workspace:cached

# Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker-compose for details.
# - /var/run/docker.sock:/var/run/docker.sock

# Uncomment the next four lines if you will use a ptrace-based debugger like C++, Go, and Rust.
# cap_add:
# - SYS_PTRACE
# security_opt:
# - seccomp:unconfined

# Overrides default command so things don't shut down after the process ends.
command: /bin/sh -c "while sleep 1000; do :; done"

62 changes: 32 additions & 30 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"
name: 'CodeQL'

on:
push:
branches: [ "develop" ]
branches: ['develop']
pull_request:
# The branches below must be a subset of the branches above
branches: [ "develop" ]
branches: ['develop']
schedule:
- cron: '24 0 * * 2'

Expand All @@ -33,43 +33,45 @@ jobs:
strategy:
fail-fast: false
matrix:
# TypeScript をしていしなくても大丈夫らしい
# TypeScript を指定しなくても大丈夫らしい
# 参考: https://github.com/github/codeql-action/issues/365
language: [ 'javascript' ]
language: ['javascript']
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh
# 実際にビルドを行ってその内容を確認してもらうのが安全そうだが、誤検出されたものを毎回承認する作業が大変なのでビルド結果は一旦無視
# - run: yarn build

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
36 changes: 36 additions & 0 deletions .github/workflows/tsc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: コンパイルチェック
on:
pull_request:
push:
branches:
- develop
jobs:
build:
timeout-minutes: 5
permissions:
contents: read
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: actions/setup-node@v3
id: setup_node_id
with:
node-version: 18
cache: yarn

- uses: actions/cache@v3
id: node_modules_cache_id
env:
cache-name: cache-node-modules
with:
path: 'node_modules'
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('yarn.lock') }}-v6

- run: echo '${{ toJSON(steps.node_modules_cache_id.outputs) }}'
- run: echo '${{ steps.node_modules_cache_id.outputs.cache-hit != 'true' }}'

- if: steps.node_modules_cache_id.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile

- run: yarn run tsccheck
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
/dist-zip
/coverage
report.json
.devcontainer

18 changes: 18 additions & 0 deletions CHANGELOGS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# CHANGELOGS

## v2.0.5

### 変更

- 「最近の活動」を相対時間に変更
- テストルームへの入室はオンライン通知しないように変更
- ユーザー検索機能追加
- ルーム入室状況を詳細に表示
- 一部テキストの色を変更
- 使用していないOptionページを削除
- 画像を圧縮して軽量化

### 依存パッケージ

- @swc/core from 1.2.207 to 1.2.208
- @types/node from 18.0.0 to 18.0.1
- ts-node from 10.8.1 to 10.8.2

## v2.0.4

### 変更
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
- 🚫 メンバーブロック管理機能
- 🔔 メンバーオンライン通知機能
- ⏳ ルームの残り時間表示
- 🔍 高度な検索
- 🔍 高度なルーム検索
- 🚫 満室表示切り替え
- 🔔 満室空き通知登録
- 🍎 ファビコン表示
Expand All @@ -20,6 +20,7 @@
- 🌏 多言語対応
- 📌 お知らせ表示
- 🔐 パスワード保存機能
- 🔍 メンバー検索機能

## 対応ブラウザ

Expand Down
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "syncroom-plus",
"version": "2.0.4",
"version": "2.0.5",
"description": "syncroom-plus",
"license": "MIT",
"private": true,
Expand All @@ -9,6 +9,7 @@
"build-zip": "NODE_ENV=production node scripts/build-zip.js",
"start": "NODE_ENV=development node utils/webserver.js",
"prettier": "NODE_ENV=development prettier --write 'src/**/*.{js,jsx,ts,tsx,json,css,scss,md}'",
"tsccheck": "NODE_ENV=development tsc --noEmit",
"test": "NODE_ENV=test jest --collect-coverage",
"test-watch": "NODE_ENV=test jest --collect-coverage --watch-all",
"test:coverage": "NODE_ENV=test jest --collect-coverage --silent --testLocationInResults --ci --json --outputFile=\"report.json\""
Expand Down Expand Up @@ -37,7 +38,7 @@
"@hot-loader/react-dom": "^17.0.2",
"@jest/expect-utils": "^28.1.1",
"@jest/globals": "^28.1.2",
"@swc/core": "^1.2.207",
"@swc/core": "^1.2.208",
"@swc/jest": "^0.2.21",
"@tailwindcss/aspect-ratio": "^0.4.0",
"@tailwindcss/forms": "^0.5.2",
Expand All @@ -47,7 +48,7 @@
"@types/chrome": "^0.0.191",
"@types/jest": "^28.1.4",
"@types/luxon": "^2.3.2",
"@types/node": "^18.0.0",
"@types/node": "^18.0.1",
"@types/react": "^17.0.33",
"@types/react-dom": "^17.0.10",
"@types/recoil": "^0.0.9",
Expand Down Expand Up @@ -81,7 +82,7 @@
"terser-webpack-plugin": "^5.2.4",
"ts-jest": "^28.0.5",
"ts-loader": "^9.3.1",
"ts-node": "^10.8.1",
"ts-node": "^10.8.2",
"typescript": "^4.7.4",
"webextension-polyfill": "^0.9.0",
"webpack": "^5.60.0",
Expand Down
Loading

0 comments on commit 2b784f1

Please sign in to comment.