mirror of
https://github.com/scratchfoundation/scratch-www.git
synced 2024-11-24 08:08:18 -05:00
chore: resolved merge conflicts
This commit is contained in:
MiroslavDionisiev
commit
ff9a54bfdd
8 changed files with 2436 additions and 5186 deletions
7515
package-lock.json
generated
7515
package-lock.json
generated
File diff suppressed because it is too large
Load diff
49
package.json
49
package.json
|
|
@ -47,7 +47,7 @@
|
|||
"bunyan": "1.8.15",
|
||||
"clipboard-copy": "2.0.1",
|
||||
"driver.js": "^1.3.1",
|
||||
"express": "4.19.2",
|
||||
"express": "4.21.1",
|
||||
"express-http-proxy": "1.6.3",
|
||||
"lodash.defaults": "4.2.0",
|
||||
"lodash.get": "4.4.2",
|
||||
|
|
@ -58,30 +58,31 @@
|
|||
"react-twitter-embed": "3.0.3",
|
||||
"react-use": "17.5.1",
|
||||
"scratch-parser": "5.2.1",
|
||||
"scratch-storage": "2.3.229"
|
||||
"scratch-storage": "2.3.280"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/cli": "7.24.8",
|
||||
"@babel/core": "7.25.2",
|
||||
"@babel/eslint-parser": "7.25.1",
|
||||
"@babel/cli": "7.25.7",
|
||||
"@babel/core": "7.25.8",
|
||||
"@babel/eslint-parser": "7.25.8",
|
||||
"@babel/plugin-syntax-dynamic-import": "7.8.3",
|
||||
"@babel/plugin-transform-async-to-generator": "7.24.7",
|
||||
"@babel/plugin-transform-object-rest-spread": "7.24.7",
|
||||
"@babel/preset-env": "7.25.4",
|
||||
"@babel/preset-react": "7.24.7",
|
||||
"@formatjs/intl-datetimeformat": "6.12.5",
|
||||
"@babel/plugin-transform-async-to-generator": "7.25.7",
|
||||
"@babel/plugin-transform-object-rest-spread": "7.25.8",
|
||||
"@babel/preset-env": "7.25.8",
|
||||
"@babel/preset-react": "7.25.7",
|
||||
"@formatjs/intl-datetimeformat": "6.14.0",
|
||||
"@formatjs/intl-locale": "3.4.6",
|
||||
"@formatjs/intl-numberformat": "8.10.3",
|
||||
"@formatjs/intl-pluralrules": "5.2.14",
|
||||
"@formatjs/intl-relativetimeformat": "11.2.14",
|
||||
"@types/jest": "29.5.12",
|
||||
"@formatjs/intl-numberformat": "8.12.0",
|
||||
"@formatjs/intl-pluralrules": "5.2.16",
|
||||
"@formatjs/intl-relativetimeformat": "11.2.16",
|
||||
"@types/jest": "29.5.13",
|
||||
"async": "3.2.6",
|
||||
"autoprefixer": "10.4.20",
|
||||
"babel-loader": "8.3.0",
|
||||
"babel-loader": "8.4.1",
|
||||
"babel-plugin-transform-require-context": "0.1.1",
|
||||
"bowser": "1.9.4",
|
||||
"buffer": "6.0.3",
|
||||
"canvas": "2.11.2",
|
||||
"cheerio": "1.0.0-rc.3",
|
||||
"classnames": "2.5.1",
|
||||
"cookie": "0.4.1",
|
||||
"copy-webpack-plugin": "6.4.1",
|
||||
|
|
@ -90,11 +91,11 @@
|
|||
"emit-file-webpack-plugin": "2.0.1",
|
||||
"enzyme": "3.11.0",
|
||||
"enzyme-adapter-react-16": "1.15.8",
|
||||
"eslint": "8.57.0",
|
||||
"eslint-config-scratch": "9.0.8",
|
||||
"eslint": "8.57.1",
|
||||
"eslint-config-scratch": "9.0.9",
|
||||
"eslint-plugin-jest": "27.9.0",
|
||||
"eslint-plugin-json": "2.1.2",
|
||||
"eslint-plugin-react": "7.35.0",
|
||||
"eslint-plugin-react": "7.37.1",
|
||||
"eslint-plugin-react-hooks": "4.6.2",
|
||||
"fastly": "1.2.1",
|
||||
"file-loader": "6.2.0",
|
||||
|
|
@ -122,7 +123,7 @@
|
|||
"minilog": "2.1.0",
|
||||
"pako": "0.2.8",
|
||||
"plotly.js": "1.47.4",
|
||||
"postcss": "8.4.40",
|
||||
"postcss": "8.4.47",
|
||||
"postcss-import": "12.0.1",
|
||||
"postcss-loader": "4.3.0",
|
||||
"postcss-simple-vars": "5.0.2",
|
||||
|
|
@ -143,18 +144,18 @@
|
|||
"redux-mock-store": "1.5.4",
|
||||
"redux-thunk": "2.4.2",
|
||||
"regenerator-runtime": "0.13.9",
|
||||
"sass": "1.77.8",
|
||||
"sass": "1.79.5",
|
||||
"sass-loader": "10.5.2",
|
||||
"scratch-gui": "4.0.14",
|
||||
"scratch-l10n": "3.18.283",
|
||||
"selenium-webdriver": "4.23.0",
|
||||
"scratch-gui": "4.0.38",
|
||||
"scratch-l10n": "3.18.341",
|
||||
"selenium-webdriver": "4.25.0",
|
||||
"slick-carousel": "1.8.1",
|
||||
"stream-browserify": "3.0.0",
|
||||
"style-loader": "4.0.0",
|
||||
"tap": "14.11.0",
|
||||
"url-loader": "3.0.0",
|
||||
"use-onclickoutside": "0.4.1",
|
||||
"webpack": "5.94.0",
|
||||
"webpack": "5.95.0",
|
||||
"webpack-bundle-analyzer": "4.10.2",
|
||||
"webpack-cli": "5.1.4",
|
||||
"webpack-dev-middleware": "5.3.4",
|
||||
|
|
|
|||
|
|
@ -179,6 +179,11 @@ const Footer = props => (
|
|||
<FormattedMessage id="general.dmca" />
|
||||
</a>
|
||||
</dd>
|
||||
<dd>
|
||||
<a href="https://www.scratchfoundation.org/dsa/">
|
||||
<FormattedMessage id="general.dsa" />
|
||||
</a>
|
||||
</dd>
|
||||
</dl>
|
||||
|
||||
<dl>
|
||||
|
|
|
|||
|
|
@ -93,8 +93,21 @@ const messages = defineMessages({
|
|||
}
|
||||
});
|
||||
|
||||
const STEP_NAMES = [
|
||||
'pick-genre-step',
|
||||
'game-step',
|
||||
'animation-step',
|
||||
'music-step',
|
||||
'clicker-game-step',
|
||||
'pong-game-step',
|
||||
'animate-character-step',
|
||||
'make-fly-animation-step',
|
||||
'record-sound-step',
|
||||
'make-music-step'
|
||||
];
|
||||
|
||||
const projectIds = {
|
||||
clicker: '10000252',
|
||||
clicker: '10128368',
|
||||
pong: '10128515',
|
||||
animateCharacter: '10128067',
|
||||
makeItFly: '114019829',
|
||||
|
|
@ -198,6 +211,14 @@ const EditorJourney = ({onActivateDeck, setCanViewTutorialsHighlight, setShowJou
|
|||
() => ({
|
||||
popoverClass: 'gui-journey',
|
||||
overlayOpacity: 0,
|
||||
onDestroyStarted: () => {
|
||||
const stepName = STEP_NAMES[driverObj.getActiveIndex()] || '';
|
||||
triggerAnalyticsEvent({
|
||||
event: 'editor-journey-step',
|
||||
editorJourneyStep: `${stepName}-closed`
|
||||
});
|
||||
driverObj.destroy();
|
||||
},
|
||||
onDestroyed: () => {
|
||||
setShowJourney(false);
|
||||
},
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
"general.credits": "Our Team",
|
||||
"general.donors": "Donors",
|
||||
"general.dmca": "DMCA",
|
||||
"general.dsa": "DSA Requirements",
|
||||
"general.emailAddress": "Email address",
|
||||
"general.english": "English",
|
||||
"general.error": "Oops! Something went wrong",
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@ const api = require('./api');
|
|||
const sample = require('lodash.sample');
|
||||
|
||||
const USER_GUIDING_ID = process.env.USER_GUIDING_ID;
|
||||
const AUTONOMY_SURVEY_ID = 3048;
|
||||
const RELATIONSHIP_SURVEY_ID = 3049;
|
||||
const JOY_SURVEY_ID = 3050;
|
||||
const COMPETENCE_SURVEY_ID = 3045;
|
||||
const AUTONOMY_SURVEY_ID = 3677;
|
||||
const RELATIONSHIP_SURVEY_ID = 3678;
|
||||
const JOY_SURVEY_ID = 3679;
|
||||
const COMPETENCE_SURVEY_ID = 3676;
|
||||
const EDITOR_INTERACTION_SURVEY_IDS = [COMPETENCE_SURVEY_ID, JOY_SURVEY_ID];
|
||||
|
||||
const CONDITIONS = {condition_list: [
|
||||
|
|
|
|||
|
|
@ -160,6 +160,17 @@ describe('www-integration footer links', () => {
|
|||
const pathname = (new URL(url)).pathname;
|
||||
expect(pathname).toMatch(/^\/DMCA\/?$/);
|
||||
});
|
||||
|
||||
test('click DSA requirements link', async () => {
|
||||
await clickText('DSA Requirements');
|
||||
await waitUntilDocumentReady();
|
||||
const url = await driver.getCurrentUrl();
|
||||
expect(url).toBe('https://www.scratchfoundation.org/dsa/');
|
||||
|
||||
const pocText = await findText('DSA-PoC@scratch.org'); // shouldn't change with localization
|
||||
const pocTextVisible = await pocText.isDisplayed();
|
||||
expect(pocTextVisible).toBeTruthy();
|
||||
});
|
||||
});
|
||||
|
||||
// The following links in the footer are skipped because they are not part of scratch-www
|
||||
|
|
|
|||
|
|
@ -248,14 +248,18 @@ module.exports = {
|
|||
to: 'static/chunks'
|
||||
},
|
||||
{
|
||||
from: 'node_modules/scratch-gui/dist/extension-worker.js'
|
||||
from: 'node_modules/scratch-gui/dist/extension-worker.js',
|
||||
to: 'js'
|
||||
},
|
||||
{
|
||||
from: 'node_modules/scratch-gui/dist/extension-worker.js.map'
|
||||
from: 'node_modules/scratch-gui/dist/extension-worker.js.map',
|
||||
to: 'js'
|
||||
},
|
||||
{
|
||||
from: 'node_modules/scratch-gui/dist/static/assets',
|
||||
to: 'static/assets'
|
||||
|
||||
// TODO: why do tutorials and extension icons expect these files in `js/`?
|
||||
to: 'js/static/assets'
|
||||
},
|
||||
{
|
||||
from: 'node_modules/scratch-gui/dist/*.hex',
|
||||
|
|
|
|||
Loading…
Reference in a new issue