mirror of
https://github.com/scratchfoundation/scratch-www.git
synced 2025-02-17 00:21:20 -05:00
Merge pull request #370 from thisandagain/feature/node
Prepare for migration to Node 4.2 LTS
This commit is contained in:
commit
14e28739bc
2 changed files with 19 additions and 15 deletions
10
.travis.yml
10
.travis.yml
|
@ -1,5 +1,6 @@
|
|||
language: node_js
|
||||
node_js: '0.12'
|
||||
node_js:
|
||||
- '4.2'
|
||||
sudo: false
|
||||
cache:
|
||||
directories:
|
||||
|
@ -11,12 +12,19 @@ env:
|
|||
global:
|
||||
- secure: A138rYuXDsOmpEwYxZ31WyXEeq5fgr9qyqsQh1nTFsjBKpFtNM+CN9e0QJQFT3PLs4wH/lWTRSyHxakxKQS1sxq828f9gHed+f15REKk/fRUplcCYIexT9xKVtU3D8CRNn/KBFWk75fZyZt20eyOVIv4h3pInKQz7y84J6PWzB1BCrAFvADrzS1X68Z3NJJLyxnz0YEurzz8mC2v4D0s/XifKTWvRtefD4QM6pE0C2iYyk+ThrLwg7i9FDHVfo0MrkgcdX7mz37SnTr7p7mHWnGXrGngi/NiDRQ+Uwwq/sr2UIww0rCwS1xsOcS//dC4NNqrrt1kUTsoC1Yt87Ny+gI0nUplsfEpdKajAkOYdANC5bJUGqPdSlOds1v9aJs9Hx48uGamWkm/3cFmoJ5uA2ZzUwbSGjTkWbnhwzT0YRvcLGhP1WE/EswaIyK5qMp522E79mP1yH6M750iUvi4N39+QW1BNX3ADkOwyAI67ArX5on5gWP83RXcJ15im7XsBpsmVn/KXi6AouWPb8jmSmKCj0QZCzfLY7ivM42IugYpK2NV7kFB38DpXQamJ5eskgwYa3elRmednIFUuwb1QDnONvJogVjk4CLmoSxssC2mJnnrUItM7l8G6As81GMI+6lTtl86hAuXBjUk60FMbgTAQDX9ll26LgpBy8jHSx8=
|
||||
- secure: EX1fyov+f6ytWN2ZSL4dLslwrVkp6Ho/uoSLO38/qNG3XdGmBN4VprxddcQiWfo+Mrg3GdWcfcM/VazhhStBi1uLfZiw3RHZaSGuWbiuD2EtzqtlC+OVvoajgy91QFajh9Zzuwa0rYbEPd/sw01R53NoWJYl0GSteWk7C8Wv6anl4FUJCqgvvTV2ZEcyTtGcVJgUhKi1MfNpTSM6JWBy0DWszcyxj7C8LSs1+l9ZjAtnlUBWY13HsrNu8G5d+FwqGHZLUAjdu2O602wxV897/xLARLduZ+01ALpVefNEEGMB1Wd+xMw4dm2B0Uk86a4TBRCeOgJZ1yoJoPpGPOHTo+dgNXcU8ReszGVoy7uOjFWwu82FQq8gzfcf75yzaRJgG8/BJ6BkJfa0EmFg3iO5CwixQyHR5+CqsedtoLAWVT8zlOfQ/Z6yx4Pm7jXQSOkyvo09YJ2QIn4IFGPvwOVS7Firzi+fLl8GYApeSV9G10e1IzA4pPrKdJMRA4qRMPt9zJGq7ZO1J/d9aW/5KIsJUDnodnl7yXJyDMOyNeljT9I82ciHZcURxRRY080vrW6dgNJE1V9jxBhWEvr2iCeWMMedWaGuC41I7K9L79eW8lmaE+cQ+OZrzpOJP4GbfmIiXrh+0M4ChL/xBpjtiFwpNdkCXXhzWMnjJ4wCrii4yuc=
|
||||
- CXX=g++-4.8
|
||||
- EB_REGION=us-east-1
|
||||
- EB_APP=scratch-www
|
||||
- EB_AWS_BUCKET_NAME=elasticbeanstalk-us-east-1-307680192167
|
||||
- SKIP_CLEANUP=true
|
||||
- ELASTIC_BEANSTALK_LABEL=${TRAVIS_COMMIT:0:5}
|
||||
- BUILD_ARCHIVE=$ELASTIC_BEANSTALK_LABEL.zip
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
packages:
|
||||
- g++-4.8
|
||||
before_deploy:
|
||||
- zip -qr $BUILD_ARCHIVE .
|
||||
deploy:
|
||||
|
|
24
package.json
24
package.json
|
@ -21,14 +21,14 @@
|
|||
},
|
||||
"homepage": "https://github.com/llk/scratch-www#readme",
|
||||
"dependencies": {
|
||||
"bunyan": "1.5.1",
|
||||
"compression": "1.5.2",
|
||||
"express": "4.13.3",
|
||||
"bunyan": "1.7.1",
|
||||
"compression": "1.6.1",
|
||||
"express": "4.13.4",
|
||||
"express-http-proxy": "0.6.0",
|
||||
"lodash.defaults": "3.1.2",
|
||||
"mustache": "2.1.3",
|
||||
"newrelic": "1.22.1",
|
||||
"raven": "0.8.1"
|
||||
"lodash.defaults": "4.0.1",
|
||||
"mustache": "2.2.1",
|
||||
"newrelic": "1.25.4",
|
||||
"raven": "0.10.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"autoprefixer-loader": "2.1.0",
|
||||
|
@ -52,10 +52,7 @@
|
|||
"minilog": "2.0.8",
|
||||
"node-sass": "3.3.3",
|
||||
"po2icu": "git://github.com/LLK/po2icu.git#develop",
|
||||
"react": "0.14.0",
|
||||
"react-addons-test-utils": "0.14.0",
|
||||
"react-dom": "0.14.0",
|
||||
"react-intl": "2.0.0-beta-1",
|
||||
"react-addons-test-utils": "0.14.7",
|
||||
"react-modal": "0.6.1",
|
||||
"react-onclickoutside": "4.1.1",
|
||||
"react-slick": "0.9.2",
|
||||
|
@ -67,11 +64,10 @@
|
|||
"source-map-support": "0.3.2",
|
||||
"style-loader": "0.12.3",
|
||||
"tap": "2.0.0",
|
||||
"tape": "4.2.0",
|
||||
"url-loader": "0.5.6",
|
||||
"watch": "0.16.0",
|
||||
"webpack": "1.12.2",
|
||||
"webpack": "1.12.14",
|
||||
"webpack-dev-middleware": "1.2.0",
|
||||
"xhr": "2.0.4"
|
||||
"xhr": "2.2.0"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue