mirror
/
OpenDroneMap-WebODM
kopia lustrzana https://github.com/OpenDroneMap/WebODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

BUG: Fixed React/ReactDOM imports

pull/757/head
Piero Toffanin 2019-12-03 22:59:44 -05:00
rodzic aa411e9935
commit 92ac792b7b
7 zmienionych plików z 14 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
app/plugins/templates/webpack.config.js.tmpl
Wyświetl plik

@ -80,8 +80,8 @@ module.exports = {
"SystemJS": "SystemJS", "SystemJS": "SystemJS",
"PluginsAPI": "PluginsAPI", "PluginsAPI": "PluginsAPI",
"leaflet": "leaflet", "leaflet": "leaflet",
"react-dom": "ReactDOM", "ReactDOM": "ReactDOM",
"react": "React" "React": "React"
}, },
watchOptions: { watchOptions: {

4
app/static/app/js/components/LayersControl.jsx
Wyświetl plik

@ -1,6 +1,6 @@
import L from 'leaflet';
import ReactDOM from 'react-dom';
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom';
import L from 'leaflet';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import '../css/LayersControl.scss'; import '../css/LayersControl.scss';
import LayersControlPanel from './LayersControlPanel'; import LayersControlPanel from './LayersControlPanel';

3
jest.config.js
Wyświetl plik

@ -3,7 +3,8 @@ module.exports = {
moduleNameMapper: { moduleNameMapper: {
"^.*\\.s?css$": "<rootDir>/app/static/app/js/tests/mocks/empty.scss.js", "^.*\\.s?css$": "<rootDir>/app/static/app/js/tests/mocks/empty.scss.js",
"jquery": "<rootDir>/app/static/app/js/vendor/jquery-1.11.2.min.js", "jquery": "<rootDir>/app/static/app/js/vendor/jquery-1.11.2.min.js",
"SystemJS": "<rootDir>/app/static/app/js/tests/mocks/system.js" "SystemJS": "<rootDir>/app/static/app/js/tests/mocks/system.js",
"ReactDOM": "react-dom"
}, },
setupFiles: ["<rootDir>/app/static/app/js/tests/setup/shims.js", setupFiles: ["<rootDir>/app/static/app/js/tests/setup/shims.js",
"<rootDir>/app/static/app/js/tests/setup/setupTests.js", "<rootDir>/app/static/app/js/tests/setup/setupTests.js",

4
plugins/contours/public/Contours.jsx
Wyświetl plik

@ -1,6 +1,6 @@
import L from 'leaflet'; import L from 'leaflet';
import ReactDOM from 'react-dom'; import ReactDOM from 'ReactDOM';
import React from 'react'; import React from 'React';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import './Contours.scss'; import './Contours.scss';
import ContoursPanel from './ContoursPanel'; import ContoursPanel from './ContoursPanel';

4
plugins/elevationmap/public/ElevationMap.jsx
Wyświetl plik

@ -1,6 +1,6 @@
import L from 'leaflet'; import L from 'leaflet';
import ReactDOM from 'react-dom'; import ReactDOM from 'ReactDOM';
import React from 'react'; import React from 'React';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import './ElevationMap.scss'; import './ElevationMap.scss';
import ElevationMapPanel from './ElevationMapPanel'; import ElevationMapPanel from './ElevationMapPanel';

4
plugins/measure/public/app.jsx
Wyświetl plik

@ -4,8 +4,8 @@ import 'leaflet-measure-ex/dist/leaflet-measure';
import 'leaflet-measure-ex/dist/leaflet-measure.css'; import 'leaflet-measure-ex/dist/leaflet-measure.css';
import MeasurePopup from './MeasurePopup'; import MeasurePopup from './MeasurePopup';
import Utils from 'webodm/classes/Utils'; import Utils from 'webodm/classes/Utils';
import ReactDOM from 'react-dom'; import ReactDOM from 'ReactDOM';
import React from 'react'; import React from 'React';
import $ from 'jquery'; import $ from 'jquery';
export default class App{ export default class App{

4
webpack.config.js
Wyświetl plik

@ -89,8 +89,8 @@ module.exports = {
// on the global let jQuery // on the global let jQuery
"jquery": "jQuery", "jquery": "jQuery",
"SystemJS": "SystemJS", "SystemJS": "SystemJS",
"react": "React", "React": "React",
"react-dom": "ReactDOM" "ReactDOM": "ReactDOM"
}, },
watchOptions: { watchOptions: {