Просмотр исходного кода

Revert "Merge branch 'release/current'"

This reverts commit 1d9da8d5a3c066717ec1d28f046ef9d12e070d56, reversing
changes made to 59ea3e1ec2019d6a3147b429018e2355fb08ec3d.
Yuki Takei 2 лет назад
Родитель
Сommit
f2956ff1b1

+ 1 - 17
CHANGELOG.md

@@ -1,25 +1,9 @@
 # Changelog
 # Changelog
 
 
-## [Unreleased](https://github.com/weseek/growi/compare/v6.1.4...HEAD)
+## [Unreleased](https://github.com/weseek/growi/compare/v6.1.3...HEAD)
 
 
 *Please do not manually update this file. We've automated the process.*
 *Please do not manually update this file. We've automated the process.*
 
 
-## [v6.1.4](https://github.com/weseek/growi/compare/v6.1.3...v6.1.4) - 2023-06-12
-
-### 💎 Features
-
-- feat(plugin): Specify repository branch name (#7783) @yuki-takei
-
-### 🚀 Improvement
-
-- imprv: Suppress unnecessary bookmark API requests (#7798) @yuki-takei
-
-### 🐛 Bug Fixes
-
-- fix: Bookmarks mutation for the current user (#7797) @yuki-takei
-- fix: Slack channels data for User Triggered Notification is not loaded (#7794) @yuki-takei
-- fix: The input of the editor is cleared when an attachment is added when a new page editing (#7788) @miya
-
 ## [v6.1.3](https://github.com/weseek/growi/compare/v6.1.2...v6.1.3) - 2023-06-07
 ## [v6.1.3](https://github.com/weseek/growi/compare/v6.1.2...v6.1.3) - 2023-06-07
 
 
 ### 💎 Features
 ### 💎 Features

+ 10 - 10
apps/app/package.json

@@ -64,14 +64,14 @@
     "@elastic/elasticsearch8": "npm:@elastic/elasticsearch@^8.7.0",
     "@elastic/elasticsearch8": "npm:@elastic/elasticsearch@^8.7.0",
     "@godaddy/terminus": "^4.9.0",
     "@godaddy/terminus": "^4.9.0",
     "@google-cloud/storage": "^5.8.5",
     "@google-cloud/storage": "^5.8.5",
-    "@growi/core": "^6.1.4-RC.0",
-    "@growi/hackmd": "^6.1.4-RC.0",
-    "@growi/preset-themes": "^6.1.4-RC.0",
-    "@growi/remark-attachment-refs": "^6.1.4-RC.0",
-    "@growi/remark-drawio": "^6.1.4-RC.0",
-    "@growi/remark-growi-directive": "^6.1.4-RC.0",
-    "@growi/remark-lsx": "^6.1.4-RC.0",
-    "@growi/slack": "^6.1.4-RC.0",
+    "@growi/core": "link:../../packages/core",
+    "@growi/hackmd": "link:../../packages/hackmd",
+    "@growi/preset-themes": "link:../../packages/preset-themes",
+    "@growi/remark-attachment-refs": "link:../../packages/remark-attachment-refs",
+    "@growi/remark-drawio": "link:../../packages/remark-drawio",
+    "@growi/remark-growi-directive": "link:../../packages/remark-growi-directive",
+    "@growi/remark-lsx": "link:../../packages/remark-lsx",
+    "@growi/slack": "link:../../packages/slack",
     "@promster/express": "^7.0.6",
     "@promster/express": "^7.0.6",
     "@promster/server": "^7.0.8",
     "@promster/server": "^7.0.8",
     "@slack/web-api": "^6.2.4",
     "@slack/web-api": "^6.2.4",
@@ -209,8 +209,8 @@
     "handsontable": "v7.0.0 or above is no loger MIT lisence."
     "handsontable": "v7.0.0 or above is no loger MIT lisence."
   },
   },
   "devDependencies": {
   "devDependencies": {
-    "@growi/presentation": "^6.1.4-RC.0",
-    "@growi/ui": "^6.1.4-RC.0",
+    "@growi/presentation": "link:../../packages/presentation",
+    "@growi/ui": "link:../../packages/ui",
     "@handsontable/react": "=2.1.0",
     "@handsontable/react": "=2.1.0",
     "@icon/themify-icons": "1.0.1-alpha.3",
     "@icon/themify-icons": "1.0.1-alpha.3",
     "@next/bundle-analyzer": "^13.2.3",
     "@next/bundle-analyzer": "^13.2.3",

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

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

+ 1 - 1
packages/presentation/package.json

@@ -24,7 +24,7 @@
     "version": "yarn version --no-git-tag-version"
     "version": "yarn version --no-git-tag-version"
   },
   },
   "dependencies": {
   "dependencies": {
-    "@growi/core": "^6.1.4-RC.0"
+    "@growi/core": "link:../core"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "@marp-team/marp-core": "^3.6.0",
     "@marp-team/marp-core": "^3.6.0",

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

@@ -34,10 +34,7 @@
     "@growi/remark-growi-directive": "link:../remark-growi-directive",
     "@growi/remark-growi-directive": "link:../remark-growi-directive",
     "@growi/ui": "link:../ui",
     "@growi/ui": "link:../ui",
     "bunyan": "^1.8.15",
     "bunyan": "^1.8.15",
-    "universal-bunyan": "^0.9.2",
-    "@growi/core": "^6.1.4-RC.0",
-    "@growi/remark-growi-directive": "^6.1.4-RC.0",
-    "@growi/ui": "^6.1.4-RC.0"
+    "universal-bunyan": "^0.9.2"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "eslint-plugin-regex": "^1.8.0",
     "eslint-plugin-regex": "^1.8.0",

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

@@ -32,9 +32,9 @@
     "escape-string-regexp": "5.0.0 or above exports only ESM"
     "escape-string-regexp": "5.0.0 or above exports only ESM"
   },
   },
   "dependencies": {
   "dependencies": {
-    "@growi/core": "^6.1.4-RC.0",
-    "@growi/remark-growi-directive": "^6.1.4-RC.0",
-    "@growi/ui": "^6.1.4-RC.0",
+    "@growi/core": "link:../core",
+    "@growi/remark-growi-directive": "link:../remark-growi-directive",
+    "@growi/ui": "link:../ui",
     "escape-string-regexp": "^4.0.0",
     "escape-string-regexp": "^4.0.0",
     "express": "^4.16.1",
     "express": "^4.16.1",
     "mongoose": "^6.5.0",
     "mongoose": "^6.5.0",

+ 1 - 1
packages/ui/package.json

@@ -21,7 +21,7 @@
     "version": "yarn version --no-git-tag-version"
     "version": "yarn version --no-git-tag-version"
   },
   },
   "dependencies": {
   "dependencies": {
-    "@growi/core": "^6.1.4-RC.0"
+    "@growi/core": "link:../core"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "react": "^18.2.0"
     "react": "^18.2.0"