From 226780c0892fcabe63ff48676fba87d7756ac8dd Mon Sep 17 00:00:00 2001 From: MiroslavDionisiev Date: Mon, 18 Nov 2024 10:31:23 +0200 Subject: [PATCH 01/36] feat: [UEPR-48] redesign welcome section --- src/_colors.scss | 4 + src/components/welcome/welcome.jsx | 78 +++++++--------- src/components/welcome/welcome.scss | 98 +++++++------------- src/views/splash/l10n.json | 6 +- src/views/splash/presentation.jsx | 6 +- src/views/splash/splash.scss | 5 + static/images/create_a_project.svg | 46 +++++++++ static/images/explore_starter_projects.svg | 35 +++++++ static/images/learn_about_the_community.svg | 37 ++++++++ static/images/welcome-connect.png | Bin 16577 -> 0 bytes static/images/welcome-learn.png | Bin 4497 -> 0 bytes static/images/welcome-try.png | Bin 26671 -> 0 bytes 12 files changed, 201 insertions(+), 114 deletions(-) create mode 100644 static/images/create_a_project.svg create mode 100644 static/images/explore_starter_projects.svg create mode 100644 static/images/learn_about_the_community.svg delete mode 100644 static/images/welcome-connect.png delete mode 100644 static/images/welcome-learn.png delete mode 100644 static/images/welcome-try.png diff --git a/src/_colors.scss b/src/_colors.scss index ad8b3a916..253753914 100644 --- a/src/_colors.scss +++ b/src/_colors.scss @@ -25,6 +25,9 @@ $background-color: hsla(0, 0%, 99%, 1); //#FDFDFD $motion-blue-3: hsla(215, 60%, 50%, 1);//#3373CC +$ui-light-blue: hsla(195, 63%, 86%, 1); +$ui-cyan-blue: hsla(194, 73%, 36%, 1); + /* UI Secondary Colors */ /* 3.0 colors */ /* Using www naming convention for now, should be consistent with gui */ @@ -48,6 +51,7 @@ $ui-light-primary: hsl(215, 100%, 95%); $ui-light-primary-transparent: hsla(215, 100%, 95%, 0); $ui-border: hsla(0, 0%, 85%, 1); //#D9D9D9 +$ui-border-light-blue: hsla(215, 50%, 90%, 1); //##D9E3F2 /* modals */ $ui-mint-green: hsl(163, 69%, 44%); diff --git a/src/components/welcome/welcome.jsx b/src/components/welcome/welcome.jsx index 1606a229c..fcb8f1f6c 100644 --- a/src/components/welcome/welcome.jsx +++ b/src/components/welcome/welcome.jsx @@ -18,54 +18,42 @@ const Welcome = props => ( moreTitle="x" title={props.messages['welcome.welcomeToScratch']} > -
-

- - {props.messages['welcome.learn']} - -

+
+ {props.messages['welcome.explore']} + Starter Projects + + + {props.messages['welcome.community']} + Community Guidelines + + + {props.messages['welcome.create']} Get Started - -
-
-

- - {props.messages['welcome.tryOut']} - -

- - Starter Projects - -
-
-

- - {props.messages['welcome.connect']} - -

- - Connect
@@ -75,9 +63,9 @@ const Welcome = props => ( Welcome.propTypes = { messages: PropTypes.shape({ 'welcome.welcomeToScratch': PropTypes.string, - 'welcome.learn': PropTypes.string, - 'welcome.tryOut': PropTypes.string, - 'welcome.connect': PropTypes.string + 'welcome.explore': PropTypes.string, + 'welcome.community': PropTypes.string, + 'welcome.create': PropTypes.string }), onDismiss: PropTypes.func, permissions: PropTypes.object, @@ -87,9 +75,9 @@ Welcome.propTypes = { Welcome.defaultProps = { messages: { 'welcome.welcomeToScratch': 'Welcome to Scratch!', - 'welcome.learn': 'Learn how to make a project in Scratch', - 'welcome.tryOut': 'Try out starter projects', - 'welcome.connect': 'Connect with other Scratchers' + 'welcome.explore': 'Explore Starter Projects', + 'welcome.community': 'Learn about the community', + 'welcome.create': 'Create a Project' } }; diff --git a/src/components/welcome/welcome.scss b/src/components/welcome/welcome.scss index 230653382..15c358d10 100644 --- a/src/components/welcome/welcome.scss +++ b/src/components/welcome/welcome.scss @@ -2,76 +2,48 @@ .welcome { .box-content { + display: flex ; + flex-direction: column; + justify-content: center; + align-items: center; + flex: 1 1 100%; + padding: 0; - } - .welcome-col { - display: inline-block; - margin: 10px 15px; - width: 150px; - height: 253px; - - h4 { - margin-top: 12px; - padding: 0; - font-weight: 200; - } - - > a { - display: block; - margin-top: 20px; - margin-bottom: 35px; - height: 100px; - } - - $color-bars: "h4:before, > a:after"; - - #{$color-bars} { - display: block; - margin: 10px 0; - border-radius: 5px; + .welcome-banner { width: 100%; - height: 10px; - content: ""; + font-size: 0.875rem; + font-weight: 500; + line-height: 1.125rem; + text-align: center; + color: $ui-cyan-blue; + background-color: $ui-light-blue; + padding: 0.625rem 0; } - img { - display: block; - max-width: 133px; - max-height: 100px; - } + .welcome-options { + display: flex; + justify-content: center; + align-items: center; + gap: 1rem; + flex-wrap: wrap; - &.blue { - #{$color-bars} { - background-color: $ui-blue; - } + padding: 1.5rem 0; - a { - color: $ui-blue; - } - - img { - margin-left: 4px; - } - } - - &.green { - #{$color-bars} { - background-color: $ui-aqua; - } - - a { - color: $ui-aqua; - } - } - - &.pink { - #{$color-bars} { - background-color: $ui-purple; - } - - a { - color: $ui-purple; + .welcome-option-button { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + gap: 1rem; + + width: 10rem; + height: 13rem; + + border: 1px solid $ui-border-light-blue; + border-radius: 20px; + + text-align: center; } } } diff --git a/src/views/splash/l10n.json b/src/views/splash/l10n.json index 79bc1e3bc..bd897708a 100644 --- a/src/views/splash/l10n.json +++ b/src/views/splash/l10n.json @@ -51,9 +51,9 @@ "hocbanner.animateACharacter": "Animate a Character", "welcome.welcomeToScratch": "Welcome to Scratch!", - "welcome.learn": "Learn how to make a project in Scratch", - "welcome.tryOut": "Try out starter projects", - "welcome.connect": "Connect with other Scratchers", + "welcome.explore": "Explore Starter Projects", + "welcome.community": "Learn about the community", + "welcome.create": "Create a Project", "activity.seeUpdates": "This is where you will see updates from Scratchers you follow", "activity.checkOutScratchers": "Check out some Scratchers you might like to follow", diff --git a/src/views/splash/presentation.jsx b/src/views/splash/presentation.jsx index 90296fe91..a1bb9af60 100644 --- a/src/views/splash/presentation.jsx +++ b/src/views/splash/presentation.jsx @@ -335,9 +335,9 @@ class SplashPresentation extends React.Component { // eslint-disable-line react/ 'general.viewAll': formatMessage({id: 'general.viewAll'}), 'news.scratchNews': formatMessage({id: 'news.scratchNews'}), 'welcome.welcomeToScratch': formatMessage({id: 'welcome.welcomeToScratch'}), - 'welcome.learn': formatMessage({id: 'welcome.learn'}), - 'welcome.tryOut': formatMessage({id: 'welcome.tryOut'}), - 'welcome.connect': formatMessage({id: 'welcome.connect'}), + 'welcome.explore': formatMessage({id: 'welcome.explore'}), + 'welcome.community': formatMessage({id: 'welcome.community'}), + 'welcome.create': formatMessage({id: 'welcome.create'}), 'intro.aboutScratch': formatMessage({id: 'intro.aboutScratch'}), 'intro.forEducators': formatMessage({id: 'intro.forEducators'}), 'intro.forParents': formatMessage({id: 'intro.forParents'}), diff --git a/src/views/splash/splash.scss b/src/views/splash/splash.scss index 647258bd1..89a54e827 100644 --- a/src/views/splash/splash.scss +++ b/src/views/splash/splash.scss @@ -33,6 +33,11 @@ } } + .box.welcome { + display: flex; + flex-direction: column; + } + .news { width: 40%; diff --git a/static/images/create_a_project.svg b/static/images/create_a_project.svg new file mode 100644 index 000000000..737df13ae --- /dev/null +++ b/static/images/create_a_project.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/explore_starter_projects.svg b/static/images/explore_starter_projects.svg new file mode 100644 index 000000000..0fee9d267 --- /dev/null +++ b/static/images/explore_starter_projects.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/learn_about_the_community.svg b/static/images/learn_about_the_community.svg new file mode 100644 index 000000000..7a230cd87 --- /dev/null +++ b/static/images/learn_about_the_community.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/welcome-connect.png b/static/images/welcome-connect.png deleted file mode 100644 index 2ff63822d5aaa025f5d1619ffddaae8e410f3907..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16577 zcmaL9W0WRAvo6|r+s3q}J#E{z?Vh&zwr$&(wr$(CZBE0cT0?=*%6`*)p8-I4!SU^|IwI4J{7om>qZ zOh5#Ufrci8k~RirCQ2p-#_slGCOjY@;KUXx8crIrGF(PL8#;skVCdXz?EYzkfbj6U z*%=sFnK%&|nwVMG@)BQn^biwT81oXVv&u5a+6kMOTS#~~m?(S5sTg@!8F3mD^Yan% zxN-d>urYBmAat{_wsquk<0bwtUao)j|JUPybg4Hg^Aq*4FWVH`Bicqjxi~qi3XJ_)kdx4V0Dr|A*Sx z{2#QVlak5*_4ogi*ipsZ&V*jc#1ZK1VDzu!On?2ylpU9_gNcC?&_M+VwEpi_R4@lR z0UgbOc7(#ptc0=#Mi#dJk^c)XE6XKm>*!=)Yh)rR!b|**fzHChn2UphgGGpqNraP) zft8U_l!-%xoq>~sfq_L#R7_AvPTd*K@k<8IgE`sa45G3ZiQspibDPR4w2DkwAR}OY*;jyKn8j z?;6|9njJ#L!*+L3Xps6ldN5aH%>-jjpF&>gwtzC@_kUBV*I;RyzYh17F5Ir%#+@ z6AZ$}^s_y>@YVr?6p}LSg?vwUC)D>ny#CDS?QFpcq~|B zNPYYusq5Qe4#->Np@q2IKUi>t_Uz;03YsEZMG)Ic35sd4_kx(c6n+a7a>NwXxx~_2 zM12ewzU@V7K5vvG^*XZtW2-)mPrsI2ILVCb$2fmjcrqi3arKifH4nE=7%`u??9!yu z<#NH3__%NMqL*lLRUt`4r2Bq8c5OnpG2{}z2tm(?GtA4L^l56I1_1(sKt;l~?+L>*!a@qzq$Wbt%3>lW0w|4eSkU1E@o!V?dQLrG z+8aH`elPd&4F%Twud+Gt(-f`6-(eoW^E(?oT5NmOcxEf*$9N!>3qQ{*WXJTw)s^$5 z;K~o2i(Y*9qLW(2=G&46D4Xm%lf=1^}oUf?GFGYy& zrP+E*5#taYsKn`{=$c&2kYDGxBG+ZVNOt^Vk-dY!414rw zrf^fe5vcd&0ty_o)nC=?cPU(MahSn6P2!x{&m#khF|X}jm>&jFl5YKdvCqJMMxH*# z&R%C7g`}ZsJdG)g-7VPh+~T49k3CHFDe{pisdihP{@BsM(x^OF1i23jaR_3#2)~iG zkl~nopHnlR>ffM!bcyziomghCfD)uvn=eE;01V8YNYLfFn_ccSaA?D?hqB_*TR`Me zL^Wsi?M&b`qO9jRx;1V2#1(H<4?kH0Z~y_~JFlH8z(9Ex;)aaXJ11x2TsHu>cM8I(2{j0uG5BSaO3 zAp9;sQ3<;4I!-xy=66N#{dCo~+G~ldo>)p_R7_BS4-XyuJhJ&Nqean_Q@UVQ!K^3R z!@#cIPAE4IonGz-HS8-Ga|>nucs(RKoqjk_CD$%NkJBUAR^=fSr`2}_rf6&9$S*FV zBT}0FSs2_EqT%|E7r~EiNyHMEqw`|`8wdc6AqJHL5d^eKO*vZAkXbIl;)4uaAZjan z|KtHp)IhF`r}?zYhiYN~_EKmZVf2tM?6+2%SCZpYJ~mC^GdTRt@qbN02hw!bx_Py) zAx;fUheQkw6rV|~6CemB)H}UAXb{g~ImwSwr>k->*^m1;r2;ACT~df&J*i#x-+6NN zOdSQ>)44GbJnn{c7RZgw%&_1+m{2A4DR?k#Y+)(A3HpqKt0njWsA&dA9FF7FAo>wa zku-V-qiRWPouXheIQ;ps<2t$a=T(%6WYM;^mB4f8uV((Wn!@j@7Cu-QtA38%A@OU^ zr@$quXkB#A?z&A2fN}hYF(PatAw{XcPv86eQ=F{h33_%`cK5vL2JA3$g0@Ejg6cKj zS~XelfTV1f>Rs}V}I^+YswK$Kx$M0^dDv&|}Vyf5m?6n&dYkR@nXI5PP zRTYSzQb|EIv6mPSpl8%_yZoCy{+RykI3c_cI6rZRu(B≫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 diff --git a/static/images/welcome-learn.png b/static/images/welcome-learn.png deleted file mode 100644 index 8717acd00f0888c7275592052d6776ca6fd4918d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4497 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 diff --git a/static/images/welcome-try.png b/static/images/welcome-try.png deleted file mode 100644 index 351a648b41706c9d876a5cf213df71219d4269a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26671 zcmaI7W0WRAvo6}U?S9)mZQHhO+qP{R)7{gyZBN^_ZR^f=&e{9iAN$@~t12^V#q&f& zW>jTXW>%zvoH#rT4h#?w5WJ*>h|<3_^xtU$1@iAo@!Le^UxMu-s^Ow+Z|34|=wu2c zXku?<3XrrlG&fZ;H8k;b95>|w0syc$H>gW&dyE)U}9iopl4vBXJn#fWanaL;$mO`{GWsPpEf5GGcF|&vHzp%Ux}C4 z!o|gbi=N)y-JQ;zna5wi@lSIy}iwU)uMuhy^FoG zg}nnnSeX?dYiMj~_n-3rl9!d`lC*PnF|;!_l@#G6{>MOPX=%d6$j-(o$|=mm$;QCJ z$SBIhA;QkU$-%(DA|@&(C@jkPUsw@)V^>>KJD2~$n*3iZ^ZzIIKcQgj@K3XdsgtFf zsfn1Ay)EE>xy)txKiI;-!NDTL#w7NSkM)1H<$q&M{s&wBH

<{}W69&lvjuH0=MY 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 From c470407e568bc1ece2d9cc52e36e02694ba6daf6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 10:55:05 +0000 Subject: [PATCH 02/36] fix(deps): lock file maintenance --- package-lock.json | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2889529cd..91ea90161 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22068,9 +22068,9 @@ } }, "node_modules/scratch-audio": { - "version": "1.0.320", - "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-1.0.320.tgz", - "integrity": "sha512-wZwgxXqAzqv/NN+Ps/NbLn1xWyvjGrYirumcflzDuQbIJxxj8CXF0ChN029S1ydFWbHodsKLRxICgF5yfX5HXQ==", + "version": "1.0.321", + "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-1.0.321.tgz", + "integrity": "sha512-Y2CzEVblux31oAU2N8z2Kye80nrQBKjSP8z5NAUxoLlCPNkG0kKBaLSbtRPRcd5EpTU8BF4vetfusyzk9OnkKQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22477,9 +22477,9 @@ } }, "node_modules/scratch-paint": { - "version": "2.2.498", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.498.tgz", - "integrity": "sha512-Xe4gOaLm317ngGjpG4FNDWjysHsBEf/h0ypGKAlCnRoqeEXmTMgoM68qisgBNV9gNWZ7/fwciv1bdDcQ9ovSmg==", + "version": "2.2.501", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.501.tgz", + "integrity": "sha512-QuD9zfAzCVSTXzX8fhzDYRUHSSYr9+kc8PqWf2lNc/lp856i5K6S0rfhdTWUaNp4uFff1YB10j328Y54+HQOqw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22545,9 +22545,9 @@ } }, "node_modules/scratch-render": { - "version": "1.2.104", - "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.104.tgz", - "integrity": "sha512-hDGfW0AsWWKmW7XALjNqdS3C7gsdpC02GL4qfDRBNIkNrcB5QvOFOlvWQaEFDPE879a5EST77Us3e3mk5/zFeg==", + "version": "1.2.109", + "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.109.tgz", + "integrity": "sha512-L/1w4pr0ELV4Nnp66W99lVUl6ClqqM4Fv0jhyNJwZxQloMxUfD3YvuvpMz5BOWGvqYfu16Ui3Yw+ZCi+Jm1aPg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22565,9 +22565,9 @@ } }, "node_modules/scratch-render-fonts": { - "version": "1.0.126", - "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.126.tgz", - "integrity": "sha512-XBK88BjPMdBK1MOIKafGibCaSaoPj2sueu1QglRL2WFKy6y66v830TTfE1ugHK5RCXCbDFx7iJV1QOgJqkSFHw==", + "version": "1.0.127", + "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.127.tgz", + "integrity": "sha512-/bEBHFrN7PWlxEP8gZ8fhSt1r7ePEg3EQQDMWlKa/MMgA65pP2vil+axPiZ1PT6x2kDLyzfpUCjuCy0mwgIuoA==", "dev": true, "dependencies": { "base64-loader": "^1.0.0" @@ -22597,9 +22597,9 @@ "dev": true }, "node_modules/scratch-sb1-converter": { - "version": "1.0.311", - "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.311.tgz", - "integrity": "sha512-Rz7g05oW+IS60wqEG5y6b/l3R8v/maGpICyqqMzdfNOP1KAkgykBb9+VubYiGm9Sgr9VzphEWpkI79bYEOKPuw==", + "version": "1.0.313", + "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.313.tgz", + "integrity": "sha512-igEShfwUfpxJdRQuHHAnczPV+SrIudiDXzcyPDWx+UHfii+PsY2FVaUFaO+WREC9KYufc1i9sd1ms53ERU0bMQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22657,9 +22657,9 @@ } }, "node_modules/scratch-svg-renderer": { - "version": "2.5.38", - "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.38.tgz", - "integrity": "sha512-71MwTICnoAr3l7ytETlORxKUBfRlURLvvHXhPoVLlGhL9t5Byuly/JkxiCglELFzbH8pGnN5rBHR7bzTpD9PkA==", + "version": "2.5.39", + "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.39.tgz", + "integrity": "sha512-80+ZdYASw6GVBV4h3qhoFnfCADLmJhLx26sZm1dHSy805zxDtvNT4mO3CqqXdDYIUjmSWJ5HkJ54fd0lGNCiZg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22700,9 +22700,9 @@ "license": "BSD-3-Clause" }, "node_modules/scratch-vm": { - "version": "4.8.91", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-4.8.91.tgz", - "integrity": "sha512-495Qbqe2XVqjB9/Wz0HpEVwubSVdL74Lrx4pyYvBnoEG4sZ1wWLfWB8ZNzHf16vETZ5U7zDcUayVUacg6e1jdQ==", + "version": "4.8.94", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-4.8.94.tgz", + "integrity": "sha512-SeuZjrW60D6bD7o0ZDCidG660CtHEx7oX3ZWCzUwGRmQ1kJR8QFPrO3mBEEUecRuDMG1KlkwwdIzuCj0Pdg8NA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22723,7 +22723,7 @@ "scratch-render": "^1.0.232", "scratch-sb1-converter": "^1.0.0", "scratch-storage": "^2.3.5", - "scratch-svg-renderer": "2.5.38", + "scratch-svg-renderer": "2.5.39", "scratch-translate-extension-languages": "^1.0.0", "text-encoding": "^0.7.0", "uuid": "^8.3.2", From cf2af2be97615633e9edbf206dfc5c6f4849d578 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:08:05 +0000 Subject: [PATCH 03/36] fix(deps): update dependency scratch-l10n to v4.0.36 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 68c3db5da..4607b0b01 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.5", - "scratch-l10n": "4.0.34", + "scratch-l10n": "4.0.36", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22461,9 +22461,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.34", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.34.tgz", - "integrity": "sha512-sO/KcFdLVZT+zRmp/CGUvYYIGd2f1csXSmhHvaHSeumh6CY83nv0YDqd3zOLRmoomW0MgoxrlKIH8WUqWSNSNg==", + "version": "4.0.36", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.36.tgz", + "integrity": "sha512-bhoHrcqX1tlUxVu2NmEaNyQJn9QzkZ0hgZ8JNruWexltsfcQipE7dB2wO3R73+QnHNzxY5EI6BNSUIQR8R3Omg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index 943eafe05..dd8ae3a0a 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.5", - "scratch-l10n": "4.0.34", + "scratch-l10n": "4.0.36", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From 5c087b25b29c779baadad571dbe8d447cb49193b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 04:04:02 +0000 Subject: [PATCH 04/36] fix(deps): update dependency scratch-l10n to v4.0.37 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4607b0b01..6734f9245 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.5", - "scratch-l10n": "4.0.36", + "scratch-l10n": "4.0.37", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22461,9 +22461,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.36", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.36.tgz", - "integrity": "sha512-bhoHrcqX1tlUxVu2NmEaNyQJn9QzkZ0hgZ8JNruWexltsfcQipE7dB2wO3R73+QnHNzxY5EI6BNSUIQR8R3Omg==", + "version": "4.0.37", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.37.tgz", + "integrity": "sha512-fGucBuQvyJKpe23/sz4kcHNQBbqZGIOHLmve5Lvy+H1u56JiT7eUgeAIg2vh0IM5+QDC18RKLi0+fyV7LsMYew==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index dd8ae3a0a..4ba42a9d4 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.5", - "scratch-l10n": "4.0.36", + "scratch-l10n": "4.0.37", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From f29add97af7a56753ac8ed541c9fd5e0b0403c7f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 11:01:38 +0000 Subject: [PATCH 05/36] fix(deps): update dependency scratch-gui to v4.1.6 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index a0bcdc68a..416adfe6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -111,7 +111,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.81.0", "sass-loader": "10.5.2", - "scratch-gui": "4.1.5", + "scratch-gui": "4.1.6", "scratch-l10n": "4.0.37", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", @@ -22192,9 +22192,9 @@ } }, "node_modules/scratch-gui": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-4.1.5.tgz", - "integrity": "sha512-+UQ2ARJQRn4GKEAZH2GDaaC1zmlACFBDcPWMRXfMfbJlIIhGlfaDOVVpZR3ftSfeDuRO9RfA0x5jhkaN2qlIhw==", + "version": "4.1.6", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-4.1.6.tgz", + "integrity": "sha512-jfRnsx5WQYm6OuSqw38YWHNMib0evW2RfkJ1x2m2bnOFhmYvqeI6icQKX8iK3VxN5URFv7qF2WFg6vwj1E6e9g==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index 4ba42a9d4..55be609fa 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.81.0", "sass-loader": "10.5.2", - "scratch-gui": "4.1.5", + "scratch-gui": "4.1.6", "scratch-l10n": "4.0.37", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", From 3ce5ccf401210f3f5048510a04f23229fc82b113 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 11:06:33 +0000 Subject: [PATCH 06/36] fix(deps): lock file maintenance --- package-lock.json | 123 ++++++++++++++++++++++++---------------------- 1 file changed, 63 insertions(+), 60 deletions(-) diff --git a/package-lock.json b/package-lock.json index a0bcdc68a..64efb4406 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4039,9 +4039,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.9.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz", - "integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==", + "version": "22.9.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.1.tgz", + "integrity": "sha512-p8Yy/8sw1caA8CdRIQBG5tiLHmxtQKObCijiAa9Ez+d4+PRffM4054xbju0msf+cvhJpnFEeNjxmVT/0ipktrg==", "dev": true, "license": "MIT", "dependencies": { @@ -6551,9 +6551,9 @@ "license": "MIT" }, "node_modules/caniuse-lite": { - "version": "1.0.30001680", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz", - "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==", + "version": "1.0.30001683", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001683.tgz", + "integrity": "sha512-iqmNnThZ0n70mNwvxpEC2nBJ037ZHZUoBI5Gorh1Mw6IlEAZujEoU1tXA628iZfzm7R9FvFzxbfdgml82a3k8Q==", "dev": true, "funding": [ { @@ -7608,9 +7608,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz", - "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -8976,11 +8976,14 @@ } }, "node_modules/dompurify": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.0.tgz", - "integrity": "sha512-AMdOzK44oFWqHEi0wpOqix/fUNY707OmoeFDnbi3Q5I8uOpy21ufUA5cDJPr0bosxrflOVD/H2DMSvuGKJGfmQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.1.tgz", + "integrity": "sha512-NBHEsc0/kzRYQd+AY6HR6B/IgsqzBABrqJbpCDQII/OK6h7B7LXzweZTDsqSW2LkTRpoxf18YUP+YjGySk6B3w==", "dev": true, - "license": "(MPL-2.0 OR Apache-2.0)" + "license": "(MPL-2.0 OR Apache-2.0)", + "optionalDependencies": { + "@types/trusted-types": "^2.0.7" + } }, "node_modules/domutils": { "version": "1.5.1", @@ -9246,9 +9249,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.62", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.62.tgz", - "integrity": "sha512-t8c+zLmJHa9dJy96yBZRXGQYoiCEnHYgFwn1asvSPZSUdVxnB62A4RASd7k41ytG3ErFBA0TpHlKg9D9SQBmLg==", + "version": "1.5.63", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.63.tgz", + "integrity": "sha512-ddeXKuY9BHo/mw145axlyWjlJ1UBt4WK3AlvkT7W2AbqfRQoacVoRUCF6wL3uIx/8wT9oLKXzI+rFqHHscByaA==", "dev": true, "license": "ISC" }, @@ -10987,9 +10990,9 @@ } }, "node_modules/flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz", + "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==", "dev": true, "license": "ISC" }, @@ -11004,9 +11007,9 @@ } }, "node_modules/flow-remove-types": { - "version": "2.253.0", - "resolved": "https://registry.npmjs.org/flow-remove-types/-/flow-remove-types-2.253.0.tgz", - "integrity": "sha512-4L1X1FZE08AOe9SMyqFhyl+TSM6L+tHbVBfIMQsZHduPUwnTuIs5jfVyz35bRAS67k2c1e14qSosgYVi+Uuj1Q==", + "version": "2.254.0", + "resolved": "https://registry.npmjs.org/flow-remove-types/-/flow-remove-types-2.254.0.tgz", + "integrity": "sha512-bOasdtqZfx0lEAe7/eWfRtJhGPuI1ycRAY0X4F1l+MrHE5sjjFhzbSt8YZVdQwElRsZUagldOxNU1xSMFdXffQ==", "dev": true, "license": "MIT", "dependencies": { @@ -13304,9 +13307,9 @@ "license": "MIT" }, "node_modules/immutable": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.2.tgz", - "integrity": "sha512-1NU7hWZDkV7hJ4PJ9dur9gTNQ4ePNPN4k9/0YhwjzykTi/+3Q5pF93YU5QoVj8BuOnhLgaY8gs0U2pj4kSYVcw==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz", + "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==", "dev": true, "license": "MIT" }, @@ -14639,9 +14642,9 @@ } }, "node_modules/istanbul-lib-processinfo/node_modules/cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz", + "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==", "dev": true, "license": "MIT", "dependencies": { @@ -19780,9 +19783,9 @@ "license": "ISC" }, "node_modules/psl": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.10.0.tgz", - "integrity": "sha512-KSKHEbjAnpUuAUserOq0FxGXCUrzC3WniuSJhvdbs102rL55266ZcHBqLWOsG30spQMlPdpy7icATiAQehg/iA==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.11.0.tgz", + "integrity": "sha512-pjFdcBXT4g061k/SQkzNCRnav+1RdIOgrcX8hs5eL3CEQcFZP9qT8T1RWYxGKT11rH1DdIW+kJRfCYykBJuerQ==", "dev": true, "license": "MIT", "dependencies": { @@ -22068,9 +22071,9 @@ } }, "node_modules/scratch-audio": { - "version": "1.0.321", - "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-1.0.321.tgz", - "integrity": "sha512-Y2CzEVblux31oAU2N8z2Kye80nrQBKjSP8z5NAUxoLlCPNkG0kKBaLSbtRPRcd5EpTU8BF4vetfusyzk9OnkKQ==", + "version": "1.0.325", + "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-1.0.325.tgz", + "integrity": "sha512-UdXWrRlsVhrvBoyncBlBV7IPLAdJd6F5Q3Xzv5yBRWq8wiNMG0IT19jYdqi8mPbXlNPlFyqyLs/RznCnAt/PnA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22477,9 +22480,9 @@ } }, "node_modules/scratch-paint": { - "version": "2.2.501", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.501.tgz", - "integrity": "sha512-QuD9zfAzCVSTXzX8fhzDYRUHSSYr9+kc8PqWf2lNc/lp856i5K6S0rfhdTWUaNp4uFff1YB10j328Y54+HQOqw==", + "version": "2.2.508", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.508.tgz", + "integrity": "sha512-e2wS98L7cux7NsggCH+m7pW+I+ftw6f/p+RtKE4kG2+uvqpnU0lncGGuPkOp7kBr999TSVu7d1iB/ZFkpAXnyA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22545,9 +22548,9 @@ } }, "node_modules/scratch-render": { - "version": "1.2.109", - "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.109.tgz", - "integrity": "sha512-L/1w4pr0ELV4Nnp66W99lVUl6ClqqM4Fv0jhyNJwZxQloMxUfD3YvuvpMz5BOWGvqYfu16Ui3Yw+ZCi+Jm1aPg==", + "version": "1.2.115", + "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.115.tgz", + "integrity": "sha512-+X/hqEGH5C3socHt5/GjlfAa9zBdOCNp+RaRGvgDqARPPJrTC4eQUOPXIDx/mUP9FZNRfQQQM0Zz/+fZjuZIjQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22565,9 +22568,9 @@ } }, "node_modules/scratch-render-fonts": { - "version": "1.0.127", - "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.127.tgz", - "integrity": "sha512-/bEBHFrN7PWlxEP8gZ8fhSt1r7ePEg3EQQDMWlKa/MMgA65pP2vil+axPiZ1PT6x2kDLyzfpUCjuCy0mwgIuoA==", + "version": "1.0.129", + "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.129.tgz", + "integrity": "sha512-IVza4I3KANE0AQM1mM+FefqYrsNz4vPbvhzhlrY4VOYWlOnY0dQXnlccnWSMjYH9KCmm1FNGCKJGRi8ttOmtQg==", "dev": true, "dependencies": { "base64-loader": "^1.0.0" @@ -22597,9 +22600,9 @@ "dev": true }, "node_modules/scratch-sb1-converter": { - "version": "1.0.313", - "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.313.tgz", - "integrity": "sha512-igEShfwUfpxJdRQuHHAnczPV+SrIudiDXzcyPDWx+UHfii+PsY2FVaUFaO+WREC9KYufc1i9sd1ms53ERU0bMQ==", + "version": "1.0.317", + "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.317.tgz", + "integrity": "sha512-1APiiOuWzI0r3a9s3I2OZthAXZJWvy4dp5gxlNyR1RhsakeqfU45t+88ITla88CvUA15uWEYvkC1GsEewUBIHQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22657,9 +22660,9 @@ } }, "node_modules/scratch-svg-renderer": { - "version": "2.5.39", - "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.39.tgz", - "integrity": "sha512-80+ZdYASw6GVBV4h3qhoFnfCADLmJhLx26sZm1dHSy805zxDtvNT4mO3CqqXdDYIUjmSWJ5HkJ54fd0lGNCiZg==", + "version": "2.5.40", + "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.40.tgz", + "integrity": "sha512-IRk1NoGkgtneWOPAgd33KzhTWfUs4RvxNa7SwbzRPo7+DLiWLgeMtyK9Y0kjtD34I8I7U8snUsgbTvaxf+2hFw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22700,9 +22703,9 @@ "license": "BSD-3-Clause" }, "node_modules/scratch-vm": { - "version": "4.8.94", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-4.8.94.tgz", - "integrity": "sha512-SeuZjrW60D6bD7o0ZDCidG660CtHEx7oX3ZWCzUwGRmQ1kJR8QFPrO3mBEEUecRuDMG1KlkwwdIzuCj0Pdg8NA==", + "version": "4.8.102", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-4.8.102.tgz", + "integrity": "sha512-YCdocJcnMo5cPCNTe/NQuFdShh8rxsRD5PVJDXMEuCP9HO0axPHamymePJK1g6ihDbthD5eUaBFwIvI5zUA6pw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22723,7 +22726,7 @@ "scratch-render": "^1.0.232", "scratch-sb1-converter": "^1.0.0", "scratch-storage": "^2.3.5", - "scratch-svg-renderer": "2.5.39", + "scratch-svg-renderer": "2.5.40", "scratch-translate-extension-languages": "^1.0.0", "text-encoding": "^0.7.0", "uuid": "^8.3.2", @@ -26576,22 +26579,22 @@ "license": "ISC" }, "node_modules/tldts": { - "version": "6.1.61", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.61.tgz", - "integrity": "sha512-rv8LUyez4Ygkopqn+M6OLItAOT9FF3REpPQDkdMx5ix8w4qkuE7Vo2o/vw1nxKQYmJDV8JpAMJQr1b+lTKf0FA==", + "version": "6.1.62", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.62.tgz", + "integrity": "sha512-TF+wo3MgTLbf37keEwQD0IxvOZO8UZxnpPJDg5iFGAASGxYzbX/Q0y944ATEjrfxG/pF1TWRHCPbFp49Mz1Y1w==", "dev": true, "license": "MIT", "dependencies": { - "tldts-core": "^6.1.61" + "tldts-core": "^6.1.62" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "6.1.61", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.61.tgz", - "integrity": "sha512-In7VffkDWUPgwa+c9picLUxvb0RltVwTkSgMNFgvlGSWveCzGBemBqTsgJCL4EDFWZ6WH0fKTsot6yNhzy3ZzQ==", + "version": "6.1.62", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.62.tgz", + "integrity": "sha512-ohONqbfobpuaylhqFbtCzc0dFFeNz85FVKSesgT8DS9OV3a25Yj730pTj7/dDtCqmgoCgEj6gDiU9XxgHKQlBw==", "dev": true, "license": "MIT" }, From 1f2facb2b68d3ab6732dec3df31f79018d5eb5e5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 14:32:33 +0000 Subject: [PATCH 07/36] fix(deps): update dependency scratch-l10n to v4.0.38 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 416adfe6a..726fcd923 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.6", - "scratch-l10n": "4.0.37", + "scratch-l10n": "4.0.38", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22461,9 +22461,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.37", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.37.tgz", - "integrity": "sha512-fGucBuQvyJKpe23/sz4kcHNQBbqZGIOHLmve5Lvy+H1u56JiT7eUgeAIg2vh0IM5+QDC18RKLi0+fyV7LsMYew==", + "version": "4.0.38", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.38.tgz", + "integrity": "sha512-BYAmu/xqUFlvEHWm4pE0ujyTuF31Pv/ElDVjIln4aRK3PfMZ+bioNn+Lr5+EVgcQR+YTLQ8b4nsudDPEw9SMMg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index 55be609fa..fd63239da 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.6", - "scratch-l10n": "4.0.37", + "scratch-l10n": "4.0.38", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From d7e8515cda8441483c82d5cb4e92f4b442161cd7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 16:35:31 +0000 Subject: [PATCH 08/36] chore(deps): update formatjs monorepo --- package-lock.json | 62 +++++++++++++++++++++++------------------------ package.json | 8 +++--- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index 726fcd923..1df3abf71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,11 +34,11 @@ "@babel/plugin-transform-object-rest-spread": "7.25.9", "@babel/preset-env": "7.26.0", "@babel/preset-react": "7.25.9", - "@formatjs/intl-datetimeformat": "6.16.4", + "@formatjs/intl-datetimeformat": "6.16.5", "@formatjs/intl-locale": "3.4.6", - "@formatjs/intl-numberformat": "8.14.4", - "@formatjs/intl-pluralrules": "5.3.4", - "@formatjs/intl-relativetimeformat": "11.4.4", + "@formatjs/intl-numberformat": "8.14.5", + "@formatjs/intl-pluralrules": "5.3.5", + "@formatjs/intl-relativetimeformat": "11.4.5", "@types/jest": "29.5.14", "async": "3.2.6", "autoprefixer": "10.4.20", @@ -2220,14 +2220,14 @@ } }, "node_modules/@formatjs/ecma402-abstract": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.2.3.tgz", - "integrity": "sha512-aElGmleuReGnk2wtYOzYFmNWYoiWWmf1pPPCYg0oiIQSJj0mjc4eUfzUXaSOJ4S8WzI/cLqnCTWjqz904FT2OQ==", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.2.4.tgz", + "integrity": "sha512-lFyiQDVvSbQOpU+WFd//ILolGj4UgA/qXrKeZxdV14uKiAUiPAtX6XAn7WBCRi7Mx6I7EybM9E5yYn4BIpZWYg==", "dev": true, "license": "MIT", "dependencies": { "@formatjs/fast-memoize": "2.2.3", - "@formatjs/intl-localematcher": "0.5.7", + "@formatjs/intl-localematcher": "0.5.8", "tslib": "2" } }, @@ -2331,14 +2331,14 @@ } }, "node_modules/@formatjs/intl-datetimeformat": { - "version": "6.16.4", - "resolved": "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-6.16.4.tgz", - "integrity": "sha512-DLoqb1hO7CZMPXkl4odvy7wQzwMgC/WfdWEy4dFXFi1hKVcE3eM4VYAs1fX5m+tmLoSmyMj3qyDRadaGhpMnhA==", + "version": "6.16.5", + "resolved": "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-6.16.5.tgz", + "integrity": "sha512-IukSD4pmyZZzpT5ysm6ONRKSu/OQq3vFKHA3exJDWSMjboPO+wO/bT9vOOw1y957N3vtrqvxHSfja6TYwbPpkQ==", "dev": true, "license": "MIT", "dependencies": { - "@formatjs/ecma402-abstract": "2.2.3", - "@formatjs/intl-localematcher": "0.5.7", + "@formatjs/ecma402-abstract": "2.2.4", + "@formatjs/intl-localematcher": "0.5.8", "tslib": "2" } }, @@ -2463,9 +2463,9 @@ } }, "node_modules/@formatjs/intl-localematcher": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.7.tgz", - "integrity": "sha512-GGFtfHGQVFe/niOZp24Kal5b2i36eE2bNL0xi9Sg/yd0TR8aLjcteApZdHmismP5QQax1cMnZM9yWySUUjJteA==", + "version": "0.5.8", + "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.8.tgz", + "integrity": "sha512-I+WDNWWJFZie+jkfkiK5Mp4hEDyRSEvmyfYadflOno/mmKJKcB17fEpEH0oJu/OWhhCJ8kJBDz2YMd/6cDl7Mg==", "dev": true, "license": "MIT", "dependencies": { @@ -2473,38 +2473,38 @@ } }, "node_modules/@formatjs/intl-numberformat": { - "version": "8.14.4", - "resolved": "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-8.14.4.tgz", - "integrity": "sha512-Isr8qEy6zZQA57VagmjO+z+AvRsTvzdP+P2ZT+zf5vnMbJT2toNIXeT8hA4hmI9qV6KUxHX/YOgpp5hw8tO49Q==", + "version": "8.14.5", + "resolved": "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-8.14.5.tgz", + "integrity": "sha512-UP7Y+t2orvEbFB8EYmmSIbfam1CjhhYWIV7diWBXWilGjrXH7zxIrpgbG22wWwfkEAu8TU8OB/rzIha66Tg1vQ==", "dev": true, "license": "MIT", "dependencies": { - "@formatjs/ecma402-abstract": "2.2.3", - "@formatjs/intl-localematcher": "0.5.7", + "@formatjs/ecma402-abstract": "2.2.4", + "@formatjs/intl-localematcher": "0.5.8", "tslib": "2" } }, "node_modules/@formatjs/intl-pluralrules": { - "version": "5.3.4", - "resolved": "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-5.3.4.tgz", - "integrity": "sha512-9+ySYcpTxLHy0PP10LGvxkXyYDeceFuyijjZh/UP5MKK7Xg9hXzW5X54B55iuOYnEljAolBVcat1DrIeKUi/Kw==", + "version": "5.3.5", + "resolved": "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-5.3.5.tgz", + "integrity": "sha512-ahtSZ82E5yEVbHAm22jbIOxtB4nPlAS3xMsbdEkwO1ZXEi2mOsiPFpDJ5F5Duq6uSggldHHh1kcKUjDLgGb1vg==", "dev": true, "license": "MIT", "dependencies": { - "@formatjs/ecma402-abstract": "2.2.3", - "@formatjs/intl-localematcher": "0.5.7", + "@formatjs/ecma402-abstract": "2.2.4", + "@formatjs/intl-localematcher": "0.5.8", "tslib": "2" } }, "node_modules/@formatjs/intl-relativetimeformat": { - "version": "11.4.4", - "resolved": "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-11.4.4.tgz", - "integrity": "sha512-qFgt3LAlITTgDu7Rjhlpye6j2k+/z1LNGAuth//Dj7UapWCL+26LZ/OA1Z5lrt80v/pj/x1rTOQIkLrltjeUWg==", + "version": "11.4.5", + "resolved": "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-11.4.5.tgz", + "integrity": "sha512-CfFWAWSZXDTM0/BV4wJo7tS3OL67RW5Kfbrn4vSJ49C5pigMzlmiJK+oQHhwvu5mQZBHwmnSKF/hY+iR3gYaAQ==", "dev": true, "license": "MIT", "dependencies": { - "@formatjs/ecma402-abstract": "2.2.3", - "@formatjs/intl-localematcher": "0.5.7", + "@formatjs/ecma402-abstract": "2.2.4", + "@formatjs/intl-localematcher": "0.5.8", "tslib": "2" } }, diff --git a/package.json b/package.json index fd63239da..85ff50ef5 100644 --- a/package.json +++ b/package.json @@ -69,11 +69,11 @@ "@babel/plugin-transform-object-rest-spread": "7.25.9", "@babel/preset-env": "7.26.0", "@babel/preset-react": "7.25.9", - "@formatjs/intl-datetimeformat": "6.16.4", + "@formatjs/intl-datetimeformat": "6.16.5", "@formatjs/intl-locale": "3.4.6", - "@formatjs/intl-numberformat": "8.14.4", - "@formatjs/intl-pluralrules": "5.3.4", - "@formatjs/intl-relativetimeformat": "11.4.4", + "@formatjs/intl-numberformat": "8.14.5", + "@formatjs/intl-pluralrules": "5.3.5", + "@formatjs/intl-relativetimeformat": "11.4.5", "@types/jest": "29.5.14", "async": "3.2.6", "autoprefixer": "10.4.20", From d15cfd274380b989a402a860a548c89977a9e72a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 04:09:20 +0000 Subject: [PATCH 09/36] fix(deps): update dependency scratch-l10n to v4.0.39 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1df3abf71..45c59f154 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.6", - "scratch-l10n": "4.0.38", + "scratch-l10n": "4.0.39", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22461,9 +22461,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.38", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.38.tgz", - "integrity": "sha512-BYAmu/xqUFlvEHWm4pE0ujyTuF31Pv/ElDVjIln4aRK3PfMZ+bioNn+Lr5+EVgcQR+YTLQ8b4nsudDPEw9SMMg==", + "version": "4.0.39", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.39.tgz", + "integrity": "sha512-6GLar8BNtF6b9XGvaLqSI8b62LnlK4gJP8jZzvKuFrA3BNYT1QDUvc8WWyPnzpGXhfW9ilr7JdhoLclpIFo6gA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index 85ff50ef5..06e5e9d18 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.6", - "scratch-l10n": "4.0.38", + "scratch-l10n": "4.0.39", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From bbb5889dd34bffc9cda6735831a2aadc40b39d31 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 09:11:55 +0000 Subject: [PATCH 10/36] fix(deps): update dependency scratch-l10n to v4.0.40 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 45c59f154..6b0856d59 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.6", - "scratch-l10n": "4.0.39", + "scratch-l10n": "4.0.40", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22461,9 +22461,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.39", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.39.tgz", - "integrity": "sha512-6GLar8BNtF6b9XGvaLqSI8b62LnlK4gJP8jZzvKuFrA3BNYT1QDUvc8WWyPnzpGXhfW9ilr7JdhoLclpIFo6gA==", + "version": "4.0.40", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.40.tgz", + "integrity": "sha512-jtHeF6SsWtlgHohqSUiyjCr8m1q0opH4KWDfes5P048HvOfZS+Bwhcx3cFfMT2UU2gr3beCa8cNd0ZW6utw6Dg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index 06e5e9d18..3310e4a90 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.6", - "scratch-l10n": "4.0.39", + "scratch-l10n": "4.0.40", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From 4038e22e2884449baf55152ee0fb48fb02fb4006 Mon Sep 17 00:00:00 2001 From: MiroslavDionisiev Date: Fri, 22 Nov 2024 11:56:24 +0200 Subject: [PATCH 11/36] chore: [UEPR-48] added hex vslues for colours --- src/_colors.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/_colors.scss b/src/_colors.scss index 253753914..58608c930 100644 --- a/src/_colors.scss +++ b/src/_colors.scss @@ -25,8 +25,8 @@ $background-color: hsla(0, 0%, 99%, 1); //#FDFDFD $motion-blue-3: hsla(215, 60%, 50%, 1);//#3373CC -$ui-light-blue: hsla(195, 63%, 86%, 1); -$ui-cyan-blue: hsla(194, 73%, 36%, 1); +$ui-light-blue: hsla(195, 63%, 86%, 1); //#C5E7f2 +$ui-cyan-blue: hsla(194, 73%, 36%, 1); //#19809F /* UI Secondary Colors */ /* 3.0 colors */ @@ -51,7 +51,7 @@ $ui-light-primary: hsl(215, 100%, 95%); $ui-light-primary-transparent: hsla(215, 100%, 95%, 0); $ui-border: hsla(0, 0%, 85%, 1); //#D9D9D9 -$ui-border-light-blue: hsla(215, 50%, 90%, 1); //##D9E3F2 +$ui-border-light-blue: hsla(215, 50%, 90%, 1); //#D9E3F2 /* modals */ $ui-mint-green: hsl(163, 69%, 44%); From a3dcbd3d99fc08a56e558c7398bd8f00c5601993 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 11:06:25 +0000 Subject: [PATCH 12/36] fix(deps): update dependency scratch-gui to v4.1.7 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6b0856d59..c54955aca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -111,7 +111,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.81.0", "sass-loader": "10.5.2", - "scratch-gui": "4.1.6", + "scratch-gui": "4.1.7", "scratch-l10n": "4.0.40", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", @@ -22192,9 +22192,9 @@ } }, "node_modules/scratch-gui": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-4.1.6.tgz", - "integrity": "sha512-jfRnsx5WQYm6OuSqw38YWHNMib0evW2RfkJ1x2m2bnOFhmYvqeI6icQKX8iK3VxN5URFv7qF2WFg6vwj1E6e9g==", + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-4.1.7.tgz", + "integrity": "sha512-DZHERBC95J4rRE//OXytfnzPksZVir4zp3TVyvhv1xME9f8GJRbFFYe9ZTptSjZWyk2boUGlbu+ad0uE/x+A0A==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index 3310e4a90..59cef2c93 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.81.0", "sass-loader": "10.5.2", - "scratch-gui": "4.1.6", + "scratch-gui": "4.1.7", "scratch-l10n": "4.0.40", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", From f005f0aa6ce747f819fe7343f00534697d2f8c56 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 12:46:15 +0000 Subject: [PATCH 13/36] fix(deps): update dependency scratch-l10n to v4.0.42 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index c54955aca..035b4ecec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.7", - "scratch-l10n": "4.0.40", + "scratch-l10n": "4.0.42", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22461,9 +22461,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.40", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.40.tgz", - "integrity": "sha512-jtHeF6SsWtlgHohqSUiyjCr8m1q0opH4KWDfes5P048HvOfZS+Bwhcx3cFfMT2UU2gr3beCa8cNd0ZW6utw6Dg==", + "version": "4.0.42", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.42.tgz", + "integrity": "sha512-kaI60M+TKcplhYel6vYhNj9qpvGsSzZ2/ma+YEV4COQmo5tiL3htbuXl2X/rzDnrDaUeNf3THt+FrR4aUQ3j9g==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index 59cef2c93..ca14d6704 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.7", - "scratch-l10n": "4.0.40", + "scratch-l10n": "4.0.42", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From 71826cd9b3c8cf10fa9a5fcb259e50204d00bcd8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 24 Nov 2024 08:14:22 +0000 Subject: [PATCH 14/36] fix(deps): lock file maintenance --- package-lock.json | 185 +++++++++++++++++++++------------------------- 1 file changed, 85 insertions(+), 100 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5dedba731..1edb18346 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3882,16 +3882,6 @@ "@babel/types": "^7.20.7" } }, - "node_modules/@types/dompurify": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-3.0.5.tgz", - "integrity": "sha512-1Wg0g3BtQF7sSb27fJQAKck1HECM6zV1EB66j8JH9i3LCjYabJa0FSdiSgsD5K/RbrsR0SiraKacLB+T8ZVYAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/trusted-types": "*" - } - }, "node_modules/@types/eslint": { "version": "9.6.1", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", @@ -4039,9 +4029,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.9.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.1.tgz", - "integrity": "sha512-p8Yy/8sw1caA8CdRIQBG5tiLHmxtQKObCijiAa9Ez+d4+PRffM4054xbju0msf+cvhJpnFEeNjxmVT/0ipktrg==", + "version": "22.9.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.3.tgz", + "integrity": "sha512-F3u1fs/fce3FFk+DAxbxc78DF8x0cY09RRL8GnXLmkJ1jvx3TtPdWoTT5/NiYfI5ASqXBmfqJi9dZ3gxMx4lzw==", "dev": true, "license": "MIT", "dependencies": { @@ -4109,7 +4099,8 @@ "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", "dev": true, - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/@types/usb": { "version": "1.5.4", @@ -6551,9 +6542,9 @@ "license": "MIT" }, "node_modules/caniuse-lite": { - "version": "1.0.30001683", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001683.tgz", - "integrity": "sha512-iqmNnThZ0n70mNwvxpEC2nBJ037ZHZUoBI5Gorh1Mw6IlEAZujEoU1tXA628iZfzm7R9FvFzxbfdgml82a3k8Q==", + "version": "1.0.30001684", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz", + "integrity": "sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==", "dev": true, "funding": [ { @@ -9249,9 +9240,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.63", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.63.tgz", - "integrity": "sha512-ddeXKuY9BHo/mw145axlyWjlJ1UBt4WK3AlvkT7W2AbqfRQoacVoRUCF6wL3uIx/8wT9oLKXzI+rFqHHscByaA==", + "version": "1.5.64", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.64.tgz", + "integrity": "sha512-IXEuxU+5ClW2IGEYFC2T7szbyVgehupCWQe5GNh+H065CD6U6IFN0s4KeAMFGNmQolRU4IV7zGBWSYMmZ8uuqQ==", "dev": true, "license": "ISC" }, @@ -11007,9 +10998,9 @@ } }, "node_modules/flow-remove-types": { - "version": "2.254.0", - "resolved": "https://registry.npmjs.org/flow-remove-types/-/flow-remove-types-2.254.0.tgz", - "integrity": "sha512-bOasdtqZfx0lEAe7/eWfRtJhGPuI1ycRAY0X4F1l+MrHE5sjjFhzbSt8YZVdQwElRsZUagldOxNU1xSMFdXffQ==", + "version": "2.254.2", + "resolved": "https://registry.npmjs.org/flow-remove-types/-/flow-remove-types-2.254.2.tgz", + "integrity": "sha512-zkN7rQ3/T0uJ/ghjD9THU1DQ129ufH4PeVKs3JRahmW0gzAvD7+INFoJoZhrArDIFSDiVqHsEweji1iWMP3AdQ==", "dev": true, "license": "MIT", "dependencies": { @@ -13684,7 +13675,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", - "dev": true, "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" @@ -13830,13 +13820,15 @@ } }, "node_modules/is-finalizationregistry": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", - "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", - "dev": true, + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.0.tgz", + "integrity": "sha512-qfMdqbAQEwBw78ZyReKnlA8ezmPdb9BemzIIip/JkjaZUhitfXDkkr+3QTboW0JrSXT1QWyYShpvnNHGZ4c4yA==", "license": "MIT", "dependencies": { - "call-bind": "^1.0.2" + "call-bind": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -13896,7 +13888,6 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", - "dev": true, "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" @@ -13942,7 +13933,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -14092,7 +14082,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -14206,7 +14195,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -14231,7 +14219,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", - "dev": true, "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -14274,14 +14261,13 @@ } }, "node_modules/isomorphic-dompurify": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/isomorphic-dompurify/-/isomorphic-dompurify-2.16.0.tgz", - "integrity": "sha512-cXhX2owp8rPxafCr0ywqy2CGI/4ceLNgWkWBEvUz64KTbtg3oRL2ZRqq/zW0pzt4YtDjkHLbwcp/lozpKzAQjg==", + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/isomorphic-dompurify/-/isomorphic-dompurify-2.17.0.tgz", + "integrity": "sha512-W9RC9aPgEAFF55VMo/9AUQ+GYkQ68gTRMLqS8fP9rw1VoYCsI7RdrRMAePhhqyCLfZS3JNjA4ahFi1L4aczUUg==", "dev": true, "license": "MIT", "dependencies": { - "@types/dompurify": "^3.0.5", - "dompurify": "^3.1.7", + "dompurify": "^3.2.1", "jsdom": "^25.0.1" }, "engines": { @@ -19783,9 +19769,9 @@ "license": "ISC" }, "node_modules/psl": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.11.0.tgz", - "integrity": "sha512-pjFdcBXT4g061k/SQkzNCRnav+1RdIOgrcX8hs5eL3CEQcFZP9qT8T1RWYxGKT11rH1DdIW+kJRfCYykBJuerQ==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.13.0.tgz", + "integrity": "sha512-BFwmFXiJoFqlUpZ5Qssolv15DMyc84gTBds1BjsV1BfXEo1UyyD7GsmN67n7J77uRhoSNW1AXtXKPLcBFQn9Aw==", "dev": true, "license": "MIT", "dependencies": { @@ -20994,19 +20980,18 @@ } }, "node_modules/reflect.getprototypeof": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz", - "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==", - "dev": true, + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.7.tgz", + "integrity": "sha512-bMvFGIUKlc/eSfXNX+aZ+EL95/EgZzuwA0OBPTbZZDEJw/0AkentjMuM1oiRfwHrshqk4RzdgiTg5CcDalXN5g==", "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", - "es-abstract": "^1.23.1", + "es-abstract": "^1.23.5", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.4", - "globalthis": "^1.0.3", - "which-builtin-type": "^1.1.3" + "gopd": "^1.0.1", + "which-builtin-type": "^1.1.4" }, "engines": { "node": ">= 0.4" @@ -21087,16 +21072,16 @@ } }, "node_modules/regexpu-core": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.1.1.tgz", - "integrity": "sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz", + "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==", "dev": true, "license": "MIT", "dependencies": { "regenerate": "^1.4.2", "regenerate-unicode-properties": "^10.2.0", "regjsgen": "^0.8.0", - "regjsparser": "^0.11.0", + "regjsparser": "^0.12.0", "unicode-match-property-ecmascript": "^2.0.0", "unicode-match-property-value-ecmascript": "^2.1.0" }, @@ -21112,9 +21097,9 @@ "license": "MIT" }, "node_modules/regjsparser": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.2.tgz", - "integrity": "sha512-3OGZZ4HoLJkkAZx/48mTXJNlmqTGOzc0o9OWQPuWpkOlXXPbyN6OafCcoXUnBqE2D3f/T5L+pWc1kdEmnfnRsA==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz", + "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -22071,9 +22056,9 @@ } }, "node_modules/scratch-audio": { - "version": "1.0.325", - "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-1.0.325.tgz", - "integrity": "sha512-UdXWrRlsVhrvBoyncBlBV7IPLAdJd6F5Q3Xzv5yBRWq8wiNMG0IT19jYdqi8mPbXlNPlFyqyLs/RznCnAt/PnA==", + "version": "1.0.330", + "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-1.0.330.tgz", + "integrity": "sha512-29TnzuTkm5y1GzXG0rw/ILdgmHVyts5dCTZguv5YE44aGig4a4aXPxI6+wtpqIGzQCBox9H2zbEHJ3aGfaEX8g==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22480,9 +22465,9 @@ } }, "node_modules/scratch-paint": { - "version": "2.2.508", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.508.tgz", - "integrity": "sha512-e2wS98L7cux7NsggCH+m7pW+I+ftw6f/p+RtKE4kG2+uvqpnU0lncGGuPkOp7kBr999TSVu7d1iB/ZFkpAXnyA==", + "version": "2.2.515", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.515.tgz", + "integrity": "sha512-jI3kOu037zKgZKR4gAamdcRfc4NoyM9l/yhrOfIVa3Kk3DVUAKr6VcRqDbGqRqBMvBoxd5zRBBxliLysnQt4Og==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22548,9 +22533,9 @@ } }, "node_modules/scratch-render": { - "version": "1.2.115", - "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.115.tgz", - "integrity": "sha512-+X/hqEGH5C3socHt5/GjlfAa9zBdOCNp+RaRGvgDqARPPJrTC4eQUOPXIDx/mUP9FZNRfQQQM0Zz/+fZjuZIjQ==", + "version": "1.2.121", + "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.121.tgz", + "integrity": "sha512-W8bzWfG1ZouIo2PGNNn/X2LU7e8RcdeGhAB4xW187cfCATYhop23YAP8RiTLHDAKr0FI4NACQjS3i2sYbmWM4Q==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22568,9 +22553,9 @@ } }, "node_modules/scratch-render-fonts": { - "version": "1.0.129", - "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.129.tgz", - "integrity": "sha512-IVza4I3KANE0AQM1mM+FefqYrsNz4vPbvhzhlrY4VOYWlOnY0dQXnlccnWSMjYH9KCmm1FNGCKJGRi8ttOmtQg==", + "version": "1.0.130", + "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.130.tgz", + "integrity": "sha512-76hnac/udWE275C56gi2q1vnwzfQXk7Zcvk3BM9IQiaE3xQcMz8jiV/hy1urXg5XI0wkGZyFkjK60oyBeijSdg==", "dev": true, "dependencies": { "base64-loader": "^1.0.0" @@ -22600,9 +22585,9 @@ "dev": true }, "node_modules/scratch-sb1-converter": { - "version": "1.0.317", - "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.317.tgz", - "integrity": "sha512-1APiiOuWzI0r3a9s3I2OZthAXZJWvy4dp5gxlNyR1RhsakeqfU45t+88ITla88CvUA15uWEYvkC1GsEewUBIHQ==", + "version": "1.0.322", + "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.322.tgz", + "integrity": "sha512-FWf1hr0w6OHigx+4s2aIWvrNp2ETQ/H7DYDkQkRP08s1RBddGi/tNHu6tKHKojgo6eEAhgDKJ6ZEzFoFHSgDdA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22660,9 +22645,9 @@ } }, "node_modules/scratch-svg-renderer": { - "version": "2.5.40", - "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.40.tgz", - "integrity": "sha512-IRk1NoGkgtneWOPAgd33KzhTWfUs4RvxNa7SwbzRPo7+DLiWLgeMtyK9Y0kjtD34I8I7U8snUsgbTvaxf+2hFw==", + "version": "2.5.43", + "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.43.tgz", + "integrity": "sha512-MgyoSIoYsgAYF1JHJQz0+r1NvtS1uOM+LLAfvIyYfiD9c5islNKD3asgGmry3PmSFBhEH189zkAIsTa8q3EJCg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22703,9 +22688,9 @@ "license": "BSD-3-Clause" }, "node_modules/scratch-vm": { - "version": "4.8.102", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-4.8.102.tgz", - "integrity": "sha512-YCdocJcnMo5cPCNTe/NQuFdShh8rxsRD5PVJDXMEuCP9HO0axPHamymePJK1g6ihDbthD5eUaBFwIvI5zUA6pw==", + "version": "4.8.111", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-4.8.111.tgz", + "integrity": "sha512-unT2vHVH6mWbpsjk26uoKPnWEZ3DOLgq4x/r+zDjcKfwoQ8zERO+0e4R2gsT49MIYsfCxjVQ8v4Q6/QG7IdSKw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22726,7 +22711,7 @@ "scratch-render": "^1.0.232", "scratch-sb1-converter": "^1.0.0", "scratch-storage": "^2.3.5", - "scratch-svg-renderer": "2.5.40", + "scratch-svg-renderer": "2.5.43", "scratch-translate-extension-languages": "^1.0.0", "text-encoding": "^0.7.0", "uuid": "^8.3.2", @@ -26579,22 +26564,22 @@ "license": "ISC" }, "node_modules/tldts": { - "version": "6.1.62", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.62.tgz", - "integrity": "sha512-TF+wo3MgTLbf37keEwQD0IxvOZO8UZxnpPJDg5iFGAASGxYzbX/Q0y944ATEjrfxG/pF1TWRHCPbFp49Mz1Y1w==", + "version": "6.1.64", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.64.tgz", + "integrity": "sha512-ph4AE5BXWIOsSy9stpoeo7bYe/Cy7VfpciIH4RhVZUPItCJmhqWCN0EVzxd8BOHiyNb42vuJc6NWTjJkg91Tuw==", "dev": true, "license": "MIT", "dependencies": { - "tldts-core": "^6.1.62" + "tldts-core": "^6.1.64" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "6.1.62", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.62.tgz", - "integrity": "sha512-ohONqbfobpuaylhqFbtCzc0dFFeNz85FVKSesgT8DS9OV3a25Yj730pTj7/dDtCqmgoCgEj6gDiU9XxgHKQlBw==", + "version": "6.1.64", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.64.tgz", + "integrity": "sha512-uqnl8vGV16KsyflHOzqrYjjArjfXaU6rMPXYy2/ZWoRKCkXtghgB4VwTDXUG+t0OTGeSewNAG31/x1gCTfLt+Q==", "dev": true, "license": "MIT" }, @@ -27129,9 +27114,9 @@ } }, "node_modules/typed-array-byte-offset": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", - "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.3.tgz", + "integrity": "sha512-GsvTyUHTriq6o/bHcTd0vM7OQ9JEdlvluu9YISaA7+KzDzPaIzEeDFNkTfhdE3MYcNhNi0vq/LlegYgIs5yPAw==", "license": "MIT", "dependencies": { "available-typed-arrays": "^1.0.7", @@ -27139,7 +27124,8 @@ "for-each": "^0.3.3", "gopd": "^1.0.1", "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13" + "is-typed-array": "^1.1.13", + "reflect.getprototypeof": "^1.0.6" }, "engines": { "node": ">= 0.4" @@ -27149,17 +27135,17 @@ } }, "node_modules/typed-array-length": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", - "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz", + "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==", "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-proto": "^1.0.3", "is-typed-array": "^1.1.13", - "possible-typed-array-names": "^1.0.0" + "possible-typed-array-names": "^1.0.0", + "reflect.getprototypeof": "^1.0.6" }, "engines": { "node": ">= 0.4" @@ -28351,17 +28337,17 @@ } }, "node_modules/which-builtin-type": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.4.tgz", - "integrity": "sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==", - "dev": true, + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.0.tgz", + "integrity": "sha512-I+qLGQ/vucCby4tf5HsLmGueEla4ZhwTBSqaooS+Y0BuxN4Cp+okmGuV+8mXZ84KDI9BA+oklo+RzKg0ONdSUA==", "license": "MIT", "dependencies": { + "call-bind": "^1.0.7", "function.prototype.name": "^1.1.6", "has-tostringtag": "^1.0.2", "is-async-function": "^2.0.0", "is-date-object": "^1.0.5", - "is-finalizationregistry": "^1.0.2", + "is-finalizationregistry": "^1.1.0", "is-generator-function": "^1.0.10", "is-regex": "^1.1.4", "is-weakref": "^1.0.2", @@ -28381,7 +28367,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", - "dev": true, "license": "MIT", "dependencies": { "is-map": "^2.0.3", From 30e1a13bc60237d3d29565cb38332bdf673a132e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 24 Nov 2024 10:51:49 +0000 Subject: [PATCH 15/36] fix(deps): update dependency scratch-l10n to v4.0.45 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5dedba731..493437638 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.7", - "scratch-l10n": "4.0.42", + "scratch-l10n": "4.0.45", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22464,9 +22464,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.42", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.42.tgz", - "integrity": "sha512-kaI60M+TKcplhYel6vYhNj9qpvGsSzZ2/ma+YEV4COQmo5tiL3htbuXl2X/rzDnrDaUeNf3THt+FrR4aUQ3j9g==", + "version": "4.0.45", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.45.tgz", + "integrity": "sha512-LNE7alQ41ApSBW+p/fEXpjBKKIJ1+0889RfTTvsAB0FH6sZf/MyRdEniIbJibXlUuURzsVhwuUI7HFJV8MeSBw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index ca14d6704..18c1bb173 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.7", - "scratch-l10n": "4.0.42", + "scratch-l10n": "4.0.45", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From ef4823630cf18f1e836d6c109f0c9f5a8c01584d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 07:40:50 +0000 Subject: [PATCH 16/36] fix(deps): update dependency scratch-l10n to v4.0.46 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 493437638..db2e1e9b5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.7", - "scratch-l10n": "4.0.45", + "scratch-l10n": "4.0.46", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22464,9 +22464,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.45", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.45.tgz", - "integrity": "sha512-LNE7alQ41ApSBW+p/fEXpjBKKIJ1+0889RfTTvsAB0FH6sZf/MyRdEniIbJibXlUuURzsVhwuUI7HFJV8MeSBw==", + "version": "4.0.46", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.46.tgz", + "integrity": "sha512-L+5eTrFe7qYUt0aK005qf20kg5Nm1gny2wDwpP1eI0Sk5Of6qGUyG7dr/FtAw5OHzbZENbYoT9tNWBf/swJ2gQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index 18c1bb173..575abb02d 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.7", - "scratch-l10n": "4.0.45", + "scratch-l10n": "4.0.46", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From aa4d20ac48cbf784c9d3c3586472a277b6add2a8 Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com> Date: Mon, 25 Nov 2024 08:14:41 -0800 Subject: [PATCH 17/36] chore!: set license to AGPL-3.0-only BREAKING CHANGE: This project is now licensed under the AGPL version 3.0 See https://www.scratchfoundation.org/open-source-license --- LICENSE | 663 +++++++++++++++++++++++++++++++++++++++++++++- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 658 insertions(+), 9 deletions(-) diff --git a/LICENSE b/LICENSE index d6ef4156f..0ad25db4b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,12 +1,661 @@ -Copyright (c) 2021, Scratch Foundation -All rights reserved. + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + Preamble -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. -3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/package-lock.json b/package-lock.json index db2e1e9b5..6a8bdbe67 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "www", "version": "1.0.0", - "license": "BSD-3-Clause", + "license": "AGPL-3.0-only", "dependencies": { "bunyan": "1.8.15", "clipboard-copy": "2.0.1", diff --git a/package.json b/package.json index 575abb02d..d0c0e8182 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "url": "git+ssh://git@github.com/scratchfoundation/scratch-www.git" }, "author": "Massachusetts Institute of Technology", - "license": "BSD-3-Clause", + "license": "AGPL-3.0-only", "bugs": { "url": "https://github.com/scratchfoundation/scratch-www/issues" }, From b71317b20e53382226217fb1fde6e2573e0527a1 Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com> Date: Mon, 25 Nov 2024 08:14:41 -0800 Subject: [PATCH 18/36] ci: add signature assistant workflow --- .github/workflows/signature-assistant.yml | 31 +++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/signature-assistant.yml diff --git a/.github/workflows/signature-assistant.yml b/.github/workflows/signature-assistant.yml new file mode 100644 index 000000000..acd2c3bb2 --- /dev/null +++ b/.github/workflows/signature-assistant.yml @@ -0,0 +1,31 @@ +name: "Signature Assistant" +on: + issue_comment: + types: [created] + pull_request_target: + types: [opened,closed,synchronize] + +permissions: + actions: write + contents: read + pull-requests: write + statuses: write + +jobs: + CLA-Assistant: + runs-on: ubuntu-latest + steps: + - name: "CLA Assistant" + if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' + uses: contributor-assistant/github-action@ca4a40a7d1004f18d9960b404b97e5f30a505a08 # v2.6.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # the below token should have repo scope and must be manually added by you in the repository's secrets + PERSONAL_ACCESS_TOKEN: ${{ secrets.GHA_AGREEMENTS_PAT }} + with: + remote-organization-name: 'scratchfoundation' + remote-repository-name: 'scratch-agreements' + path-to-signatures: 'signatures/version1/cla.json' + path-to-document: 'https://github.com/scratchfoundation/scratch-agreements/blob/main/CLA.md' + branch: 'main' + allowlist: semantic-release-bot,*[bot] From 79bcef7ad25ca1fcd3b181196cabac6dde258641 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 16:15:42 +0000 Subject: [PATCH 19/36] chore(deps): update dependency scratch-l10n to v5 --- package-lock.json | 20 ++++++++++++++++++-- package.json | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index db2e1e9b5..a8329686f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.7", - "scratch-l10n": "4.0.46", + "scratch-l10n": "5.0.0", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22463,7 +22463,7 @@ "react": "^16.0.0" } }, - "node_modules/scratch-l10n": { + "node_modules/scratch-gui/node_modules/scratch-l10n": { "version": "4.0.46", "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.46.tgz", "integrity": "sha512-L+5eTrFe7qYUt0aK005qf20kg5Nm1gny2wDwpP1eI0Sk5Of6qGUyG7dr/FtAw5OHzbZENbYoT9tNWBf/swJ2gQ==", @@ -22479,6 +22479,22 @@ "tx-push-src": "scripts/tx-push-src.js" } }, + "node_modules/scratch-l10n": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.0.tgz", + "integrity": "sha512-kFZbaOtsttxznLMLmwjm0uwGVmv5GtPddGVs5LFSjMxSOKinuOsJcGb+udU5+gPWBFvptI4BT4yfZUeQuP93Tg==", + "dev": true, + "license": "AGPL-3.0-only", + "dependencies": { + "@transifex/api": "4.3.0", + "download": "8.0.0", + "transifex": "1.6.6" + }, + "bin": { + "build-i18n-src": "scripts/build-i18n-src.js", + "tx-push-src": "scripts/tx-push-src.js" + } + }, "node_modules/scratch-paint": { "version": "2.2.508", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.508.tgz", diff --git a/package.json b/package.json index 575abb02d..8289d2305 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.7", - "scratch-l10n": "4.0.46", + "scratch-l10n": "5.0.0", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From 25519bb487a864b286808e0c11aa61f5ece4f6bc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 16:15:57 +0000 Subject: [PATCH 20/36] fix(deps): update dependency scratch-parser to v6 --- package-lock.json | 25 ++++++++++++++++++++----- package.json | 2 +- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index db2e1e9b5..8455e18e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "react-router-dom": "5.3.4", "react-twitter-embed": "3.0.3", "react-use": "17.5.1", - "scratch-parser": "5.2.1", + "scratch-parser": "6.0.0", "scratch-storage": "2.3.284" }, "devDependencies": { @@ -22534,10 +22534,10 @@ } }, "node_modules/scratch-parser": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/scratch-parser/-/scratch-parser-5.2.1.tgz", - "integrity": "sha512-O9acef/B5MAQSB6PrEGKtbmEL1AOVZf4mYZnR0sNlzRvqqaEd+fZDL5SM7E9uQP09dIghefrm6/xmgzQIJP9Wg==", - "license": "BSD-3-Clause", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/scratch-parser/-/scratch-parser-6.0.0.tgz", + "integrity": "sha512-LXcKxJIupqBtXSe2+SXkQxwdMWg4JCdZfoSdPYj1ZtV/UhejyUYju6ptYUrr98RsLFT5UyCmmUaev8gA1SNvhQ==", + "license": "AGPL-3.0-only", "dependencies": { "ajv": "^6.3.0", "jszip": "^3.1.5", @@ -22760,6 +22760,21 @@ "microee": "0.0.6" } }, + "node_modules/scratch-vm/node_modules/scratch-parser": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/scratch-parser/-/scratch-parser-5.2.1.tgz", + "integrity": "sha512-O9acef/B5MAQSB6PrEGKtbmEL1AOVZf4mYZnR0sNlzRvqqaEd+fZDL5SM7E9uQP09dIghefrm6/xmgzQIJP9Wg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "ajv": "^6.3.0", + "jszip": "^3.1.5", + "pify": "^4.0.1" + }, + "engines": { + "node": ">=8.0" + } + }, "node_modules/screenfull": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/screenfull/-/screenfull-5.2.0.tgz", diff --git a/package.json b/package.json index 575abb02d..4a812ef13 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "react-router-dom": "5.3.4", "react-twitter-embed": "3.0.3", "react-use": "17.5.1", - "scratch-parser": "5.2.1", + "scratch-parser": "6.0.0", "scratch-storage": "2.3.284" }, "devDependencies": { From ee8d1bafbc7b8210f0795a1a7ae3d6c8a6443a45 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 16:02:52 +0000 Subject: [PATCH 21/36] chore(deps): update dependency scratch-gui to v5 --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index fbf11dcab..1c7722bd4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -111,7 +111,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.81.0", "sass-loader": "10.5.2", - "scratch-gui": "4.1.7", + "scratch-gui": "5.0.1", "scratch-l10n": "5.0.0", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", @@ -22180,11 +22180,11 @@ } }, "node_modules/scratch-gui": { - "version": "4.1.7", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-4.1.7.tgz", - "integrity": "sha512-DZHERBC95J4rRE//OXytfnzPksZVir4zp3TVyvhv1xME9f8GJRbFFYe9ZTptSjZWyk2boUGlbu+ad0uE/x+A0A==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-5.0.1.tgz", + "integrity": "sha512-BTQUodIDYunIBZ5T3bST41kn0/Qm/kXhDXJveh221M639nBX5JRQhygKtg3bXo72eLwl4KC1GoUaBuB53y1P4A==", "dev": true, - "license": "BSD-3-Clause", + "license": "AGPL-3.0-only", "dependencies": { "@microbit/microbit-universal-hex": "^0.2.2", "arraybuffer-loader": "^1.0.6", diff --git a/package.json b/package.json index 47e8b5d09..93b72a78f 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.81.0", "sass-loader": "10.5.2", - "scratch-gui": "4.1.7", + "scratch-gui": "5.0.1", "scratch-l10n": "5.0.0", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", From 8cfa8f2736d05ef0ee2ccd989ab90047c95fdcf5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 17:26:32 +0000 Subject: [PATCH 22/36] fix(deps): update dependency scratch-l10n to v5.0.2 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1c7722bd4..731589aef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "5.0.1", - "scratch-l10n": "5.0.0", + "scratch-l10n": "5.0.2", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22465,9 +22465,9 @@ } }, "node_modules/scratch-l10n": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.0.tgz", - "integrity": "sha512-kFZbaOtsttxznLMLmwjm0uwGVmv5GtPddGVs5LFSjMxSOKinuOsJcGb+udU5+gPWBFvptI4BT4yfZUeQuP93Tg==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.2.tgz", + "integrity": "sha512-2gRKJrqqy1u5HGuAX1wYqRfJwRVfNKfNVjgkL9NYsKwzgc8JSbppdyCnthUdgvhGw/QyWe85dzVX9q8k2lPNrQ==", "dev": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 93b72a78f..700d4df6f 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "5.0.1", - "scratch-l10n": "5.0.0", + "scratch-l10n": "5.0.2", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From ee23daa115ba2045280032a8749e29280e5e48f7 Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com> Date: Tue, 26 Nov 2024 10:28:19 -0800 Subject: [PATCH 23/36] feat: add 2024 EOY campaign to DonateTopBanner --- src/views/splash/donate/donate-banner.jsx | 36 ++++++++------------- src/views/splash/l10n.json | 1 + test/unit/components/donate-banner.test.jsx | 12 +++---- 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/src/views/splash/donate/donate-banner.jsx b/src/views/splash/donate/donate-banner.jsx index f659a9420..68ac531b9 100644 --- a/src/views/splash/donate/donate-banner.jsx +++ b/src/views/splash/donate/donate-banner.jsx @@ -8,13 +8,19 @@ const Button = require('../../../components/forms/button.jsx'); require('./donate-banner.scss'); -const donateURL = 'https://www.scratchfoundation.org/donate'; +const SCRATCH_CAMPAIGN_BANNER_END_TIME = new Date(2025, 0, 9).getTime(); // January 9, 2025 (months are zero indexed) -const navigateToDonatePage = () => { - window.location = donateURL; +const donateInfo = (Date.now() < SCRATCH_CAMPAIGN_BANNER_END_TIME) ? { + bannerText: , + buttonLink: 'https://www.scratchfoundation.org/donate?utm_source=SCRATCH&utm_medium=BANNER&utm_campaign=EOY_GIVING' +} : { + bannerText: , + buttonLink: 'https://www.scratchfoundation.org/donate' }; -const SCRATCH_CELBRATION_BANNER_END_TIME = new Date(2022, 4, 21).getTime(); // May 21 2022 (months are zero indexed) +const navigateToDonatePage = () => { + window.location = donateInfo.buttonLink; +}; // track clicks going out to the donate page from this banner const captureOutboundLinkToDonate = () => { @@ -36,25 +42,9 @@ const DonateTopBanner = ({ src="/images/ideas/try-it-icon.svg" />

- {(Date.now() < SCRATCH_CELBRATION_BANNER_END_TIME) ? - ( -

- - - - ) - }} - /> -

- ) : ( -

- -

- )} +

+ {donateInfo.bannerText} +