Skip to content
This repository has been archived by the owner on Jun 10, 2019. It is now read-only.

Upgrade React 16 - FINAL #549

Merged
merged 18 commits into from
Oct 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4a6c684
Merge branch 'master' of https://github.com/OperationCode/operationco…
sethbergman Aug 23, 2017
302e239
deleted analytics folder
sethbergman Aug 23, 2017
21f314a
Merge branch 'master' of https://github.com/OperationCode/operationco…
sethbergman Aug 31, 2017
130caf4
Merge branch 'master' of https://github.com/OperationCode/operationco…
sethbergman Sep 2, 2017
460813f
updates
sethbergman Sep 2, 2017
a6febe5
Merge branch 'master' of https://github.com/OperationCode/operationco…
sethbergman Sep 11, 2017
dcc5b81
deleted mobile scene from local branch
sethbergman Sep 11, 2017
a27b0f4
Merge branch 'master' of https://github.com/OperationCode/operationco…
sethbergman Sep 29, 2017
4e79254
Merge branch 'master' of https://github.com/OperationCode/operationco…
sethbergman Oct 1, 2017
5576dbc
Merge branch 'master' of https://github.com/OperationCode/operationco…
sethbergman Oct 1, 2017
cebe828
added correct files
sethbergman Oct 2, 2017
e1c7259
Merge branch 'upgrade-react-16' of https://github.com/OperationCode/o…
sethbergman Oct 2, 2017
8d3df07
Merge pull request #542 from OperationCode/upgrade-react-16
kylemh Oct 2, 2017
6c9ad3f
Merge remote-tracking branch 'origin/React-v16' into upgrade-react-16
sethbergman Oct 2, 2017
cafd4ac
finally fixed this PR mess!
sethbergman Oct 2, 2017
596ef14
Merge branch 'master' into upgrade-react-16
sethbergman Oct 2, 2017
44a0fba
Upgrade React 16 (#12)
sethbergman Oct 2, 2017
bce9b38
Merge branch 'React-v16' into upgrade-react-16
sethbergman Oct 2, 2017
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
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ ENV IN_DOCKER true
RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app

# Install app dependencies
# Copy dependencies
COPY package.json /usr/src/app/
COPY yarn.lock /usr/src/app/
# Remove node_modules
RUN rm -rf node_modules
# Install dependencies
RUN yarn install --no-progress

# Bundle app source
Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
NODE_CONTAINER := web

# Remove temporary files, build artifacts, and vendor dependencies (node_modules).
.PHONY: clean
clean: clean
rm -rf node_modules

.PHONY: build
build:
docker-compose build
Expand All @@ -23,4 +28,3 @@ travis: build_site build test
.PHONY: backend
backend:
bin/run_backend.sh

15 changes: 10 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "operationcode_frontend",
"version": "0.1.0",
"version": "0.1.1",
"private": true,
"dependencies": {
"axios": "^0.16.1",
Expand All @@ -15,12 +15,12 @@
"prop-types": "^15.5.8",
"query-string": "^4.3.4",
"rc-progress": "^2.2.2",
"react": "^15.5.4",
"react-dom": "^15.5.4",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-error-overlay": "^1.0.7",
"react-ga": "^2.2.0",
"react-icons": "^2.2.5",
"react-modal": "^1.7.7",
"react-modal": "^2.3.2",
"react-router": "^4.1.1",
"react-router-dom": "^4.1.1",
"react-scroll": "^1.5.4",
Expand Down Expand Up @@ -116,5 +116,10 @@
"react-app"
]
},
"homepage": "http://frontend.operationcode.org/"
"homepage": "http://frontend.operationcode.org/",
"description": "Operation Code Frontend",
"main": "server.js",
"repository": "https://github.com/OperationCode/operationcode_frontend.git",
"author": "Operation Code Frontend Team",
"license": "MIT"
}
66 changes: 51 additions & 15 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2710,6 +2710,10 @@ [email protected]:
version "1.2.0"
resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.0.tgz#3835f127abf075bfe082d0aed4484057c78e3c89"

exenv@^1.2.0:
version "1.2.2"
resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d"

exit-hook@^1.0.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
Expand Down Expand Up @@ -2822,6 +2826,18 @@ fb-watchman@^2.0.0:
dependencies:
bser "^2.0.0"

fbjs@^0.8.16:
version "0.8.16"
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
dependencies:
core-js "^1.0.0"
isomorphic-fetch "^2.1.1"
loose-envify "^1.0.0"
object-assign "^4.1.0"
promise "^7.1.1"
setimmediate "^1.0.5"
ua-parser-js "^0.7.9"

fbjs@^0.8.9:
version "0.8.12"
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04"
Expand Down Expand Up @@ -5546,7 +5562,15 @@ [email protected]:
dependencies:
fbjs "^0.8.9"

prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@~15.5.7:
prop-types@^15.5.10, prop-types@^15.6.0:
version "15.6.0"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.3.1"
object-assign "^4.1.1"

prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8:
version "15.5.10"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
dependencies:
Expand Down Expand Up @@ -5703,14 +5727,18 @@ react-docgen@^2.12.1:
node-dir "^0.1.10"
recast "^0.11.5"

react-dom@^15.5.4:
version "15.5.4"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.5.4.tgz#ba0c28786fd52ed7e4f2135fe0288d462aef93da"
react-dom-factories@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/react-dom-factories/-/react-dom-factories-1.0.2.tgz#eb7705c4db36fb501b3aa38ff759616aa0ff96e0"

react-dom@^16.0.0:
version "16.0.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.0.0.tgz#9cc3079c3dcd70d4c6e01b84aab2a7e34c303f58"
dependencies:
fbjs "^0.8.9"
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.0"
prop-types "~15.5.7"
object-assign "^4.1.1"
prop-types "^15.6.0"

react-error-overlay@^1.0.7:
version "1.0.7"
Expand Down Expand Up @@ -5793,7 +5821,7 @@ react-komposer@^2.0.0:
react-stubber "^1.0.0"
shallowequal "^0.2.2"

react-modal@^1.2.0, react-modal@^1.2.1, react-modal@^1.7.7:
react-modal@^1.2.0, react-modal@^1.2.1:
version "1.7.7"
resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-1.7.7.tgz#70205f51c58708c487aff681ba3fed7946e391d9"
dependencies:
Expand All @@ -5803,6 +5831,14 @@ react-modal@^1.2.0, react-modal@^1.2.1, react-modal@^1.7.7:
lodash.assign "^4.2.0"
prop-types "^15.5.7"

react-modal@^2.3.2:
version "2.3.2"
resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-2.3.2.tgz#af9d625da218461de3e87551609dfca12d8d4946"
dependencies:
exenv "^1.2.0"
prop-types "^15.5.10"
react-dom-factories "^1.0.0"

react-router-dom@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.1.1.tgz#3021ade1f2c160af97cf94e25594c5f294583025"
Expand Down Expand Up @@ -5868,14 +5904,14 @@ react-table@^6.0.5:
classnames "^2.2.5"
react-json-tree "^0.10.9"

react@^15.5.4:
version "15.5.4"
resolved "https://registry.yarnpkg.com/react/-/react-15.5.4.tgz#fa83eb01506ab237cdc1c8c3b1cea8de012bf047"
react@^16.0.0:
version "16.0.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.0.0.tgz#ce7df8f1941b036f02b2cca9dbd0cb1f0e855e2d"
dependencies:
fbjs "^0.8.9"
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.0"
prop-types "^15.5.7"
object-assign "^4.1.1"
prop-types "^15.6.0"

read-all-stream@^3.0.0:
version "3.1.0"
Expand Down Expand Up @@ -7397,4 +7433,4 @@ yargs@~3.10.0:
camelcase "^1.0.2"
cliui "^2.1.0"
decamelize "^1.0.0"
window-size "0.1.0"
window-size "0.1.0"