Merge branch 'feat/display-plugin-cards-dynamically' into feat/110849-update-error-handling

lerna.json

@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "6.0.0-RC.13",
+  "version": "6.0.0-RC.14",
   "packages": [
     "packages/*"
   ]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "growi",
-  "version": "6.0.0-RC.13",
+  "version": "6.0.0-RC.14",
   "description": "Team collaboration software using markdown",
   "tags": [
     "wiki",

packages/app/docker/Dockerfile

@@ -125,6 +125,7 @@ RUN tar -cf packages.tar \
   packages/app/resource \
   packages/app/tmp \
   packages/app/.env.production* \
+  packages/app/next.config.js \
   packages/*/package.json \
   packages/*/dist
 

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@growi/app",
-  "version": "6.0.0-RC.13",
+  "version": "6.0.0-RC.14",
   "license": "MIT",
   "scripts": {
     "//// for production": "",
@@ -65,14 +65,14 @@
     "@elastic/elasticsearch7": "npm:@elastic/elasticsearch@^7.17.0",
     "@godaddy/terminus": "^4.9.0",
     "@google-cloud/storage": "^5.8.5",
-    "@growi/codemirror-textlint": "^6.0.0-RC.13",
-    "@growi/core": "^6.0.0-RC.13",
-    "@growi/hackmd": "^6.0.0-RC.13",
-    "@growi/preset-themes": "^6.0.0-RC.13",
-    "@growi/remark-drawio": "^6.0.0-RC.13",
-    "@growi/remark-growi-directive": "^6.0.0-RC.13",
-    "@growi/remark-lsx": "^6.0.0-RC.13",
-    "@growi/slack": "^6.0.0-RC.13",
+    "@growi/codemirror-textlint": "^6.0.0-RC.14",
+    "@growi/core": "^6.0.0-RC.14",
+    "@growi/hackmd": "^6.0.0-RC.14",
+    "@growi/preset-themes": "^6.0.0-RC.14",
+    "@growi/remark-drawio": "^6.0.0-RC.14",
+    "@growi/remark-growi-directive": "^6.0.0-RC.14",
+    "@growi/remark-lsx": "^6.0.0-RC.14",
+    "@growi/slack": "^6.0.0-RC.14",
     "@promster/express": "^7.0.2",
     "@promster/server": "^7.0.4",
     "@slack/web-api": "^6.2.4",
@@ -201,7 +201,7 @@
     "handsontable": "v7.0.0 or above is no loger MIT lisence."
   },
   "devDependencies": {
-    "@growi/ui": "^6.0.0-RC.13",
+    "@growi/ui": "^6.0.0-RC.14",
     "@handsontable/react": "=2.1.0",
     "@icon/themify-icons": "1.0.1-alpha.3",
     "@next/bundle-analyzer": "^12.2.3",

packages/app/src/server/models/growi-plugin.ts

@@ -14,7 +14,6 @@ export interface GrowiPluginDocument extends GrowiPlugin, Document {
 export interface GrowiPluginModel extends Model<GrowiPluginDocument> {
   findEnabledPlugins(): Promise<GrowiPlugin[]>
   findEnabledPluginsIncludingAnyTypes(includingTypes: GrowiPluginResourceType[]): Promise<GrowiPlugin[]>
-  findPlugins(): Promise<GrowiPlugin[]>
   activatePlugin(id: Types.ObjectId): Promise<string>
   deactivatePlugin(id: Types.ObjectId): Promise<string>
 }
@@ -69,10 +68,6 @@ growiPluginSchema.statics.findEnabledPluginsIncludingAnyTypes = async function(t
   });
 };
 
-growiPluginSchema.statics.findPlugins = async function(): Promise<GrowiPlugin[]> {
-  return this.find({});
-};
-
 growiPluginSchema.statics.activatePlugin = async function(id: Types.ObjectId): Promise<string> {
   const growiPlugin = await this.findOneAndUpdate({ _id: id }, { isEnabled: true });
   if (growiPlugin == null) {

packages/app/src/server/routes/apiv3/plugins.ts

@@ -35,7 +35,7 @@ module.exports = (crowi: Crowi): Router => {
 
     try {
       const GrowiPluginModel = mongoose.model('GrowiPlugin') as GrowiPluginModel;
-      const data = await GrowiPluginModel.findPlugins();
+      const data = await GrowiPluginModel.find({});
       return res.apiv3({ plugins: data });
     }
     catch (err) {

packages/codemirror-textlint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@growi/codemirror-textlint",
-  "version": "6.0.0-RC.13",
+  "version": "6.0.0-RC.14",
   "license": "MIT",
   "main": "dist/index.js",
   "scripts": {

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@growi/core",
-  "version": "6.0.0-RC.13",
+  "version": "6.0.0-RC.14",
   "description": "GROWI Core Libraries",
   "license": "MIT",
   "keywords": [

packages/hackmd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@growi/hackmd",
-  "version": "6.0.0-RC.13",
+  "version": "6.0.0-RC.14",
   "description": "GROWI js and css files to use hackmd",
   "license": "MIT",
   "main": "dist/index.js",

packages/preset-themes/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@growi/preset-themes",
   "description": "GROWI preset themes",
-  "version": "6.0.0-RC.13",
+  "version": "6.0.0-RC.14",
   "license": "MIT",
   "main": "dist/libs/index.js",
   "files": [

packages/remark-drawio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@growi/remark-drawio",
-  "version": "6.0.0-RC.13",
+  "version": "6.0.0-RC.14",
   "description": "remark plugin to draw diagrams with draw.io (diagrams.net)",
   "license": "MIT",
   "keywords": [

packages/remark-growi-directive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@growi/remark-growi-directive",
-  "version": "6.0.0-RC.13",
+  "version": "6.0.0-RC.14",
   "description": "remark plugin to support GROWI plugin (forked from remark-directive@2.0.1)",
   "license": "MIT",
   "keywords": [

packages/remark-lsx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@growi/remark-lsx",
-  "version": "6.0.0-RC.13",
+  "version": "6.0.0-RC.14",
   "description": "GROWI plugin to list pages",
   "license": "MIT",
   "keywords": ["growi", "growi-plugin"],
@@ -23,9 +23,9 @@
     "test": ""
   },
   "dependencies": {
-    "@growi/core": "^6.0.0-RC.13",
-    "@growi/remark-growi-directive": "^6.0.0-RC.13",
-    "@growi/ui": "^6.0.0-RC.13",
+    "@growi/core": "^6.0.0-RC.14",
+    "@growi/remark-growi-directive": "^6.0.0-RC.14",
+    "@growi/ui": "^6.0.0-RC.14",
     "swr": "^1.3.0"
   },
   "devDependencies": {

packages/slack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@growi/slack",
-  "version": "6.0.0-RC.13",
+  "version": "6.0.0-RC.14",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

packages/slackbot-proxy/package.json

@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@godaddy/terminus": "^4.9.0",
-    "@growi/slack": "^6.0.0-RC.13",
+    "@growi/slack": "^6.0.0-RC.14",
     "@slack/oauth": "^2.0.1",
     "@slack/web-api": "^6.2.4",
     "@tsed/common": "^6.43.0",

packages/ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@growi/ui",
-  "version": "6.0.0-RC.13",
+  "version": "6.0.0-RC.14",
   "description": "GROWI UI Libraries",
   "license": "MIT",
   "keywords": ["growi"],
@@ -17,7 +17,7 @@
     "test": "jest --verbose"
   },
   "dependencies": {
-    "@growi/core": "^6.0.0-RC.13"
+    "@growi/core": "^6.0.0-RC.14"
   },
   "devDependencies": {
     "eslint-plugin-regex": "^1.8.0",