Revert "[perf] add webpack 4 + SplitChunks + lazy load visualizations" (

apache#5253) * Revert "[sqllab] Fix sql lab resolution link (apache#5216)" This reverts commit 93cdf60. * Revert "Pin botocore version (apache#5184)" This reverts commit 70679d4. * Revert "Describe the use of custom OAuth2 authorization servers (apache#5220)" This reverts commit a84f430. * Revert "[bubble-chart] Fixing issue w/ metric names (apache#5237)" This reverts commit 5c106b9. * Revert "[adhoc-filters] Adding adhoc-filters to all viz types (apache#5206)" This reverts commit d483ed1. * Revert "[perf] add webpack 4 + SplitChunks + lazy load visualizations (apache#5240)" This reverts commit 1fc4ee0.
wenchma · Jun 20, 2018 · 8d9678c · 8d9678c
1 parent 93ab5cb
commit 8d9678c
Show file tree

Hide file tree

Showing 21 changed files with 2,551 additions and 1,531 deletions.
diff --git a/superset/__init__.py b/superset/__init__.py
@@ -47,37 +47,23 @@ def parse_manifest_json():
     global manifest
     try:
         with open(MANIFEST_FILE, 'r') as f:
-            # the manifest inclues non-entry files
-            # we only need entries in templates
-            full_manifest = json.load(f)
-            manifest = full_manifest.get('entrypoints', {})
+            manifest = json.load(f)
     except Exception:
         pass
 
 
-def get_js_manifest_files(filename):
+def get_manifest_file(filename):
     if app.debug:
         parse_manifest_json()
-    entry_files = manifest.get(filename, {})
-    return entry_files.get('js', [])
-
-
-def get_css_manifest_files(filename):
-    if app.debug:
-        parse_manifest_json()
-    entry_files = manifest.get(filename, {})
-    return entry_files.get('css', [])
+    return '/static/assets/dist/' + manifest.get(filename, '')
 
 
 parse_manifest_json()
 
 
 @app.context_processor
-def get_manifest():
-    return dict(
-        js_manifest=get_js_manifest_files,
-        css_manifest=get_css_manifest_files,
-    )
+def get_js_manifest():
+    return dict(js_manifest=get_manifest_file)
 
 
 #################################################################

diff --git a/superset/assets/.babelrc b/superset/assets/.babelrc
@@ -1,4 +1,3 @@
 {
-  "presets" : ["airbnb", "react", "env"],
-  "plugins": ["syntax-dynamic-import"],
+  "presets" : ["airbnb"],
 }
diff --git a/superset/assets/.eslintrc b/superset/assets/.eslintrc
@@ -1,7 +1,6 @@
 {
   "extends": "airbnb",
-  "parser": "babel-eslint",
-  "parserOptions": {
+  "parserOptions":{
     "ecmaFeatures": {
       "experimentalObjectRestSpread": true
     }

diff --git a/superset/assets/.istanbul.yml b/superset/assets/.istanbul.yml
@@ -3,8 +3,7 @@ instrumentation:
     root: './src'
     extensions: ['.js', '.jsx']
     excludes: [
-        'dist/**',
-        'visualizations/index.js',
+        'dist/**'
     ]
     embed-source: false
     variable: __coverage__

diff --git a/superset/assets/package.json b/superset/assets/package.json
@@ -9,10 +9,12 @@
   },
   "scripts": {
     "test": "mocha --require ignore-styles --compilers js:babel-core/register --require spec/helpers/browser.js --recursive spec/**/*_spec.*",
-    "cover": "babel-node node_modules/.bin/babel-istanbul cover _mocha -- --compilers babel-core/register --require spec/helpers/browser.js --require ignore-styles --recursive spec/**/*_spec.*",
-    "dev": "webpack --mode=development --colors --progress --debug --watch",
-    "prod": "node --max_old_space_size=4096 webpack --mode=production --colors --progress",
-    "build": "webpack --mode=production --colors --progress",
+    "cover": "babel-node node_modules/.bin/babel-istanbul cover _mocha -- --require ignore-styles spec/helpers/browser.js --recursive spec/**/*_spec.*",
+    "dev": "NODE_ENV=dev webpack --watch --colors --progress --debug --output-pathinfo --devtool eval-cheap-source-map",
+    "dev-slow": "NODE_ENV=dev webpack --watch --colors --progress --debug --output-pathinfo --devtool inline-source-map",
+    "dev-fast": "echo 'dev-fast in now replaced by dev'",
+    "prod": "NODE_ENV=production node --max_old_space_size=4096 ./node_modules/webpack/bin/webpack.js -p --colors --progress",
+    "build": "NODE_ENV=production webpack --colors --progress",
     "lint": "eslint --ignore-path=.eslintignore --ext .js,.jsx .",
     "lint-fix": "eslint --fix --ignore-path=.eslintignore --ext .js,.jsx .",
     "sync-backend": "babel-node --presets env src/syncBackend.js"
@@ -37,9 +39,6 @@
   "bugs": {
     "url": "https://github.com/apache/incubator-superset/issues"
   },
-  "engines": {
-    "node": ">= 6.11.5 <7.0.0 || >= 8.9.0"
-  },
   "homepage": "http://superset.apache.org/",
   "dependencies": {
     "//": "known issues with react-bootstrap>=0.32",
@@ -117,21 +116,19 @@
     "supercluster": "https://github.com/georgeke/supercluster/tarball/ac3492737e7ce98e07af679623aad452373bbc40",
     "underscore": "^1.8.3",
     "urijs": "^1.18.10",
-    "viewport-mercator-project": "^5.0.0"
+    "viewport-mercator-project": "^5.0.0",
+    "webpack-cli": "^2.1.4"
   },
   "devDependencies": {
     "babel-cli": "^6.14.0",
     "babel-core": "^6.10.4",
-    "babel-eslint": "^8.2.2",
     "babel-istanbul": "^0.12.2",
-    "babel-loader": "^7.1.4",
+    "babel-loader": "^7.0.0",
     "babel-plugin-css-modules-transform": "^1.1.0",
-    "babel-plugin-dynamic-import-node": "^1.2.0",
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-polyfill": "^6.23.0",
     "babel-preset-airbnb": "^2.1.1",
     "chai": "^4.0.2",
-    "clean-webpack-plugin": "^0.1.19",
+    "clean-webpack-plugin": "^0.1.16",
     "css-loader": "^0.28.0",
     "enzyme": "^2.0.0",
     "eslint": "^4.19.0",
@@ -140,16 +137,16 @@
     "eslint-plugin-jsx-a11y": "^5.1.1",
     "eslint-plugin-react": "^7.0.1",
     "exports-loader": "^0.7.0",
-    "file-loader": "^1.1.11",
+    "extract-text-webpack-plugin": "3.0.2",
+    "file-loader": "^0.11.1",
     "github-changes": "^1.0.4",
     "ignore-styles": "^5.0.1",
     "imports-loader": "^0.7.1",
     "istanbul": "^1.0.0-alpha",
     "jsdom": "9.12.0",
     "json-loader": "^0.5.4",
     "less": "^2.6.1",
-    "less-loader": "^4.1.0",
-    "mini-css-extract-plugin": "^0.4.0",
+    "less-loader": "^4.0.3",
     "mocha": "^3.2.0",
     "npm-check-updates": "^2.14.0",
     "react-addons-test-utils": "^15.6.2",
@@ -160,10 +157,10 @@
     "style-loader": "^0.21.0",
     "transform-loader": "^0.2.3",
     "uglifyjs-webpack-plugin": "^1.1.0",
-    "url-loader": "^1.0.1",
-    "webpack": "^4.6.0",
-    "webpack-assets-manifest": "^3.0.1",
-    "webpack-cli": "^2.0.10",
-    "webpack-sources": "^1.1.0"
+    "url-loader": "^0.6.2",
+    "//": "Known issues with >=4",
+    "webpack": "^3.10.0",
+    "webpack-manifest-plugin": "2.0.3",
+    "webworkify-webpack": "2.1.2"
   }
 }
diff --git a/superset/assets/spec/helpers/browser.js b/superset/assets/spec/helpers/browser.js
@@ -3,12 +3,7 @@ import 'babel-polyfill';
 import chai from 'chai';
 import jsdom from 'jsdom';
 
-require('babel-register')({
-  // NOTE: If `dynamic-import-node` is in .babelrc alongside
-  // `syntax-dynamic-import` it breaks webpack's bundle splitting capability.
-  // So only load during runtime on the node-side (in tests)
-  plugins: ['dynamic-import-node'],
-});
+require('babel-register')();
 
 const exposedProperties = ['window', 'navigator', 'document'];
 

diff --git a/superset/assets/spec/javascripts/chart/Chart_spec.jsx b/superset/assets/spec/javascripts/chart/Chart_spec.jsx
@@ -38,10 +38,10 @@ describe('Chart', () => {
       <Chart {...mockedProps} />,
     );
   });
-  describe('renderVis', () => {
+  describe('renderViz', () => {
     let stub;
     beforeEach(() => {
-      stub = sinon.stub(wrapper.instance(), 'renderVis');
+      stub = sinon.stub(wrapper.instance(), 'renderViz');
     });
     afterEach(() => {
       stub.restore();