Procházet zdrojové kódy

Merge branch 'master' into support/devide-core-package

Yuki Takei před 1 rokem
rodič
revize
53784dfee9

+ 20 - 1
CHANGELOG.md

@@ -1,9 +1,28 @@
 # Changelog
 
-## [Unreleased](https://github.com/weseek/growi/compare/v7.0.4...HEAD)
+## [Unreleased](https://github.com/weseek/growi/compare/v7.0.5...HEAD)
 
 *Please do not manually update this file. We've automated the process.*
 
+## [v7.0.5](https://github.com/weseek/growi/compare/v7.0.4...v7.0.5) - 2024-05-20
+
+### 🚀 Improvement
+
+* imprv: Behavior of dropdown toggle for WIP in 'Page Tree' sidebar (#8796) @maeshinshin
+* imprv: Hide the page creation button for users without editing permissions (#8808) @miya
+* imprv: Add config to toggle ACL between public_read and private on PutObject when using S3 with FileUploader (#8778) @ToshihitoKon
+
+### 🐛 Bug Fixes
+
+* fix: BookmarkItem occures an error when the related page has been deleted 2 (#8818) @yuki-takei
+* fix: BookmarkItem occures an error when the related page has been deleted (#8817) @yuki-takei
+* fix: Display share page date (#8809) @TatsuyaIse
+* fix: Admin layout (#8806) @satof3
+
+### 🧰 Maintenance
+
+* support: Modify env var for S3 Object-ACL (#8805) @yuki-takei
+
 ## [v7.0.4](https://github.com/weseek/growi/compare/v7.0.3...v7.0.4) - 2024-05-13
 
 ### 💎 Features

+ 1 - 1
apps/app/docker/README.md

@@ -10,7 +10,7 @@ GROWI Official docker image
 Supported tags and respective Dockerfile links
 ------------------------------------------------
 
-* [`7.0.4`, `7.0`, `7`, `latest` (Dockerfile)](https://github.com/weseek/growi/blob/v7.0.4/apps/app/docker/Dockerfile)
+* [`7.0.5`, `7.0`, `7`, `latest` (Dockerfile)](https://github.com/weseek/growi/blob/v7.0.5/apps/app/docker/Dockerfile)
 * [`6.3.2`, `6.3`, `6` (Dockerfile)](https://github.com/weseek/growi/blob/v6.3.2/apps/app/docker/Dockerfile)
 * [`6.2.4`, `6.2` (Dockerfile)](https://github.com/weseek/growi/blob/v6.2.4/apps/app/docker/Dockerfile)
 * [`6.1.15`, `6.1` (Dockerfile)](https://github.com/weseek/growi/blob/v6.1.15/apps/app/docker/Dockerfile)

+ 1 - 1
apps/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@growi/app",
-  "version": "7.0.5-RC.0",
+  "version": "7.0.6-RC.0",
   "license": "MIT",
   "scripts": {
     "//// for production": "",

+ 1 - 1
apps/slackbot-proxy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@growi/slackbot-proxy",
-  "version": "7.0.5-slackbot-proxy.0",
+  "version": "7.0.6-slackbot-proxy.0",
   "license": "MIT",
   "scripts": {
     "build": "yarn tsc && tsc-alias -p tsconfig.build.json",

+ 3 - 3
package.json

@@ -1,7 +1,9 @@
 {
   "name": "growi",
-  "version": "7.0.5-RC.0",
+  "version": "7.0.6-RC.0",
   "description": "Team collaboration software using markdown",
+  "license": "MIT",
+  "private": "true",
   "tags": [
     "wiki",
     "communication",
@@ -10,7 +12,6 @@
   ],
   "author": "Yuki Takei <yuki@weseek.co.jp>",
   "contributors": [],
-  "license": "MIT",
   "homepage": "https://growi.org",
   "repository": {
     "type": "git",
@@ -19,7 +20,6 @@
   "bugs": {
     "url": "https://github.com/weseek/growi/issues"
   },
-  "private": true,
   "workspaces": {
     "packages": [
       "packages/*",

+ 2 - 3
packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@growi/core",
-  "version": "7.0.5-RC.0",
+  "version": "0.9.0",
   "description": "GROWI Core Libraries",
   "license": "MIT",
   "keywords": [
@@ -59,8 +59,7 @@
     "lint:js": "yarn eslint **/*.{js,ts}",
     "lint:typecheck": "tsc",
     "lint": "npm-run-all -p lint:*",
-    "test": "vitest run --coverage",
-    "version": "yarn version --no-git-tag-version --preid=RC"
+    "test": "vitest run --coverage"
   },
   "// comments for dependencies": {
     "escape-string-regexp": "5.0.0 or above exports only ESM"

+ 3 - 1
packages/custom-icons/package.json

@@ -1,7 +1,9 @@
 {
   "name": "@growi/custom-icons",
-  "version": "7.0.0-RC.0",
+  "version": "1.0.0",
+  "description": "Custom icons builder project for GROWI",
   "license": "MIT",
+  "private": "true",
   "scripts": {
     "build": "svgtofont --sources ./svg --output ./dist",
     "dev": "svgtofont --sources ./svg --output ./dist"

+ 4 - 3
packages/editor/package.json

@@ -1,7 +1,9 @@
 {
   "name": "@growi/editor",
-  "version": "7.0.5-RC.0",
+  "version": "1.0.0",
+  "description": "A markdown editor for GROWI",
   "license": "MIT",
+  "private": "true",
   "type": "module",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,8 +15,7 @@
     "serve": "vite",
     "lint:js": "yarn eslint **/*.{js,ts}",
     "lint:typecheck": "tsc",
-    "lint": "npm-run-all -p lint:*",
-    "version": "yarn version --no-git-tag-version --preid=RC"
+    "lint": "npm-run-all -p lint:*"
   },
   "dependencies": {
     "markdown-table": "^3.0.3",

+ 2 - 1
packages/pluginkit/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@growi/pluginkit",
-  "version": "0.1.0",
+  "version": "0.9.0",
+  "description": "Plugin kit for GROWI",
   "license": "MIT",
   "main": "dist/index.cjs",
   "module": "dist/index.js",

+ 4 - 4
packages/presentation/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@growi/presentation",
-  "version": "7.0.5-RC.0",
-  "description": "GROWI plugin for presentation",
+  "version": "1.0.0",
+  "description": "A package for GROWI presentation feature",
   "license": "MIT",
+  "private": "true",
   "keywords": [
     "growi",
     "growi-plugin"
@@ -32,8 +33,7 @@
     "lint:js": "yarn eslint **/*.{js,jsx,ts,tsx}",
     "lint:styles": "stylelint --allow-empty-input src/**/*.scss src/**/*.css",
     "lint:typecheck": "tsc",
-    "lint": "run-p lint:*",
-    "version": "yarn version --no-git-tag-version --preid=RC"
+    "lint": "run-p lint:*"
   },
   "dependencies": {
     "@growi/core": "link:../core"

+ 5 - 3
packages/preset-templates/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@growi/preset-templates",
-  "version": "7.0.5-RC.0",
+  "version": "1.0.0",
+  "description": "GROWI preset templates",
+  "license": "MIT",
+  "private": "true",
   "scripts": {
-    "test": "vitest run",
-    "version": "yarn version --no-git-tag-version --preid=RC"
+    "test": "vitest run"
   },
   "dependencies": {},
   "devDependencies": {

+ 3 - 3
packages/preset-themes/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@growi/preset-themes",
+  "version": "1.0.0",
   "description": "GROWI preset themes",
-  "version": "7.0.5-RC.0",
   "license": "MIT",
+  "private": "true",
   "main": "dist/libs/preset-themes.umd.js",
   "module": "dist/libs/preset-themes.mjs",
   "types": "dist/libs/index.d.ts",
@@ -24,8 +25,7 @@
     "lint:styles": "stylelint src/**/*.scss",
     "lint:typecheck": "tsc",
     "lint": "run-p lint:*",
-    "preview": "vite preview",
-    "version": "yarn version --no-git-tag-version --preid=RC"
+    "preview": "vite preview"
   },
   "dependencies": {},
   "devDependencies": {

+ 4 - 4
packages/remark-attachment-refs/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@growi/remark-attachment-refs",
-  "version": "7.0.5-RC.0",
-  "description": "GROWI Plugin to add ref/refimg/refs/refsimg tags",
+  "version": "1.0.0",
+  "description": "Remark plugin to add ref/refimg/refs/refsimg tags",
   "license": "MIT",
+  "private": "true",
   "keywords": [
     "growi",
     "growi-plugin"
@@ -40,8 +41,7 @@
     "lint:styles": "stylelint src/**/*.scss src/**/*.css",
     "lint:typecheck": "tsc",
     "lint": "run-p lint:*",
-    "test": "",
-    "version": "yarn version --no-git-tag-version --preid=RC"
+    "test": ""
   },
   "dependencies": {
     "@growi/core": "link:../core",

+ 4 - 4
packages/remark-drawio/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@growi/remark-drawio",
-  "version": "7.0.5-RC.0",
-  "description": "remark plugin to draw diagrams with draw.io (diagrams.net)",
+  "version": "1.0.0",
+  "description": "Remark plugin to draw diagrams with draw.io (diagrams.net)",
   "license": "MIT",
+  "private": "true",
   "keywords": [
     "unified",
     "remark",
@@ -27,8 +28,7 @@
     "lint:js": "yarn eslint **/*.{js,jsx,ts,tsx}",
     "lint:styles": "stylelint --allow-empty-input src/**/*.scss src/**/*.css",
     "lint:typecheck": "tsc",
-    "lint": "run-p lint:*",
-    "version": "yarn version --no-git-tag-version --preid=RC"
+    "lint": "run-p lint:*"
   },
   "dependencies": {},
   "devDependencies": {

+ 3 - 4
packages/remark-growi-directive/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@growi/remark-growi-directive",
-  "version": "7.0.5-RC.0",
-  "description": "remark plugin to support GROWI plugin (forked from remark-directive@2.0.1)",
+  "version": "0.9.0",
+  "description": "Remark plugin to support GROWI original directive (forked from remark-directive@2.0.1)",
   "license": "MIT",
   "keywords": [
     "unified",
@@ -24,8 +24,7 @@
     "test-api": "tape --conditions development test/**.test.js",
     "test-coverage": "c8 --check-coverage --branches 100 --functions 100 --lines 100 --statements 100 --reporter lcov npm run test-api",
     "lint": "yarn eslint \"**/*.{cjs, js,jsx,ts,tsx}\"",
-    "lint:fix": "yarn eslint \"**/*.{cjs, js,jsx,ts,tsx}\" --fix",
-    "version": "yarn version --no-git-tag-version --preid=RC"
+    "lint:fix": "yarn eslint \"**/*.{cjs, js,jsx,ts,tsx}\" --fix"
   },
   "dependencies": {
     "@types/mdast": "^3.0.0",

+ 4 - 4
packages/remark-lsx/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@growi/remark-lsx",
-  "version": "7.0.5-RC.0",
-  "description": "GROWI plugin to list pages",
+  "version": "1.0.0",
+  "description": "Remark plugin to list pages",
   "license": "MIT",
+  "private": "true",
   "keywords": [
     "growi",
     "growi-plugin"
@@ -26,8 +27,7 @@
     "lint:styles": "stylelint --allow-empty-input src/**/*.scss src/**/*.css",
     "lint:typecheck": "tsc",
     "lint": "run-p lint:*",
-    "test": "vitest run --coverage",
-    "version": "yarn version --no-git-tag-version --preid=RC"
+    "test": "vitest run --coverage"
   },
   "// comments for dependencies": {
     "escape-string-regexp": "5.0.0 or above exports only ESM"

+ 4 - 3
packages/slack/package.json

@@ -1,7 +1,9 @@
 {
   "name": "@growi/slack",
-  "version": "7.0.5-RC.0",
+  "version": "1.0.0",
+  "description": "Slack integration libraries for GROWI",
   "license": "MIT",
+  "private": "true",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -44,8 +46,7 @@
     "lint:js": "yarn eslint **/*.{js,ts}",
     "lint:typecheck": "tsc",
     "lint": "npm-run-all -p lint:*",
-    "test": "vitest run --coverage",
-    "version": "yarn version --no-git-tag-version --preid=RC"
+    "test": "vitest run --coverage"
   },
   "dependencies": {
     "@slack/oauth": "^2.0.1",

+ 3 - 3
packages/ui/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@growi/ui",
-  "version": "7.0.5-RC.0",
+  "version": "1.0.0",
   "description": "GROWI UI Libraries",
   "license": "MIT",
+  "private": "true",
   "keywords": [
     "growi"
   ],
@@ -33,8 +34,7 @@
     "watch": "yarn dev -w --emptyOutDir=false",
     "lint:js": "yarn eslint **/*.{js,ts}",
     "lint:typecheck": "tsc",
-    "lint": "npm-run-all -p lint:*",
-    "version": "yarn version --no-git-tag-version --preid=RC"
+    "lint": "npm-run-all -p lint:*"
   },
   "dependencies": {
   },

+ 13 - 13
yarn.lock

@@ -1862,40 +1862,40 @@
   version "7.0.5-RC.0"
 
 "@growi/core@link:packages/core":
-  version "7.0.5-RC.0"
+  version "0.9.0"
   dependencies:
     bson-objectid "^2.0.4"
     escape-string-regexp "^4.0.0"
 
 "@growi/custom-icons@link:packages/custom-icons":
-  version "7.0.0-RC.0"
+  version "1.0.0"
 
 "@growi/editor@link:packages/editor":
-  version "7.0.5-RC.0"
+  version "1.0.0"
   dependencies:
     markdown-table "^3.0.3"
     react "^18.2.0"
     react-dom "^18.2.0"
 
 "@growi/pluginkit@link:packages/pluginkit":
-  version "0.1.0"
+  version "0.9.0"
   dependencies:
     "@growi/core" "link:packages/core"
     extensible-custom-error "^0.0.7"
 
 "@growi/presentation@link:packages/presentation":
-  version "7.0.5-RC.0"
+  version "1.0.0"
   dependencies:
     "@growi/core" "link:packages/core"
 
 "@growi/preset-templates@link:packages/preset-templates":
-  version "7.0.5-RC.0"
+  version "1.0.0"
 
 "@growi/preset-themes@link:packages/preset-themes":
-  version "7.0.5-RC.0"
+  version "1.0.0"
 
 "@growi/remark-attachment-refs@link:packages/remark-attachment-refs":
-  version "7.0.5-RC.0"
+  version "1.0.0"
   dependencies:
     "@growi/core" "link:packages/core"
     "@growi/remark-growi-directive" "link:packages/remark-growi-directive"
@@ -1908,10 +1908,10 @@
     universal-bunyan "^0.9.2"
 
 "@growi/remark-drawio@link:packages/remark-drawio":
-  version "7.0.5-RC.0"
+  version "1.0.0"
 
 "@growi/remark-growi-directive@link:packages/remark-growi-directive":
-  version "7.0.5-RC.0"
+  version "0.9.0"
   dependencies:
     "@types/mdast" "^3.0.0"
     "@types/unist" "^2.0.0"
@@ -1928,7 +1928,7 @@
     uvu "^0.5.0"
 
 "@growi/remark-lsx@link:packages/remark-lsx":
-  version "7.0.5-RC.0"
+  version "1.0.0"
   dependencies:
     "@growi/core" "link:packages/core"
     "@growi/remark-growi-directive" "link:packages/remark-growi-directive"
@@ -1940,7 +1940,7 @@
     swr "^2.2.2"
 
 "@growi/slack@link:packages/slack":
-  version "7.0.5-RC.0"
+  version "1.0.0"
   dependencies:
     "@slack/oauth" "^2.0.1"
     "@slack/web-api" "^6.2.4"
@@ -1959,7 +1959,7 @@
     url-join "^4.0.0"
 
 "@growi/ui@link:packages/ui":
-  version "7.0.5-RC.0"
+  version "1.0.0"
 
 "@handsontable/react@=2.1.0":
   version "2.1.0"