Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
whats-open-web
Commits
9b7d4eb6
Commit
9b7d4eb6
authored
Jan 29, 2018
by
Andrew Hrdy
Browse files
Fixed issue with requiring redux dev tools. Closes
#29
. (Also set 2.1-dev to staging branch).
parent
67ade9f5
Pipeline
#2073
passed with stages
in 1 minute and 55 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
9b7d4eb6
...
@@ -25,7 +25,7 @@ deploy_staging:
...
@@ -25,7 +25,7 @@ deploy_staging:
name
:
staging
name
:
staging
url
:
https://whatsopen.gmu.io
url
:
https://whatsopen.gmu.io
only
:
only
:
-
master
-
2.1-dev
deploy_production
:
deploy_production
:
stage
:
deploy
stage
:
deploy
...
...
package-lock.json
View file @
9b7d4eb6
...
@@ -7617,6 +7617,11 @@
...
@@ -7617,6 +7617,11 @@
"sha.js"
:
"2.4.9"
"sha.js"
:
"2.4.9"
}
}
},
},
"phone-formatter"
:
{
"version"
:
"0.0.2"
,
"resolved"
:
"https://registry.npmjs.org/phone-formatter/-/phone-formatter-0.0.2.tgz"
,
"integrity"
:
"sha1-82JsfSdIYPAU9w9DqHVmoWsOes4="
},
"pify"
:
{
"pify"
:
{
"version"
:
"2.3.0"
,
"version"
:
"2.3.0"
,
"resolved"
:
"https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
,
"resolved"
:
"https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
,
...
...
src/index.js
View file @
9b7d4eb6
...
@@ -20,7 +20,7 @@ const extension = window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS
...
@@ -20,7 +20,7 @@ const extension = window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS
const
isProduction
=
process
.
env
.
NODE_ENV
===
'
production
'
;
const
isProduction
=
process
.
env
.
NODE_ENV
===
'
production
'
;
let
enhance
;
let
enhance
;
if
(
isProduction
)
{
if
(
isProduction
||
!
extension
)
{
enhance
=
compose
(
applyMiddleware
(
ReduxThunk
,
routerMiddleware
(
history
)));
enhance
=
compose
(
applyMiddleware
(
ReduxThunk
,
routerMiddleware
(
history
)));
}
else
{
}
else
{
enhance
=
compose
(
applyMiddleware
(
ReduxThunk
,
routerMiddleware
(
history
)),
extension
);
enhance
=
compose
(
applyMiddleware
(
ReduxThunk
,
routerMiddleware
(
history
)),
extension
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment