scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-25 13:54:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #5002 from LLK/hotfix/dependency-updates

Browse source 
[Develop] Hotfix/dependency updates
This commit is contained in:
Karishma Chadha 2021-02-16 11:34:23 -05:00 committed by GitHub
commit 2d932a7979
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 3553 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml
View file

@ -6,7 +6,6 @@ group: deprecated-2017Q4
cache: cache:
directories: directories:
- /home/travis/virtualenv/python2.7/lib/python2.7/site-packages - /home/travis/virtualenv/python2.7/lib/python2.7/site-packages
- node_modules
notifications: notifications:
slack: slack:
secure: ezESiG7JnuSLZc2/PPhOvWUv5BHBCr+g86MsuLLw+S+zz3DUfzWHMQ1g5tUvkeSDTPmfEIX41EnPkaoWtsD3OGO0PGXgseAfA8+6Z4N1rICNZZrhXZB2s6UdwRK1e+0Jol4W3kHmt96BHyN2scLNgJYeWMgSJllVsuPhMTlKBZIXI9u540NH8Nxjl3f2WvoIg64Q1mZvMxkpPbw4xssx6U4HSFE8kTTE6+EFsSxzombFX0cLGjPiJ9QZgGVUk4UkIjyiFLQQDfQlLllCaUpqJ9+qbuCNoMSKA2yty/qyZ8Y+r4OlMberjmBzR9GRLLyXWWcaAfMIgwlRhjtLYIDAUSsGM1iwUWCgyB9maG2IiXuYLSueuMx8DcDwbpUepoDgnqBYnM2AJmT8gcsxqlKYzJpYpHDgZgBlLZQgMXqjrVJHs/Tf9XVcLS6HAn1Ww0OOT01jThfy4gClpAuqLayYexsXOoL+RaFg25E2NzuTtaFWgRfWZgcAeqYNDiUzwun2D4vZ5I+NtdRP0gzpbG2fxhFz05vAqyf1Kp6ZYb17Li3A38dIm6Lsvv3qawAIAgNaZpIZX3f89+uq6jHU8kJy1Iv823JK2Xac3vEz3SHUKJnuXFF0LO07om9AcNEXhP/JrJ617S8nfvDtZRJODMFhz8qQwie+65Ql1I871goBpVs= secure: ezESiG7JnuSLZc2/PPhOvWUv5BHBCr+g86MsuLLw+S+zz3DUfzWHMQ1g5tUvkeSDTPmfEIX41EnPkaoWtsD3OGO0PGXgseAfA8+6Z4N1rICNZZrhXZB2s6UdwRK1e+0Jol4W3kHmt96BHyN2scLNgJYeWMgSJllVsuPhMTlKBZIXI9u540NH8Nxjl3f2WvoIg64Q1mZvMxkpPbw4xssx6U4HSFE8kTTE6+EFsSxzombFX0cLGjPiJ9QZgGVUk4UkIjyiFLQQDfQlLllCaUpqJ9+qbuCNoMSKA2yty/qyZ8Y+r4OlMberjmBzR9GRLLyXWWcaAfMIgwlRhjtLYIDAUSsGM1iwUWCgyB9maG2IiXuYLSueuMx8DcDwbpUepoDgnqBYnM2AJmT8gcsxqlKYzJpYpHDgZgBlLZQgMXqjrVJHs/Tf9XVcLS6HAn1Ww0OOT01jThfy4gClpAuqLayYexsXOoL+RaFg25E2NzuTtaFWgRfWZgcAeqYNDiUzwun2D4vZ5I+NtdRP0gzpbG2fxhFz05vAqyf1Kp6ZYb17Li3A38dIm6Lsvv3qawAIAgNaZpIZX3f89+uq6jHU8kJy1Iv823JK2Xac3vEz3SHUKJnuXFF0LO07om9AcNEXhP/JrJ617S8nfvDtZRJODMFhz8qQwie+65Ql1I871goBpVs=
@ -108,16 +107,9 @@ addons:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- g++-4.8 - g++-4.8
before_install:
# package-lock.json was introduced in npm@5
- '[[ $(node -v) =~ ^v9.*$ ]] || npm install -g npm@latest' # skipped when using node 9
- npm install -g greenkeeper-lockfile
install: install:
- sudo -H pip install -r requirements.txt - sudo -H pip install -r requirements.txt
- npm --production=false install - npm --production=false ci
- npm --production=false --legacy-peer-deps update
before_script: greenkeeper-lockfile-update
after_script: greenkeeper-lockfile-upload
jobs: jobs:
include: include:
- stage: test - stage: test

3555
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

4
package.json
View file

@ -80,7 +80,7 @@
"enzyme": "3.10.0", "enzyme": "3.10.0",
"enzyme-adapter-react-16": "1.14.0", "enzyme-adapter-react-16": "1.14.0",
"eslint": "5.16.0", "eslint": "5.16.0",
"eslint-config-scratch": "5.0.0", "eslint-config-scratch": "6.0.0",
"eslint-plugin-cypress": "^2.0.1", "eslint-plugin-cypress": "^2.0.1",
"eslint-plugin-json": "2.0.1", "eslint-plugin-json": "2.0.1",
"eslint-plugin-react": "7.14.2", "eslint-plugin-react": "7.14.2",
@ -94,7 +94,6 @@
"glob": "5.0.15", "glob": "5.0.15",
"google-libphonenumber": "3.2.6", "google-libphonenumber": "3.2.6",
"html-webpack-plugin": "2.22.0", "html-webpack-plugin": "2.22.0",
"i": "^0.3.6",
"iso-3166-2": "0.4.0", "iso-3166-2": "0.4.0",
"jest": "^23.6.0", "jest": "^23.6.0",
"json-loader": "0.5.2", "json-loader": "0.5.2",
@ -112,7 +111,6 @@
"minilog": "2.0.8", "minilog": "2.0.8",
"node-dir": "0.1.16", "node-dir": "0.1.16",
"node-sass": "4.14.1", "node-sass": "4.14.1",
"npm": "^6.14.11",
"pako": "0.2.8", "pako": "0.2.8",
"plotly.js": "1.47.4", "plotly.js": "1.47.4",
"po2icu": "0.0.2", "po2icu": "0.0.2",

2
src/components/registration/steps.jsx
View file

@ -448,7 +448,7 @@ class DemographicsStep extends React.Component {
})); }));
} }
getYearOptions () { getYearOptions () {
return Array.apply(null, Array(100)).map((v, id) => { return Array(...Array(100)).map((v, id) => {
const year = (new Date().getFullYear() - (id + this.props.birthOffset)).toString(); const year = (new Date().getFullYear() - (id + this.props.birthOffset)).toString();
return {value: year, label: year}; return {value: year, label: year};
}); });

2
src/components/stepnavigation/stepnavigation.jsx
View file

@ -6,7 +6,7 @@ require('./stepnavigation.scss');
const StepNavigation = props => ( const StepNavigation = props => (
<ul className={classNames('step-navigation', props.className)}> <ul className={classNames('step-navigation', props.className)}>
{Array.apply(null, Array(props.steps)).map((v, step) => ( {Array(...Array(props.steps)).map((v, step) => (
<li <li
className={classNames({ className={classNames({
active: step < props.active, active: step < props.active,