Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgraded react to 0.14.3 #687

Merged
merged 1 commit into from
Nov 24, 2015
Merged

Upgraded react to 0.14.3 #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:
- go get $WEAVE_REPO/...
- make deps
- "mkdir -p $(dirname $SRCDIR) && cp -r $(pwd)/ $SRCDIR"
- "cd $SRCDIR/client; ../tools/rebuild-image weaveworks/scope-ui-build . Dockerfile package.json webpack.production.config.js .eslintrc && touch $SRCDIR/.scope_ui_build.uptodate"
- "cd $SRCDIR/client; ../tools/rebuild-image weaveworks/scope-ui-build . Dockerfile package.json webpack.production.config.js .eslintrc .babelrc && touch $SRCDIR/.scope_ui_build.uptodate"
- "cd $SRCDIR/backend; ../tools/rebuild-image weaveworks/scope-backend-build . Dockerfile build.sh && touch $SRCDIR/.scope_backend_build.uptodate"
- "make -C $SRCDIR/tools/runner && mkdir -p $WEAVE_ROOT/tools/runner && cp $SRCDIR/tools/runner/runner $WEAVE_ROOT/tools/runner"

Expand Down
10 changes: 5 additions & 5 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"lodash": "~3.10.1",
"materialize-css": "0.97.2",
"page": "1.6.4",
"react": "0.14.2",
"react-addons-pure-render-mixin": "0.14.2",
"react-addons-transition-group": "0.14.2",
"react-addons-update": "0.14.2",
"react-dom": "0.14.2",
"react": "0.14.3",
"react-addons-pure-render-mixin": "0.14.3",
"react-addons-transition-group": "0.14.3",
"react-addons-update": "0.14.3",
"react-dom": "0.14.3",
"react-motion": "0.3.1",
"reqwest": "~2.0.5",
"timely": "0.1.0"
Expand Down
3 changes: 2 additions & 1 deletion client/webpack.production.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ var autoprefixer = require('autoprefixer');
var path = require('path');

var GLOBALS = {
__WS_URL__: 'false'
__WS_URL__: 'false',
'process.env': {NODE_ENV: '"production"'}
};

/**
Expand Down