iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build optimizations (#3378) 

Bumping some version, removing unused libs, ...
This commit is contained in:
Maxime Beauchemin 2017-08-28 16:16:52 -07:00 committed by GitHub
parent 48b88e5241
commit a782d623f0
9 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST.in
View File

@ -2,6 +2,7 @@ recursive-include superset/templates *
recursive-include superset/static *
recursive-exclude superset/static/docs *
recursive-exclude superset/static/spec *
recursive-exclude superset/static/assets/node_modules *
recursive-exclude tests *
recursive-include superset/data *
recursive-include superset/migrations *

13
superset/assets/javascripts/SqlLab/components/HighlightedSql.jsx
View File

@ -1,9 +1,14 @@
import React from 'react';
import PropTypes from 'prop-types';
import SyntaxHighlighter from 'react-syntax-highlighter';
import { github } from 'react-syntax-highlighter/dist/styles';
import SyntaxHighlighter, { registerLanguage } from 'react-syntax-highlighter/dist/light';
import sql from 'react-syntax-highlighter/dist/languages/sql';
import github from 'react-syntax-highlighter/dist/styles/github';
import ModalTrigger from '../../components/ModalTrigger';
registerLanguage('sql', sql);
const defaultProps = {
maxWidth: 50,
maxLines: 5,
@ -26,8 +31,8 @@ class HighlightedSql extends React.Component {
};
}
shrinkSql() {
const sql = this.props.sql || '';
let lines = sql.split('\n');
const ssql = this.props.sql || '';
let lines = ssql.split('\n');
if (lines.length >= this.props.maxLines) {
lines = lines.slice(0, this.props.maxLines);
lines.push('{...}');

9
superset/assets/javascripts/explore/components/DisplayQueryButton.jsx
View File

@ -1,10 +1,15 @@
import React from 'react';
import PropTypes from 'prop-types';
import SyntaxHighlighter from 'react-syntax-highlighter';
import { github } from 'react-syntax-highlighter/dist/styles';
import SyntaxHighlighter, { registerLanguage } from 'react-syntax-highlighter/dist/light';
import html from 'react-syntax-highlighter/dist/languages/htmlbars';
import markdown from 'react-syntax-highlighter/dist/languages/markdown';
import github from 'react-syntax-highlighter/dist/styles/github';
import ModalTrigger from './../../components/ModalTrigger';
registerLanguage('markdown', markdown);
registerLanguage('html', html);
const $ = window.$ = require('jquery');
const propTypes = {

1
superset/assets/javascripts/explore/components/controls/TextAreaControl.jsx
View File

@ -1,6 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Button, FormGroup, FormControl } from 'react-bootstrap';
import AceEditor from 'react-ace';
import 'brace/mode/sql';
import 'brace/mode/json';

5
superset/assets/javascripts/welcome.js
View File

@ -1,13 +1,12 @@
/* eslint no-unused-vars: 0 */
import 'datatables.net';
import dt from 'datatables.net-bs';
import d3 from 'd3';
import dt from 'datatables.net-bs';
import 'datatables.net-bs/css/dataTables.bootstrap.css';
import '../stylesheets/welcome.css';
import { appSetup } from './common';
appSetup();
require('datatables-bootstrap3-plugin/media/css/datatables-bootstrap3.css');
dt(window, $);

22
superset/assets/package.json
View File

@ -39,27 +39,25 @@
},
"homepage": "http://superset.apache.org/",
"dependencies": {
"@data-ui/event-flow": "0.0.4",
"@data-ui/event-flow": "0.0.8",
"babel-register": "^6.24.1",
"bootstrap": "^3.3.6",
"brace": "^0.10.0",
"brfs": "^1.4.3",
"cal-heatmap": "3.6.2",
"classnames": "^2.2.5",
"d3": "^3.5.15",
"d3": "^3.5.17",
"d3-cloud": "^1.2.1",
"d3-sankey": "^0.4.2",
"d3-tip": "^0.6.7",
"datamaps": "^0.5.8",
"datatables-bootstrap3-plugin": "^0.5.0",
"datatables.net": "^1.10.13",
"datatables.net-bs": "^1.10.12",
"datatables.net-bs": "^1.10.15",
"immutable": "^3.8.1",
"jquery": "^3.2.1",
"jquery": "3.1.1",
"lodash.throttle": "^4.1.1",
"moment": "^2.14.1",
"mustache": "^2.2.1",
"nvd3": "1.8.5",
"nvd3": "1.8.6",
"prop-types": "^15.5.8",
"react": "^15.5.1",
"react-ace": "^5.0.1",
@ -78,7 +76,7 @@
"react-select": "1.0.0-rc.3",
"react-select-fast-filter-options": "^0.2.1",
"react-split-pane": "^0.1.66",
"react-syntax-highlighter": "^5.0.0",
"react-syntax-highlighter": "^5.7.0",
"react-virtualized": "^9.3.0",
"react-virtualized-select": "^2.4.0",
"reactable": "^0.14.0",
@ -108,10 +106,10 @@
"eslint": "^3.19.0",
"eslint-config-airbnb": "^15.0.1",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^5.0.3",
"eslint-plugin-jsx-a11y": "^5.1.1",
"eslint-plugin-react": "^7.0.1",
"exports-loader": "^0.6.3",
"extract-text-webpack-plugin": "2.1.2",
"extract-text-webpack-plugin": "3.0.0",
"file-loader": "^0.11.1",
"github-changes": "^1.0.4",
"ignore-styles": "^5.0.1",
@ -125,13 +123,13 @@
"react-addons-test-utils": "^15.5.1",
"react-test-renderer": "^15.5.1",
"redux-mock-store": "^1.2.3",
"sinon": "^2.1.0",
"sinon": "^3.2.1",
"style-loader": "^0.18.2",
"transform-loader": "^0.2.3",
"uglifyjs-webpack-plugin": "^0.4.6",
"url-loader": "^0.5.7",
"webpack": "^3.4.1",
"webpack-manifest-plugin": "1.2.1",
"webpack-manifest-plugin": "1.3.1",
"webworkify-webpack": "2.0.5"
}
}

6
superset/assets/spec/javascripts/sqllab/HighlightedSql_spec.jsx
View File

@ -28,7 +28,9 @@ describe('HighlightedSql', () => {
const pre = wrapper.find('pre');
expect(pre).to.have.length(1);
pre.simulate('click');
const modalBody = mount(wrapper.state().modalBody);
expect(modalBody.find(SyntaxHighlighter)).to.have.length(2);
setTimeout(() => {
const modalBody = mount(wrapper.state().modalBody);
expect(modalBody.find(SyntaxHighlighter)).to.have.length(2);
}, 10);
});
});

3
superset/assets/visualizations/pivot_table.js
View File

@ -1,7 +1,6 @@
import 'datatables.net';
import dt from 'datatables.net-bs';
import 'datatables.net-bs/css/dataTables.bootstrap.css';
import $ from 'jquery';
import 'datatables-bootstrap3-plugin/media/css/datatables-bootstrap3.css';
import { d3format, fixDataTableBodyHeight } from '../javascripts/modules/utils';
import './pivot_table.css';

3
superset/assets/visualizations/table.js
View File

@ -1,7 +1,6 @@
import d3 from 'd3';
import 'datatables-bootstrap3-plugin/media/css/datatables-bootstrap3.css';
import 'datatables.net';
import dt from 'datatables.net-bs';
import 'datatables.net-bs/css/dataTables.bootstrap.css';
import { fixDataTableBodyHeight, d3TimeFormatPreset } from '../javascripts/modules/utils';
import './table.css';