scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 15:47:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #6626 from LLK/release/2022-03-09

Browse source 
[Master] release/2022-03-09
This commit is contained in:
Tom Lum 2022-03-10 11:09:51 -05:00 committed by GitHub
commit ad46292edd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 1031 additions and 35857 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36764
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

19
package.json
View file

@ -17,6 +17,7 @@
"test:unit:convertReportToXunit": "tap ./test/results/unit-raw.tap --no-coverage -R xunit > ./test/results/unit-tap-results.xml",
"test:coverage": "tap ./test/{unit-legacy,localization-legacy}/ --coverage --coverage-report=lcov",
"build": "npm run clean && npm run translate && NODE_OPTIONS=--max_old_space_size=8000 webpack --bail",
"build:analyze": "ANALYZE_BUNDLE=true npm run build",
"clean": "rm -rf ./build && rm -rf ./intl && mkdir -p build && mkdir -p intl",
"deploy": "npm run deploy:s3 && npm run deploy:fastly && npm run deploy:announce",
"deploy:fastly": "node ./bin/configure-fastly.js",
@ -75,12 +76,12 @@
"babel-preset-es2015": "6.22.0",
"babel-preset-react": "6.22.0",
"bowser": "1.9.4",
"canvas": "^2.9.0",
"canvas": "2.9.0",
"chromedriver": "96.0.0",
"classnames": "2.2.5",
"cookie": "0.4.1",
"copy-webpack-plugin": "4.6.0",
"css-loader": "0.23.1",
"copy-webpack-plugin": "6.4.1",
"css-loader": "5.2.7",
"email-validator": "2.0.4",
"enzyme": "3.10.0",
"enzyme-adapter-react-16": "1.14.0",
@ -99,7 +100,7 @@
"html-webpack-plugin": "3.2.0",
"iso-3166-2": "0.4.0",
"jest": "23.6.0",
"jest-canvas-mock": "^2.3.1",
"jest-canvas-mock": "2.3.1",
"jest-junit": "12.0.0",
"keymirror": "0.1.1",
"lodash.bindall": "4.4.0",
@ -108,9 +109,8 @@
"lodash.mergewith": "4.6.2",
"lodash.omit": "3.1.0",
"lodash.uniqby": "4.7.0",
"mini-css-extract-plugin": "^1.6.2",
"mini-css-extract-plugin": "1.6.2",
"minilog": "2.0.8",
"sass": "1.49.7",
"pako": "0.2.8",
"plotly.js": "1.47.4",
"postcss": "8.4.6",
@ -132,16 +132,17 @@
"redux-mock-store": "1.5.4",
"redux-thunk": "2.0.1",
"regenerator-runtime": "0.13.9",
"sass": "1.49.7",
"sass-loader": "10.2.1",
"scratch-gui": "0.1.0-prerelease.20220302125034",
"scratch-l10n": "3.14.20220302031532",
"scratch-gui": "0.1.0-prerelease.20220309063427",
"scratch-l10n": "3.14.20220309031549",
"selenium-webdriver": "4.1.0",
"slick-carousel": "1.6.0",
"style-loader": "0.12.3",
"tap": "14.11.0",
"url-loader": "2.3.0",
"webpack": "4.46.0",
"webpack-bundle-analyzer": "4.4.2",
"webpack-bundle-analyzer": "4.5.0",
"webpack-cli": "3.3.12",
"webpack-dev-middleware": "5.3.1",
"xhr": "2.2.0"

4
src/components/forms/select.scss
View file

@ -11,7 +11,7 @@
margin-bottom: .75rem;
border: 1px solid $active-gray;
border-radius: 5px;
background: $ui-light-gray url("../../../static/svgs/forms/caret.svg") no-repeat right center;
background: $ui-light-gray url("/svgs/forms/caret.svg") no-repeat right center;
padding-right: 4rem;
padding-left: 1rem;
width: 100%;
@ -43,7 +43,7 @@
&:focus,
&:hover {
background: $ui-light-gray url("../../../static/svgs/forms/caret-hover.svg") no-repeat right center;
background: $ui-light-gray url("/svgs/forms/caret-hover.svg") no-repeat right center;
}
> option {

13
src/components/page/www/page.jsx
View file

@ -6,11 +6,9 @@ const Navigation = require('../../navigation/www/navigation.jsx');
const Footer = require('../../footer/www/footer.jsx');
const DonorRecognition = require('./donor-recognition.jsx');
const ErrorBoundary = require('../../errorboundary/errorboundary.jsx');
const WarningBanner = require('../../title-banner/warning-banner.jsx');
// Mandrill outage banner
const MANDRILL_OUTAGE_START_TIME = 1578718800000; // 2020-01-11 12:00:00
const MANDRILL_OUTAGE_END_TIME = 1578747600000; // 2020-01-11 08:00:00
const today = new Date();
const semi = today.getDate() === 1 && today.getMonth() === 3;
const Page = ({
children,
@ -28,12 +26,6 @@ const Page = ({
<Navigation />
</div>
<div id="view">
{(Date.now() >= MANDRILL_OUTAGE_START_TIME && Date.now() < MANDRILL_OUTAGE_END_TIME) && (
<WarningBanner>
We are experiencing a disruption with email delivery.
If you are not receiving emails from us, please try after 8am EST.
</WarningBanner>
)}
{children}
</div>
<div id="footer">
@ -45,6 +37,7 @@ const Page = ({
</div>
}
</div>
{semi && <div style={{color: '#fff'}}>{';'}</div>}
</ErrorBoundary>
);

2
src/l10n.json
View file

@ -399,7 +399,7 @@
"comment.pii.content3": "This is a serious safety issue.",
"comment.type.unconstructive": "It appears that your most recent comment was saying something that might have been hurtful.",
"comment.type.unconstructive.past": "It appears that one of your recent comments was saying something that might have been hurtful.",
"comment.unconstructive.header": "We encourage you to be supportive when commenting on other people’s projects",
"comment.unconstructive.header": "We encourage you to be supportive when commenting on other people’s projects.",
"comment.unconstructive.content1": "It appears that your comment was saying something that might have been hurtful.",
"comment.unconstructive.content2": "If you think something could be better, you can say something you like about the project, and make a suggestion about how to improve it.",
"comment.type.vulgarity": "Your most recent comment appeared to include a bad word.",

1
src/views/preview/comment/compose-comment.jsx
View file

@ -360,6 +360,7 @@ class ComposeComment extends React.Component {
type="textarea"
value={this.state.message}
onInput={this.handleInput}
autoFocus={this.props.isReply}
/>
<FlexRow className="compose-bottom-row">
<Button

5
src/views/preview/preview.scss
View file

@ -482,8 +482,13 @@ $stage-width: 480px;
white-space: pre-line;
font-size: 1rem;
line-height: 1.5rem;
text-align: left;
flex: 1;
overflow-wrap: break-word;
@media #{$medium-and-smaller} {
text-align: center;
}
}
.project-description:last-of-type {

80
webpack.config.js
View file

@ -96,7 +96,12 @@ module.exports = {
test: /\.scss$/,
use: [
MiniCssExtractPlugin.loader,
'css-loader',
{
loader: 'css-loader',
options: {
url: false
}
},
{
loader: 'postcss-loader',
options: {
@ -114,7 +119,12 @@ module.exports = {
test: /\.css$/,
use: [
MiniCssExtractPlugin.loader,
'css-loader',
{
loader: 'css-loader',
options: {
url: false
}
},
{
loader: 'postcss-loader',
options: {
@ -166,28 +176,50 @@ module.exports = {
}, templateConfig));
})
).concat([
new CopyWebpackPlugin([
{from: 'static'},
{from: 'intl', to: 'js'}
]),
new CopyWebpackPlugin([{
from: 'node_modules/scratch-gui/dist/static/blocks-media',
to: 'static/blocks-media'
}]),
new CopyWebpackPlugin([{
from: 'node_modules/scratch-gui/dist/chunks',
to: 'static/chunks'
}]),
new CopyWebpackPlugin([{
from: 'node_modules/scratch-gui/dist/extension-worker.js'
}]),
new CopyWebpackPlugin([{
from: 'node_modules/scratch-gui/dist/extension-worker.js.map'
}]),
new CopyWebpackPlugin([{
from: 'node_modules/scratch-gui/dist/static/assets',
to: 'static/assets'
}]),
new CopyWebpackPlugin({
patterns: [
{from: 'static'},
{from: 'intl', to: 'js'}
]
}),
new CopyWebpackPlugin({
patterns: [
{
from: 'node_modules/scratch-gui/dist/static/blocks-media',
to: 'static/blocks-media'
}
]
}),
new CopyWebpackPlugin({
patterns: [
{
from: 'node_modules/scratch-gui/dist/chunks',
to: 'static/chunks'
}
]
}),
new CopyWebpackPlugin({
patterns: [
{
from: 'node_modules/scratch-gui/dist/extension-worker.js'
}
]
}),
new CopyWebpackPlugin({
patterns: [
{
from: 'node_modules/scratch-gui/dist/extension-worker.js.map'
}
]
}),
new CopyWebpackPlugin({
patterns: [
{
from: 'node_modules/scratch-gui/dist/static/assets',
to: 'static/assets'
}
]
}),
new webpack.DefinePlugin({
'process.env.NODE_ENV': '"' + (process.env.NODE_ENV || 'development') + '"',
'process.env.API_HOST': '"' + (process.env.API_HOST || 'https://api.scratch.mit.edu') + '"',