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

Merge branch 'support/apply-nextjs-2' into support/create-UsersHomePageFooter-integrate

jam411 3 лет назад
Родитель
Сommit
b747ccd047

+ 2 - 1
packages/app/src/pages/[[...path]].page.tsx

@@ -198,7 +198,6 @@ const GrowiPage: NextPage<Props> = (props: Props) => {
   useIsNotFound(props.isNotFound);
   useIsNotFound(props.isNotFound);
   useIsNotCreatable(props.IsNotCreatable);
   useIsNotCreatable(props.IsNotCreatable);
   useRedirectFrom(props.redirectFrom);
   useRedirectFrom(props.redirectFrom);
-  // useIsTrashPage(_isTrashPage(props.currentPagePath));
   // useShared();
   // useShared();
   // useShareLinkId(props.shareLinkId);
   // useShareLinkId(props.shareLinkId);
   useIsSharedUser(false); // this page cann't be routed for '/share'
   useIsSharedUser(false); // this page cann't be routed for '/share'
@@ -247,6 +246,8 @@ const GrowiPage: NextPage<Props> = (props: Props) => {
   useCurrentPagePath(pagePath);
   useCurrentPagePath(pagePath);
   useCurrentPathname(props.currentPathname);
   useCurrentPathname(props.currentPathname);
   useEditingMarkdown(pageWithMeta?.data.revision?.body);
   useEditingMarkdown(pageWithMeta?.data.revision?.body);
+  useIsTrashPage(_isTrashPage(pagePath));
+
   const { data: grantData } = useSWRxIsGrantNormalized(pageId);
   const { data: grantData } = useSWRxIsGrantNormalized(pageId);
   const { mutate: mutateSelectedGrant } = useSelectedGrant();
   const { mutate: mutateSelectedGrant } = useSelectedGrant();
 
 

+ 2 - 2
packages/plugin-lsx/package.json

@@ -28,8 +28,8 @@
     "test": ""
     "test": ""
   },
   },
   "dependencies": {
   "dependencies": {
-    "@growi/core": "^5.1.4-RC.0",
-    "@growi/remark-growi-plugin": "^5.1.4-RC.0"
+    "@growi/core": "^5.1.5-RC.0",
+    "@growi/remark-growi-plugin": "^5.1.5-RC.0"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "eslint-plugin-regex": "^1.8.0",
     "eslint-plugin-regex": "^1.8.0",

+ 1 - 1
packages/remark-growi-plugin/package.json

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

+ 1 - 1
packages/ui/package.json

@@ -21,7 +21,7 @@
     "test": "jest --verbose"
     "test": "jest --verbose"
   },
   },
   "dependencies": {
   "dependencies": {
-    "@growi/core": "^5.1.4-RC.0"
+    "@growi/core": "^5.1.5-RC.0"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "eslint-plugin-regex": "^1.8.0",
     "eslint-plugin-regex": "^1.8.0",