From 72e1175e145097babbcfd1a2717c02a495781766 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sun, 26 Nov 2023 23:35:30 +0700 Subject: [PATCH] Test upgrade 0.73.1 --- conf/app.src | 4 +-- doc/DISCLAIMER.md | 2 +- manifest.json | 2 +- scripts/_common.sh | 2 +- sources/patches/app-01-email.patch | 4 +-- sources/patches/app-02-visitor.patch | 12 ++++---- sources/patches/app-03-login.patch | 6 ++-- sources/patches/app-04-bible.patch | 20 ++++++------- sources/patches/diff.txt | 42 ++++++++++++++-------------- 9 files changed, 47 insertions(+), 47 deletions(-) diff --git a/conf/app.src b/conf/app.src index 56fc129..f078cf2 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/outline/outline/archive/3212d37ca5e6e061d454e10779a2ab03838cb8f3.zip -SOURCE_SUM=30feb816c69c5725508a8845feefb84a690fa46e88853aaa303460d9da0e998c +SOURCE_URL=https://github.com/outline/outline/archive/a21e1d9feab996dd1402be856b562e9453473b2e.zip +SOURCE_SUM=a346feb2b63104798f6929874901335103d98ed8a39737fe7882d7c9922b4894 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index dcf6239..8508257 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,7 +1,7 @@ ### Not totally free licence Outline is a softwared licenced under [BUSL 1.1 licence](https://spdx.org/licenses/BUSL-1.1.html). ⚠️ That licence **is not totally free**. Please read it very carefully if you have any commercial use in mind. -The Outline version shipped with this package (v0.72.2) will be released under Apache-2.0 licence [after August 18th 2027](https://github.com/outline/outline/blob/ebeb201a9f48e2c6b619a0d152e051946849aa10/LICENSE). +The Outline version shipped with this package (v0.73.1) will be released under Apache-2.0 licence [after August 18th 2027](https://github.com/outline/outline/blob/ebeb201a9f48e2c6b619a0d152e051946849aa10/LICENSE). ### Known limitations diff --git a/manifest.json b/manifest.json index db867df..4e0c489 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Wiki and knowledge base for teams", "fr": "Wiki et base de connaissances pour les équipes" }, - "version": "0.72.2~ynh1", + "version": "0.73.1~ynh1", "url": "www.getoutline.com", "upstream": { "license": "BUSL-1.1", diff --git a/scripts/_common.sh b/scripts/_common.sh index 11978d9..ca18ef8 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app pkg_dependencies="postgresql" -NODEJS_VERSION=18 +NODEJS_VERSION=20 #================================================= # PERSONAL HELPERS diff --git a/sources/patches/app-01-email.patch b/sources/patches/app-01-email.patch index 4d60e9a..2713e6f 100644 --- a/sources/patches/app-01-email.patch +++ b/sources/patches/app-01-email.patch @@ -1,8 +1,8 @@ diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx -index 4d4f6f09c..f457025d5 100644 +index f53e44b6b..bcf56efca 100644 --- a/server/emails/mailer.tsx +++ b/server/emails/mailer.tsx -@@ -208,6 +208,7 @@ export class Mailer { +@@ -207,6 +207,7 @@ export class Mailer { : { rejectUnauthorized: false, }, diff --git a/sources/patches/app-02-visitor.patch b/sources/patches/app-02-visitor.patch index 42aa365..c5b940c 100644 --- a/sources/patches/app-02-visitor.patch +++ b/sources/patches/app-02-visitor.patch @@ -1,11 +1,11 @@ diff --git a/package.json b/package.json -index b33348a07..24a4af6f2 100644 +index 22aafec21..7abdd9a97 100644 --- a/package.json +++ b/package.json -@@ -157,6 +157,7 @@ - "patch-package": "^7.0.2", +@@ -158,6 +158,7 @@ "pg": "^8.11.1", "pg-tsquery": "^8.4.1", + "pluralize": "^8.0.0", + "passport-req": "^0.1.1", "polished": "^4.2.2", "prosemirror-codemark": "^0.4.2", @@ -106,10 +106,10 @@ index 000000000..bc03fc6d3 + +export default router; diff --git a/yarn.lock b/yarn.lock -index 2db13c657..2dbdf3907 100644 +index 55f386865..74c7e8adc 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -10340,6 +10340,14 @@ passport-oauth@1.0.x: +@@ -10378,6 +10378,14 @@ passport-oauth@1.0.x: passport-oauth1 "1.x.x" passport-oauth2 "1.x.x" @@ -124,7 +124,7 @@ index 2db13c657..2dbdf3907 100644 passport-slack-oauth2@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/passport-slack-oauth2/-/passport-slack-oauth2-1.2.0.tgz#d214a698b55a137393636a26827747f6c436dab4" -@@ -10361,6 +10369,14 @@ passport@^0.6.0: +@@ -10399,6 +10407,14 @@ passport@^0.6.0: pause "0.0.1" utils-merge "^1.0.1" diff --git a/sources/patches/app-03-login.patch b/sources/patches/app-03-login.patch index 4ed113a..589f4f4 100644 --- a/sources/patches/app-03-login.patch +++ b/sources/patches/app-03-login.patch @@ -36,10 +36,10 @@ index af218c06c..b2d93d994 100644 })} diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx -index de4245890..c751e3299 100644 +index 57f82919c..65efc59c9 100644 --- a/app/scenes/Login/index.tsx +++ b/app/scenes/Login/index.tsx -@@ -255,7 +255,7 @@ function Login({ children }: Props) { +@@ -257,7 +257,7 @@ function Login({ children }: Props) { ) : ( <> @@ -48,7 +48,7 @@ index de4245890..c751e3299 100644 authProviderName: config.name || env.APP_NAME, })} -@@ -273,7 +273,7 @@ function Login({ children }: Props) { +@@ -275,7 +275,7 @@ function Login({ children }: Props) { {hasMultipleProviders && ( <> diff --git a/sources/patches/app-04-bible.patch b/sources/patches/app-04-bible.patch index 74c95b0..8b01453 100644 --- a/sources/patches/app-04-bible.patch +++ b/sources/patches/app-04-bible.patch @@ -1,8 +1,8 @@ diff --git a/app/editor/menus/block.tsx b/app/editor/menus/block.tsx -index f795fc56d..a4dc4e17a 100644 +index 301c2610d..1e6917bd8 100644 --- a/app/editor/menus/block.tsx +++ b/app/editor/menus/block.tsx -@@ -21,6 +21,7 @@ import { +@@ -20,6 +20,7 @@ import { MathIcon, DoneIcon, EmbedIcon, @@ -10,7 +10,7 @@ index f795fc56d..a4dc4e17a 100644 } from "outline-icons"; import * as React from "react"; import styled from "styled-components"; -@@ -203,6 +204,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] { +@@ -195,6 +196,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] { keywords: "notice card suggestion", attrs: { style: "tip" }, }, @@ -25,10 +25,10 @@ index f795fc56d..a4dc4e17a 100644 name: "separator", }, diff --git a/app/hooks/useDictionary.ts b/app/hooks/useDictionary.ts -index 6472c88cc..8bedb092d 100644 +index 6e9f9c383..8791bddb7 100644 --- a/app/hooks/useDictionary.ts +++ b/app/hooks/useDictionary.ts -@@ -78,6 +78,8 @@ export default function useDictionary() { +@@ -76,6 +76,8 @@ export default function useDictionary() { warningNotice: t("Warning notice"), success: t("Success"), successNotice: t("Success notice"), @@ -38,10 +38,10 @@ index 6472c88cc..8bedb092d 100644 insertTime: t("Current time"), insertDateTime: t("Current date and time"), diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx -index 8e3542d40..8a7c461af 100644 +index 9eb541af1..d2c2e5a24 100644 --- a/app/scenes/Document/components/Document.tsx +++ b/app/scenes/Document/components/Document.tsx -@@ -552,11 +552,6 @@ class DocumentScene extends React.Component { +@@ -556,11 +556,6 @@ class DocumentScene extends React.Component { @@ -67,10 +67,10 @@ index f30b74449..406e1fcde 100644 interface Colors { diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts -index a1f818892..df3d469df 100644 +index b8410e53d..f0559b5d0 100644 --- a/shared/editor/components/Styles.ts +++ b/shared/editor/components/Styles.ts -@@ -865,6 +865,20 @@ h6 { +@@ -866,6 +866,20 @@ h6 { } } @@ -121,7 +121,7 @@ index bd976e69b..9ee40b8d5 100644 component = ; } diff --git a/shared/styles/theme.ts b/shared/styles/theme.ts -index f76e9c6a2..05d78850a 100644 +index 40a9bbd62..47dce4316 100644 --- a/shared/styles/theme.ts +++ b/shared/styles/theme.ts @@ -32,6 +32,7 @@ const defaultColors: Colors = { diff --git a/sources/patches/diff.txt b/sources/patches/diff.txt index 991f0f4..1fa7de0 100644 --- a/sources/patches/diff.txt +++ b/sources/patches/diff.txt @@ -15,10 +15,10 @@ index bb7f29ce7..70db50bcd 100644 ); } diff --git a/app/editor/menus/block.tsx b/app/editor/menus/block.tsx -index f795fc56d..a4dc4e17a 100644 +index 301c2610d..1e6917bd8 100644 --- a/app/editor/menus/block.tsx +++ b/app/editor/menus/block.tsx -@@ -21,6 +21,7 @@ import { +@@ -20,6 +20,7 @@ import { MathIcon, DoneIcon, EmbedIcon, @@ -26,7 +26,7 @@ index f795fc56d..a4dc4e17a 100644 } from "outline-icons"; import * as React from "react"; import styled from "styled-components"; -@@ -203,6 +204,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] { +@@ -195,6 +196,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] { keywords: "notice card suggestion", attrs: { style: "tip" }, }, @@ -41,10 +41,10 @@ index f795fc56d..a4dc4e17a 100644 name: "separator", }, diff --git a/app/hooks/useDictionary.ts b/app/hooks/useDictionary.ts -index 6472c88cc..8bedb092d 100644 +index 6e9f9c383..8791bddb7 100644 --- a/app/hooks/useDictionary.ts +++ b/app/hooks/useDictionary.ts -@@ -78,6 +78,8 @@ export default function useDictionary() { +@@ -76,6 +76,8 @@ export default function useDictionary() { warningNotice: t("Warning notice"), success: t("Success"), successNotice: t("Success notice"), @@ -54,10 +54,10 @@ index 6472c88cc..8bedb092d 100644 insertTime: t("Current time"), insertDateTime: t("Current date and time"), diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx -index 8e3542d40..8a7c461af 100644 +index 9eb541af1..d2c2e5a24 100644 --- a/app/scenes/Document/components/Document.tsx +++ b/app/scenes/Document/components/Document.tsx -@@ -552,11 +552,6 @@ class DocumentScene extends React.Component { +@@ -556,11 +556,6 @@ class DocumentScene extends React.Component { @@ -107,10 +107,10 @@ index af218c06c..b2d93d994 100644 })} diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx -index de4245890..c751e3299 100644 +index 57f82919c..65efc59c9 100644 --- a/app/scenes/Login/index.tsx +++ b/app/scenes/Login/index.tsx -@@ -255,7 +255,7 @@ function Login({ children }: Props) { +@@ -257,7 +257,7 @@ function Login({ children }: Props) { ) : ( <> @@ -119,7 +119,7 @@ index de4245890..c751e3299 100644 authProviderName: config.name || env.APP_NAME, })} -@@ -273,7 +273,7 @@ function Login({ children }: Props) { +@@ -275,7 +275,7 @@ function Login({ children }: Props) { {hasMultipleProviders && ( <> @@ -142,13 +142,13 @@ index f30b74449..406e1fcde 100644 interface Colors { diff --git a/package.json b/package.json -index b33348a07..24a4af6f2 100644 +index 22aafec21..7abdd9a97 100644 --- a/package.json +++ b/package.json -@@ -157,6 +157,7 @@ - "patch-package": "^7.0.2", +@@ -158,6 +158,7 @@ "pg": "^8.11.1", "pg-tsquery": "^8.4.1", + "pluralize": "^8.0.0", + "passport-req": "^0.1.1", "polished": "^4.2.2", "prosemirror-codemark": "^0.4.2", @@ -250,10 +250,10 @@ index 000000000..bc03fc6d3 +export default router; \ No newline at end of file diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx -index 4d4f6f09c..f457025d5 100644 +index f53e44b6b..bcf56efca 100644 --- a/server/emails/mailer.tsx +++ b/server/emails/mailer.tsx -@@ -208,6 +208,7 @@ export class Mailer { +@@ -207,6 +207,7 @@ export class Mailer { : { rejectUnauthorized: false, }, @@ -262,10 +262,10 @@ index 4d4f6f09c..f457025d5 100644 } diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts -index a1f818892..df3d469df 100644 +index b8410e53d..f0559b5d0 100644 --- a/shared/editor/components/Styles.ts +++ b/shared/editor/components/Styles.ts -@@ -865,6 +865,20 @@ h6 { +@@ -866,6 +866,20 @@ h6 { } } @@ -316,7 +316,7 @@ index bd976e69b..9ee40b8d5 100644 component = ; } diff --git a/shared/styles/theme.ts b/shared/styles/theme.ts -index f76e9c6a2..05d78850a 100644 +index 40a9bbd62..47dce4316 100644 --- a/shared/styles/theme.ts +++ b/shared/styles/theme.ts @@ -32,6 +32,7 @@ const defaultColors: Colors = { @@ -345,10 +345,10 @@ index f76e9c6a2..05d78850a 100644 scrollbarBackground: colors.black, scrollbarThumb: colors.lightBlack, diff --git a/yarn.lock b/yarn.lock -index 2db13c657..2dbdf3907 100644 +index 55f386865..74c7e8adc 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -10340,6 +10340,14 @@ passport-oauth@1.0.x: +@@ -10378,6 +10378,14 @@ passport-oauth@1.0.x: passport-oauth1 "1.x.x" passport-oauth2 "1.x.x" @@ -363,7 +363,7 @@ index 2db13c657..2dbdf3907 100644 passport-slack-oauth2@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/passport-slack-oauth2/-/passport-slack-oauth2-1.2.0.tgz#d214a698b55a137393636a26827747f6c436dab4" -@@ -10361,6 +10369,14 @@ passport@^0.6.0: +@@ -10399,6 +10407,14 @@ passport@^0.6.0: pause "0.0.1" utils-merge "^1.0.1"