Revert "web: upgrade react and react-scripts to ^2.0.0"
Dashboard appears to be broken by this. JS errors at: http://paste.openstack.org/show/751488/
This reverts commit 9a4cd7a026
.
Change-Id: I881b28815237cf4b0bc151a267a49162613df72e
This commit is contained in:
parent
9a4cd7a026
commit
da721e6e08
|
@ -66,7 +66,6 @@
|
|||
javascript_content_dir: "../zuul/web/static"
|
||||
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
||||
zuul_api_url: https://zuul.openstack.org
|
||||
node_version: 8
|
||||
run: playbooks/dashboard/run.yaml
|
||||
|
||||
- job:
|
||||
|
|
|
@ -51,8 +51,6 @@ class TestWebURLs(ZuulTestCase):
|
|||
]:
|
||||
for item in page.find_all(tag):
|
||||
suburl = item.get(attr)
|
||||
if not suburl:
|
||||
continue
|
||||
if suburl.startswith('/'):
|
||||
suburl = suburl[1:]
|
||||
link = urllib.parse.urljoin(url, suburl)
|
||||
|
|
|
@ -17,7 +17,7 @@ extends:
|
|||
- plugin:react/recommended
|
||||
settings:
|
||||
react:
|
||||
version: "16.4"
|
||||
version: 16.4
|
||||
env:
|
||||
jest/globals: true
|
||||
browser: true
|
||||
|
|
|
@ -11,26 +11,27 @@
|
|||
"immutability-helper": "^2.8.1",
|
||||
"lodash": "^4.17.10",
|
||||
"moment": "^2.22.2",
|
||||
"patternfly-react": "^2.29.8",
|
||||
"patternfly-react": "^2.13.1",
|
||||
"prop-types": "^15.6.2",
|
||||
"react": "^16.7.0",
|
||||
"react": "^16.4.2",
|
||||
"react-dom": "^16.4.2",
|
||||
"react-height": "^3.0.0",
|
||||
"react-json-view": "^1.19.1",
|
||||
"react-redux": "^5.0.7",
|
||||
"react-router": "^4.3.1",
|
||||
"react-router-dom": "^4.3.1",
|
||||
"react-scripts": "^2.0.0",
|
||||
"redux": "^4.0.1",
|
||||
"react-scripts": "1.1.4",
|
||||
"redux": "<4.0.0",
|
||||
"redux-thunk": "^2.3.0",
|
||||
"sockette": "^2.0.0",
|
||||
"xterm": "^3.12.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"eslint": "5.6.0",
|
||||
"eslint": "^5.3.0",
|
||||
"eslint-plugin-jest": "^21.21.0",
|
||||
"eslint-plugin-react": "^7.12.0",
|
||||
"eslint-plugin-standard": "^3.1.0"
|
||||
"eslint-plugin-react": "^7.11.1",
|
||||
"eslint-plugin-standard": "^3.1.0",
|
||||
"yarn": "^1.9.4"
|
||||
},
|
||||
"scripts": {
|
||||
"start:openstack": "REACT_APP_ZUUL_API='https://zuul.openstack.org/api/' react-scripts start",
|
||||
|
@ -40,14 +41,5 @@
|
|||
"test": "react-scripts test --env=jsdom",
|
||||
"eject": "react-scripts eject",
|
||||
"lint": "eslint --ext .js --ext .jsx src"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"extends": "react-app"
|
||||
},
|
||||
"browserslist": [
|
||||
">0.2%",
|
||||
"not dead",
|
||||
"not ie <= 11",
|
||||
"not op_mini all"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -44,9 +44,9 @@ class Refreshable extends React.Component {
|
|||
const { remoteData } = this.props
|
||||
return (
|
||||
<Spinner loading={ remoteData.isFetching }>
|
||||
<div className="refresh" onClick={() => {this.updateData(true)}}>
|
||||
<a className="refresh" onClick={() => {this.updateData(true)}}>
|
||||
<Icon type="fa" name="refresh" /> refresh
|
||||
</div>
|
||||
</a>
|
||||
</Spinner>
|
||||
)
|
||||
}
|
||||
|
|
|
@ -3,11 +3,10 @@ body {
|
|||
padding: 0;
|
||||
font-family: sans-serif;
|
||||
}
|
||||
div.refresh {
|
||||
a.refresh {
|
||||
cursor: pointer;
|
||||
border-bottom-style: none;
|
||||
text-decoration: none;
|
||||
color: #0088ce;
|
||||
}
|
||||
|
||||
/* Notification bell color */
|
||||
|
|
|
@ -37,9 +37,9 @@ class ConfigErrorsPage extends React.Component {
|
|||
return (
|
||||
<React.Fragment>
|
||||
<div className="pull-right">
|
||||
<div className="refresh" onClick={() => {this.updateData()}}>
|
||||
<a className="refresh" onClick={() => {this.updateData()}}>
|
||||
<Icon type="fa" name="refresh" /> refresh
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
<div className="pull-left">
|
||||
<ul className="list-group">
|
||||
|
|
8978
web/yarn.lock
8978
web/yarn.lock
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue