diff --git a/superset/assets/.babelrc b/superset/assets/.babelrc index fe90366af..f2e5316f3 100644 --- a/superset/assets/.babelrc +++ b/superset/assets/.babelrc @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -{ + { "presets" : ["airbnb", "@babel/preset-react", "@babel/preset-env"], - "plugins": ["lodash", "syntax-dynamic-import", "react-hot-loader/babel"], + "plugins": ["lodash", "@babel/plugin-syntax-dynamic-import", "react-hot-loader/babel"], "env": { "test": { "plugins": [ diff --git a/superset/assets/package-lock.json b/superset/assets/package-lock.json index 02def3bfc..f6ba04f72 100644 --- a/superset/assets/package-lock.json +++ b/superset/assets/package-lock.json @@ -574,6 +574,15 @@ "@babel/helper-plugin-utils": "^7.0.0" } }, + "@babel/plugin-syntax-dynamic-import": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz", + "integrity": "sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, "@babel/plugin-syntax-json-strings": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz", @@ -1398,7 +1407,7 @@ }, "@data-ui/event-flow": { "version": "0.0.54", - "resolved": "https://registry.npmjs.org/@data-ui/event-flow/-/event-flow-0.0.54.tgz", + "resolved": "http://registry.npmjs.org/@data-ui/event-flow/-/event-flow-0.0.54.tgz", "integrity": "sha1-uwPh/StWNCSGVbjfnTxsOKdH5l4=", "requires": { "@data-ui/forms": "0.0.50", @@ -1596,7 +1605,7 @@ }, "@data-ui/radial-chart": { "version": "0.0.54", - "resolved": "https://registry.npmjs.org/@data-ui/radial-chart/-/radial-chart-0.0.54.tgz", + "resolved": "http://registry.npmjs.org/@data-ui/radial-chart/-/radial-chart-0.0.54.tgz", "integrity": "sha1-DSiwdoHZtgJ9msI7cpJBgn1RMAE=", "requires": { "@data-ui/shared": "0.0.54", @@ -2033,6 +2042,33 @@ "probe.gl": "^1.0.0", "seer": "^0.2.4", "viewport-mercator-project": "^5.1.0" + }, + "dependencies": { + "gl-matrix": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.0.0.tgz", + "integrity": "sha512-PD4mVH/C/Zs64kOozeFnKY8ybhgwxXXQYGWdB4h68krAHknWJgk9uKOn6z8YElh5//vs++90pb6csrTIDWnexA==" + }, + "viewport-mercator-project": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/viewport-mercator-project/-/viewport-mercator-project-5.3.0.tgz", + "integrity": "sha512-jiLSirIXwwDp8c7/UcH5hoCprWx3OuenHaw+VB34Q56CUfO3EvXRgetnm8lVu+mFGBEzKsOSOND5XPjsA98gHw==", + "requires": { + "@babel/runtime": "^7.0.0", + "math.gl": "^2.1.0" + }, + "dependencies": { + "math.gl": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/math.gl/-/math.gl-2.3.0.tgz", + "integrity": "sha512-6a2II4xlYg4k0Z9KLh0u9LzVjb/17/viobJlyI1GzzK2COF3SF28VlYH0I4O8MduObZjlJR+E7Y9OM7d8VuZlw==", + "requires": { + "@babel/runtime": "^7.0.0", + "gl-matrix": "^3.0.0" + } + } + } + } } }, "@deck.gl/layers": { @@ -2198,9 +2234,9 @@ "integrity": "sha512-vkxOXvIl8KpbPkbHGzX0qb34ZW+3U5FW65dVrGz6qVnO9TQ2WAwru7LDzmPAg1nGvrCN4NDoKzNIddNzmgQ31Q==" }, "@superset-ui/legacy-plugin-chart-calendar": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.1.0.tgz", - "integrity": "sha512-u1SUGlXxUJU8QQjez14YC/u8OF+PavBWCSi5SJnVVhknOsmtK/aEYphEZ5+PKoD/oMsOlO8VTeEtSO9Xb1CLsA==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.1.1.tgz", + "integrity": "sha512-k0hz0N+Kiq8xYR+KZpIAQYVZPUDVxx5trEaAMgX24Mkr84fhCzJMx7lKDPZ5Wf1Q98kl0LZ+2rVHaZxiQyW7Mw==", "requires": { "d3-array": "^2.0.3", "d3-selection": "^1.4.0", @@ -2220,18 +2256,18 @@ } }, "@superset-ui/legacy-plugin-chart-chord": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.1.0.tgz", - "integrity": "sha512-EOQVvwBaq9hG3gHrd9VGQxiGxzsmHIzT4BNrbqmAFcukjOvQc+EJEpsPbMIl2RA/19aZ+4njP+x9z9j40V8yWg==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.1.1.tgz", + "integrity": "sha512-HSsFrPIo5oWMeKUScJPr0LX1oDofkg/sMb1q6mhKJdPkJnh4yM1j9SYYJJm3PVYv/wgT5dOWUX8dBW61VCs8Pg==", "requires": { "d3": "^3.5.17", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-country-map": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.1.0.tgz", - "integrity": "sha512-OPq2OwqNvaM/gYTiLVTnkR41MxjVw72CtFfuzRguNKUhKmJnhUyWPgX/+LpAC1Xqfk2kjECftZPiBwZiaAWbzA==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.1.1.tgz", + "integrity": "sha512-c6aRTeZr3xnWCu3ZmZNRxm8Btly8Kq51EVKf8NVGZQPvCfLMak36ejtpBrqWKaxqQkCeuk68ynMGOISjSGz2wA==", "requires": { "d3": "^3.5.17", "d3-array": "^2.0.3", @@ -2246,27 +2282,27 @@ } }, "@superset-ui/legacy-plugin-chart-event-flow": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.1.0.tgz", - "integrity": "sha512-/8lDGILIVJqbUW98Yl5tOnoV2MAX7ll3tifyOS9GqshWPsm1ixz22z1GiIhZ9T41CQWCgdxbU/iD06UCwRKW0A==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.1.1.tgz", + "integrity": "sha512-WLkFJ2b5rRGuxTw/WrLOuriNat9+czEz7hhE8dT2qU5LQuZJhBa77CAT9MHoUZvcTXo0Mnx3UcMCrmE/OGVVVQ==", "requires": { "@data-ui/event-flow": "^0.0.54", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-force-directed": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.1.0.tgz", - "integrity": "sha512-4n/5gNAYoAyke3DW16nAwFvq9ry4Kscn8uMHuPT9kkaR4JajLhC7SV2bsg84+nTpTccdWmRxvdG/08bIHKCIcg==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.1.1.tgz", + "integrity": "sha512-LWxgZ9F0jdkFONt5hVrkhZBX0DeVovlkO5usG3CzHiM0wvpbo62kDpfxB7cXi+82GivE7Vzqo8F8kcy3Jrm+zQ==", "requires": { "d3": "^3.5.17", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-heatmap": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.1.0.tgz", - "integrity": "sha512-5ebykdSgY6nC2QPc8imi7mfpJueRmpfQcJGDHmvAVqFV9lA9NuJ3+6dDOADEoHUY2BJ2wvTendRPT65jKhgQCA==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.1.1.tgz", + "integrity": "sha512-/VWoSmvPm65m87wAGd7OSbhdgZ+HORXUQYMbcAHc95wP4ites3WwhwfgWoNcTpRaJvaUasguZ/OSXcogHvc6ig==", "requires": { "d3": "^3.5.17", "d3-svg-legend": "^1.x", @@ -2275,9 +2311,9 @@ } }, "@superset-ui/legacy-plugin-chart-histogram": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.1.0.tgz", - "integrity": "sha512-5kc1YmSshQRYso3GfSa+qTUiEGusv4i2epFl+LVOZ++YTtRvVNVqYejGYmYuoY/t/fxTGTTokyBrZhBur9/eSg==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.1.1.tgz", + "integrity": "sha512-GEsYDoQlxjaP79YezQCpdHa7sY009FTrYhMyJOrrNZXE/2Cw66HCspyJrMXTcQhrTWxTwD26RaECZqFVJ51SDg==", "requires": { "@data-ui/histogram": "^0.0.64", "@data-ui/theme": "^0.0.62", @@ -2324,9 +2360,9 @@ } }, "@superset-ui/legacy-plugin-chart-horizon": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.1.0.tgz", - "integrity": "sha512-ZGQrXvqu7laT2f3s57cCK12bXc/y2jtQbDq29vRTIQKN5T1YTBLWtpatwd25RzS1nlrEIA34uY5lj1+yf2bdig==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.1.1.tgz", + "integrity": "sha512-fiuDkWVmiHEYQuWDUXd5ag7YsLPVXyEkBObjvr6F7ezPKQRAuGlDpLJF2L5qcJ0ol5qdP68rfJDkkzX+fp1Tig==", "requires": { "d3-array": "^2.0.3", "d3-scale": "^2.2.2", @@ -2361,9 +2397,9 @@ } }, "@superset-ui/legacy-plugin-chart-iframe": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-iframe/-/legacy-plugin-chart-iframe-0.1.0.tgz", - "integrity": "sha512-gkHrAHAHE9kYYc1BBqj1d7pIMDf7eouHUtOrAH0KvxBibnUpsaEitNPwfn6PhjBMk/3l33FK/h2bFddKiVeANA==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-iframe/-/legacy-plugin-chart-iframe-0.1.1.tgz", + "integrity": "sha512-9kGLx1pCSzjJ1Iirrx3wrA8diDen1eUKQdLOXpHYMyqHCp7SsPMam6uFcwTHr/0ZbEa4gfKRg+VhstWiixIg8Q==", "requires": { "mustache": "^3.0.1", "prop-types": "^15.6.2" @@ -2377,22 +2413,190 @@ } }, "@superset-ui/legacy-plugin-chart-map-box": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.1.0.tgz", - "integrity": "sha512-IALUQnWQmSDXSY/KHSDbEF9otD9NST8nZQSo5JWMJ/VMRPLgw28P45+07rfmIrcWfW5s+H+bWovUcIwgAUwT8g==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.1.1.tgz", + "integrity": "sha512-eKgBLqW7qmBGHewfAirZf60lBq1dMh4RaOLKAwAhLXcjfiYTDbdulMtpijFv6U16u5Xk5WYKlFJ3OSMdp50obQ==", "requires": { "immutable": "^3.8.2", + "mapbox-gl": "^0.53.0", "prop-types": "^15.6.2", - "react-map-gl": "^3.0.4", + "react-map-gl": "^4.0.10", "supercluster": "^4.1.1", "viewport-mercator-project": "^6.1.1" }, "dependencies": { + "@mapbox/geojson-rewind": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.4.0.tgz", + "integrity": "sha512-b+1uPWBERW4Pet/969BNu61ZPDyH2ilIxBjJDFzxyS9TyszF9UrTQyYIl/G38clux3rtpAGGFSGTCSF/qR6UjA==", + "requires": { + "@mapbox/geojson-area": "0.2.2", + "concat-stream": "~1.6.0", + "minimist": "1.2.0", + "sharkdown": "^0.1.0" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + } + } + }, + "earcut": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.1.5.tgz", + "integrity": "sha512-QFWC7ywTVLtvRAJTVp8ugsuuGQ5mVqNmJ1cRYeLrSHgP3nycr2RHTJob9OtM0v8ujuoKN0NY1a93J/omeTL1PA==" + }, "gl-matrix": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.0.0.tgz", "integrity": "sha512-PD4mVH/C/Zs64kOozeFnKY8ybhgwxXXQYGWdB4h68krAHknWJgk9uKOn6z8YElh5//vs++90pb6csrTIDWnexA==" }, + "grid-index": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", + "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" + }, + "kdbush": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-3.0.0.tgz", + "integrity": "sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew==" + }, + "mapbox-gl": { + "version": "0.53.0", + "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-0.53.0.tgz", + "integrity": "sha512-bqD0VTpjD9jS/oXoSiLcUYViFXDvjIDWxo08Pfq5cgCdnRHoLEboItuB2AKsx8OPK5fYme0qhPe/ogF5HICjiA==", + "requires": { + "@mapbox/geojson-rewind": "^0.4.0", + "@mapbox/geojson-types": "^1.0.2", + "@mapbox/jsonlint-lines-primitives": "^2.0.2", + "@mapbox/mapbox-gl-supported": "^1.4.0", + "@mapbox/point-geometry": "^0.1.0", + "@mapbox/tiny-sdf": "^1.1.0", + "@mapbox/unitbezier": "^0.0.0", + "@mapbox/vector-tile": "^1.3.1", + "@mapbox/whoots-js": "^3.1.0", + "csscolorparser": "~1.0.2", + "earcut": "^2.1.5", + "esm": "^3.0.84", + "geojson-vt": "^3.2.1", + "gl-matrix": "^3.0.0", + "grid-index": "^1.1.0", + "minimist": "0.0.8", + "murmurhash-js": "^1.0.0", + "pbf": "^3.0.5", + "potpack": "^1.0.1", + "quickselect": "^2.0.0", + "rw": "^1.3.3", + "supercluster": "^6.0.1", + "tinyqueue": "^2.0.0", + "vt-pbf": "^3.1.1" + }, + "dependencies": { + "supercluster": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-6.0.1.tgz", + "integrity": "sha512-NTth/FBFUt9mwW03+Z6Byscex+UHu0utroIe6uXjGu9PrTuWtW70LYv9I1vPSYYIHQL74S5zAkrXrHEk0L7dGA==", + "requires": { + "kdbush": "^3.0.0" + } + } + } + }, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + }, + "mjolnir.js": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/mjolnir.js/-/mjolnir.js-2.0.3.tgz", + "integrity": "sha512-3AvoMwJCR3m9QQYzsE+D+LWZ9N2uWbl7prixSJGRZNOpaagRgiXJeVvDEHTiXAGmNhdn/VAtgWrx3lpdrj2sIQ==", + "requires": { + "@babel/runtime": "^7.0.0", + "hammerjs": "^2.0.8" + } + }, + "quickselect": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz", + "integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==" + }, + "react-map-gl": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-4.0.10.tgz", + "integrity": "sha512-QSg6BvhKkUc0zZnXWfxJ+W45AyskZnnaLNk1/Q/hQASTVhspmjme0FatvNMrFiN4ZPH7Mxta6exSsk1hMhnQyg==", + "requires": { + "@babel/runtime": "^7.0.0", + "mapbox-gl": "~0.52.0", + "mjolnir.js": "^2.0.3", + "prop-types": "^15.5.7", + "react-virtualized-auto-sizer": "^1.0.2", + "viewport-mercator-project": "^6.1.0" + }, + "dependencies": { + "gl-matrix": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-2.8.1.tgz", + "integrity": "sha512-0YCjVpE3pS5XWlN3J4X7AiAx65+nqAI54LndtVFnQZB6G/FVLkZH8y8V6R3cIoOQR4pUdfwQGd1iwyoXHJ4Qfw==" + }, + "mapbox-gl": { + "version": "0.52.0", + "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-0.52.0.tgz", + "integrity": "sha512-jiZMGI7LjBNiSwYpFA3drzbZXrgEGERGJRpNS95t5BLZoc8Z+ggOOI1Fz2X+zLlh1j32iNDtf4j6En+caWwYiQ==", + "requires": { + "@mapbox/geojson-types": "^1.0.2", + "@mapbox/jsonlint-lines-primitives": "^2.0.2", + "@mapbox/mapbox-gl-supported": "^1.4.0", + "@mapbox/point-geometry": "^0.1.0", + "@mapbox/tiny-sdf": "^1.1.0", + "@mapbox/unitbezier": "^0.0.0", + "@mapbox/vector-tile": "^1.3.1", + "@mapbox/whoots-js": "^3.1.0", + "csscolorparser": "~1.0.2", + "earcut": "^2.1.3", + "esm": "^3.0.84", + "geojson-rewind": "^0.3.0", + "geojson-vt": "^3.2.1", + "gl-matrix": "^2.6.1", + "grid-index": "^1.0.0", + "minimist": "0.0.8", + "murmurhash-js": "^1.0.0", + "pbf": "^3.0.5", + "potpack": "^1.0.1", + "quickselect": "^1.0.0", + "rw": "^1.3.3", + "supercluster": "^5.0.0", + "tinyqueue": "^1.1.0", + "vt-pbf": "^3.0.1" + } + }, + "quickselect": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-1.1.1.tgz", + "integrity": "sha512-qN0Gqdw4c4KGPsBOQafj6yj/PA6c/L63f6CaZ/DCF/xF4Esu3jVmKLUDYxghFx8Kb/O7y9tI7x2RjTSXwdK1iQ==" + }, + "supercluster": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-5.0.0.tgz", + "integrity": "sha512-9eeD5Q3908+tqdz+wYHHzi5mLKgnqtpO5mrjUfqr67UmGuOwBtVoQ9pJJrfcVHwMwC0wEBvfNRF9PgFOZgsOpw==", + "requires": { + "kdbush": "^3.0.0" + } + }, + "tinyqueue": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-1.2.3.tgz", + "integrity": "sha512-Qz9RgWuO9l8lT+Y9xvbzhPT2efIUIFd69N7eF7tJ9lnQl0iLj1M7peK7IoUGZL9DJHw9XftqLreccfxcQgYLxA==" + } + } + }, + "tinyqueue": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.0.tgz", + "integrity": "sha512-CuwAcoAyhS73YgUpTVWI6t/t2mo9zfqbxTbnu4B1U6QPPhq3mxMxywSbo3cWykan4cBkXBfE8F7qulYrNcsHyQ==" + }, "viewport-mercator-project": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/viewport-mercator-project/-/viewport-mercator-project-6.1.1.tgz", @@ -2405,9 +2609,9 @@ } }, "@superset-ui/legacy-plugin-chart-markup": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-markup/-/legacy-plugin-chart-markup-0.1.0.tgz", - "integrity": "sha512-Jc1JU6kSQsYdL1F63dYuE3e4vOYnpr6YQh7yYb4AeBxIzh3wK6oHgSj0/RI1xvclQDpgNAlhVw6ukFNOjvNvMw==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-markup/-/legacy-plugin-chart-markup-0.1.1.tgz", + "integrity": "sha512-cq+8ODf7aGVfevW+dpiw2uqaV8Nw9XjOLwF5HHLqNqHuFtFg/SnQL7e3uMX3fTYzhxrBDSDNfCgKjIIXo+fjfQ==", "requires": { "prop-types": "^15.6.2" } @@ -2423,18 +2627,18 @@ } }, "@superset-ui/legacy-plugin-chart-parallel-coordinates": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.1.0.tgz", - "integrity": "sha512-KQQP+X/r4dm9v4o42foBsqzGBe2Ue0Fixj7NIx2rj577WGtfsnIJeDDuwkhxuVZdJkVz5EQQwML0ccs9ZPa6jg==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.1.1.tgz", + "integrity": "sha512-XkTf3UN2d2fWie3HOvxbhhN8O9K4UnG3tMx2iNMUhQGPdb0ip/edQY6kVzGOfy3uhSnZpNlrlabIR4SYiSp6zA==", "requires": { "d3": "^3.5.17", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-partition": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.1.0.tgz", - "integrity": "sha512-c4xuUcw4ZUwT7Y/RCbrN/hNRZBL7i2N+Uudphrufbn8L3soxgBwmkM9C6akfwDFoNbfywP5H+JqeUr2wJcQIVA==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.1.1.tgz", + "integrity": "sha512-c68TUQfeudY/J1BSVI6bfDfILJ6DhcpiJGgcjZcbSefBHCeDaPDp5yNuiNChfMaZnXgOrW/Kg2+sr0BKcduhLw==", "requires": { "d3": "^3.5.17", "d3-hierarchy": "^1.1.8", @@ -2442,9 +2646,9 @@ } }, "@superset-ui/legacy-plugin-chart-pivot-table": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.1.0.tgz", - "integrity": "sha512-immyrpBLWYauAe92YQRB/RHcncZBCXiHQOqxYH/EwkGiqY8GEAsjjFywG4FuKcddnGEejZO1tN0Z2J+nSDgF1g==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.1.1.tgz", + "integrity": "sha512-qJ0Z/TG1a3kOT3xQtJU4rvAgMaILnrXkupj7D3OcByba3pAtP+eMzaz0X55mnH07SK6d9l7Ph/jA0Die0GLhjw==", "requires": { "d3": "^3.5.17", "datatables.net-bs": "^1.10.15", @@ -2452,9 +2656,9 @@ } }, "@superset-ui/legacy-plugin-chart-rose": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.1.0.tgz", - "integrity": "sha512-uyx7uePlHpiGkzpcLAvUBznupgczOqPSvrT5WfoT1P0CiJ/DMubdLlJySXBIadEPO2cQ5otGlI1suuoZhbFJiA==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.1.1.tgz", + "integrity": "sha512-QaL96ba3qS889HidrdnIwKHLZ+nlHQtFAcx7hxlrcWcJ8XXqd4/h70pAhQPTAo4GDmRxvKLThy7b1Cvou7sJmw==", "requires": { "d3": "^3.5.17", "nvd3": "1.8.6", @@ -2462,9 +2666,9 @@ } }, "@superset-ui/legacy-plugin-chart-sankey": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.1.0.tgz", - "integrity": "sha512-RSOV0P/5dHBTcXgyJ4y6ooGe2phLe85wKM5e3vq6bX/qPA1AK4dTdkEazVXbj25FTzga762Q09s+iH4y5K7CFA==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.1.1.tgz", + "integrity": "sha512-0WTtEbLFtpMyb6kYqnl1weioZ82FYKUZam95RZZCA948RobYIyrysFCAI6JUEBZV1+hYpFm1iGv1S1mN8bs/7Q==", "requires": { "d3": "^3.5.17", "d3-sankey": "^0.4.2", @@ -2472,18 +2676,18 @@ } }, "@superset-ui/legacy-plugin-chart-sunburst": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.1.0.tgz", - "integrity": "sha512-twdsakO3WGa26Gy5Wz31qQQmfPIZyjdOyzqtJ+3LaWW5IdHlqhYNqGHo04MyPSy7BPEsuURzBV3vnipwL065aw==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.1.1.tgz", + "integrity": "sha512-k1XwNEdi6zk2rpkl9HJP5MxsSvl/nExnY0/bRKjD0t+p6N1lDKfKI8VJt0wn7+dXEQMWJRCF6Rz/a62h/JRpeg==", "requires": { "d3": "^3.5.17", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-table": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-table/-/legacy-plugin-chart-table-0.1.0.tgz", - "integrity": "sha512-H38iNrr+1doEhbY03tSERg7TPYwhRTa8bNf7awbpcVarCImGZvobTKWNrrX1rBieXpkkLRmB1JWfY0D5DaLR9Q==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-table/-/legacy-plugin-chart-table-0.1.1.tgz", + "integrity": "sha512-meXnWEvo3zHxIaAMuZdKhsfsM4a6YMnZ/gXyuj8Wx5WRZSGlpluvrUo/Ih5cgFcIy4K4lDEb9y+FZsM7jcMOfQ==", "requires": { "d3": "^3.5.17", "datatables.net-bs": "^1.10.15", @@ -2492,9 +2696,9 @@ } }, "@superset-ui/legacy-plugin-chart-treemap": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.1.0.tgz", - "integrity": "sha512-yRzNCfqQzsz+6f14XFRtQkwOo9xNyrUQAoS2jeEUL2nKHgzS1Z/TFMFsCevAFE22eei1oS1Y+v5MbQ5nPIaTzA==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.1.1.tgz", + "integrity": "sha512-Kv1BHzZM6IJkdGWgidtc5PoFNrwx8wo3x42TtdOxM85ilY+JfaC0IJl9qxoqjcH8o1Yaolgb/Dq3zqoL7ikN1A==", "requires": { "d3-hierarchy": "^1.1.8", "d3-selection": "^1.4.0", @@ -2509,9 +2713,9 @@ } }, "@superset-ui/legacy-plugin-chart-word-cloud": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-word-cloud/-/legacy-plugin-chart-word-cloud-0.1.0.tgz", - "integrity": "sha512-Dz3T6EEIlGO0wny6XqV2HEQ9LYkUBafup5Bswu6+LDjQIz5m6iHDmdfm10mHZvfLMqgohMx47CL6WLdaupcy0g==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-word-cloud/-/legacy-plugin-chart-word-cloud-0.1.1.tgz", + "integrity": "sha512-Vbp6czrkdRyyMXfzai5qVozwiQQ4cHG6upBLpaOhmt97cva084wVT40+co3fOtNILqINJL5ckYOPFeJsNWLTrA==", "requires": { "d3": "^3.5.17", "d3-cloud": "^1.2.1", @@ -2519,9 +2723,9 @@ } }, "@superset-ui/legacy-plugin-chart-world-map": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.1.0.tgz", - "integrity": "sha512-SDrvD+m9L73c4ayAQgHmiVRo+K1Pl74RhlmtvJfJePSTfoLNEThJkIUUcZNkqjoUO2YDIfhGTLeWfga2wG4h4Q==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.1.1.tgz", + "integrity": "sha512-EWvzjg/hWgq6R+z/Bf6TtVDcOb3oWqeMA29sCn7F365hHmEVLuN5Iygm7fp+L9Wjqc4jiLHkj5+26LYtZW2SAA==", "requires": { "d3": "^3.5.17", "datamaps": "^0.5.8", @@ -2529,9 +2733,9 @@ } }, "@superset-ui/legacy-preset-chart-big-number": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.1.0.tgz", - "integrity": "sha512-Gwrw41xndHkERqhuqaQfz9NuG+mUC/ikqz9cttQqNtFIwfXZ0VkauVSzzpN9hXPJAKWZ+QTlBufmTkEXrOunmA==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.1.1.tgz", + "integrity": "sha512-LDG2mTqNC+6MTGkYRWveyFxJFterwS7EpLC6TinQyFnIMoiQAJ6HZ2nBXBW2VYBB6KDyXUBTz2rh9jNV2F5u1w==", "requires": { "@data-ui/xy-chart": "^0.0.75", "@superset-ui/core": "^0.9.x", @@ -2542,9 +2746,9 @@ } }, "@superset-ui/legacy-preset-chart-nvd3": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.1.0.tgz", - "integrity": "sha512-3gTqHytl+HHolWw2sxuZqMpYeHg8bUwQFZ05TqnkPcc6KFgiEM82zqaSI3HnnoynRSFP2KeKcDcvlkwSPiV8/w==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.1.1.tgz", + "integrity": "sha512-gZl0VZRfFbBqrgNOQpV/Hbt08WMiDFsrWgc0yGxti02eji+vDLF3laOxQwG7dD/6GGcNJgbUfOy0RiNu9trl4g==", "requires": { "@data-ui/xy-chart": "^0.0.75", "@superset-ui/core": "^0.9.x", @@ -5799,7 +6003,7 @@ }, "css-in-js-utils": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/css-in-js-utils/-/css-in-js-utils-2.0.1.tgz", + "resolved": "http://registry.npmjs.org/css-in-js-utils/-/css-in-js-utils-2.0.1.tgz", "integrity": "sha512-PJF0SpJT+WdbVVt0AOYp9C8GnuruRlL/UFW7932nLWmFLQTaWEzTBQEx7/hn4BuV+WON75iAViSUJLiU3PKbpA==", "requires": { "hyphenate-style-name": "^1.0.2", @@ -6469,7 +6673,7 @@ }, "d3-geo-projection": { "version": "0.2.16", - "resolved": "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-0.2.16.tgz", + "resolved": "http://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-0.2.16.tgz", "integrity": "sha1-SZTs0QM92xUztsTFUoocgdzClCc=", "requires": { "brfs": "^1.3.0" @@ -7770,6 +7974,11 @@ "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==", "dev": true }, + "esm": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.4.tgz", + "integrity": "sha512-wOuWtQCkkwD1WKQN/k3RsyGSSN+AmiUzdKftn8vaC+uV9JesYmQlODJxgXaaRz0LaaFIlUxZaUu5NPiUAjKAAA==" + }, "espree": { "version": "3.5.4", "resolved": "http://registry.npmjs.org/espree/-/espree-3.5.4.tgz", @@ -10001,7 +10210,7 @@ }, "hoist-non-react-statics": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", "integrity": "sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=" }, "home-or-tmp": { @@ -17184,6 +17393,11 @@ "react-lifecycles-compat": "^3.0.4" } }, + "react-virtualized-auto-sizer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.2.tgz", + "integrity": "sha512-MYXhTY1BZpdJFjUovvYHVBmkq79szK/k7V3MO+36gJkWGkrXKtyr4vCPtpphaTLRAdDNoYEYFZWE8LjN+PIHNg==" + }, "react-virtualized-select": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/react-virtualized-select/-/react-virtualized-select-3.1.3.tgz", @@ -17628,7 +17842,7 @@ }, "reduce-css-calc": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", + "resolved": "http://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=", "requires": { "balanced-match": "^0.4.2", @@ -18646,7 +18860,7 @@ }, "iconv-lite": { "version": "0.2.11", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz", + "resolved": "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz", "integrity": "sha1-HOYKOleGSiktEyH/RgnKS7llrcg=" } } @@ -21186,27 +21400,18 @@ } }, "viewport-mercator-project": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/viewport-mercator-project/-/viewport-mercator-project-5.3.0.tgz", - "integrity": "sha512-jiLSirIXwwDp8c7/UcH5hoCprWx3OuenHaw+VB34Q56CUfO3EvXRgetnm8lVu+mFGBEzKsOSOND5XPjsA98gHw==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/viewport-mercator-project/-/viewport-mercator-project-6.1.1.tgz", + "integrity": "sha512-nI0GEmXnESwZxWSJuaQkdCnvOv6yckUfqqFbNB8KWVbQY3eUExVM4ZziqCVVs5mNznLjDF1auj6HLW5D5DKcng==", "requires": { "@babel/runtime": "^7.0.0", - "math.gl": "^2.1.0" + "gl-matrix": "^3.0.0" }, "dependencies": { - "math.gl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/math.gl/-/math.gl-2.2.0.tgz", - "integrity": "sha512-HIaDMt7zzeTx77k+9jrDpvpO6UTqrdMk+PkTmSLAIamnxAHTHmvnpxM7CYiJFP+SPNcD7Mp+y1wx8BlvJM+lmw==", - "requires": { - "@babel/runtime": "^7.0.0", - "gl-mat3": "^1.0.0", - "gl-mat4": "^1.1.4", - "gl-quat": "^1.0.0", - "gl-vec2": "^1.0.0", - "gl-vec3": "^1.0.3", - "gl-vec4": "^1.0.1" - } + "gl-matrix": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.0.0.tgz", + "integrity": "sha512-PD4mVH/C/Zs64kOozeFnKY8ybhgwxXXQYGWdB4h68krAHknWJgk9uKOn6z8YElh5//vs++90pb6csrTIDWnexA==" } } }, diff --git a/superset/assets/package.json b/superset/assets/package.json index 25f18012b..c791fb6c5 100644 --- a/superset/assets/package.json +++ b/superset/assets/package.json @@ -54,42 +54,40 @@ "@superset-ui/number-format": "^0.9.3", "@superset-ui/time-format": "^0.9.3", "@superset-ui/translation": "^0.9.3", - "@superset-ui/legacy-preset-chart-big-number": "^0.1.0", - "@superset-ui/legacy-preset-chart-nvd3": "^0.1.0", - "@superset-ui/legacy-plugin-chart-calendar": "^0.1.0", - "@superset-ui/legacy-plugin-chart-chord": "^0.1.0", - "@superset-ui/legacy-plugin-chart-country-map": "^0.1.0", - "@superset-ui/legacy-plugin-chart-event-flow": "^0.1.0", - "@superset-ui/legacy-plugin-chart-force-directed": "^0.1.0", - "@superset-ui/legacy-plugin-chart-heatmap": "^0.1.0", - "@superset-ui/legacy-plugin-chart-histogram": "^0.1.0", - "@superset-ui/legacy-plugin-chart-horizon": "^0.1.0", - "@superset-ui/legacy-plugin-chart-iframe": "^0.1.0", - "@superset-ui/legacy-plugin-chart-markup": "^0.1.0", - "@superset-ui/legacy-plugin-chart-map-box": "^0.1.0", + "@superset-ui/legacy-preset-chart-big-number": "^0.1.1", + "@superset-ui/legacy-preset-chart-nvd3": "^0.1.1", + "@superset-ui/legacy-plugin-chart-calendar": "^0.1.1", + "@superset-ui/legacy-plugin-chart-chord": "^0.1.1", + "@superset-ui/legacy-plugin-chart-country-map": "^0.1.1", + "@superset-ui/legacy-plugin-chart-event-flow": "^0.1.1", + "@superset-ui/legacy-plugin-chart-force-directed": "^0.1.1", + "@superset-ui/legacy-plugin-chart-heatmap": "^0.1.1", + "@superset-ui/legacy-plugin-chart-histogram": "^0.1.1", + "@superset-ui/legacy-plugin-chart-horizon": "^0.1.1", + "@superset-ui/legacy-plugin-chart-iframe": "^0.1.1", + "@superset-ui/legacy-plugin-chart-markup": "^0.1.1", + "@superset-ui/legacy-plugin-chart-map-box": "^0.1.1", "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.1.0", - "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.1.0", - "@superset-ui/legacy-plugin-chart-partition": "^0.1.0", - "@superset-ui/legacy-plugin-chart-pivot-table": "^0.1.0", - "@superset-ui/legacy-plugin-chart-rose": "^0.1.0", - "@superset-ui/legacy-plugin-chart-sankey": "^0.1.0", - "@superset-ui/legacy-plugin-chart-sunburst": "^0.1.0", - "@superset-ui/legacy-plugin-chart-table": "^0.1.0", - "@superset-ui/legacy-plugin-chart-treemap": "^0.1.0", - "@superset-ui/legacy-plugin-chart-word-cloud": "^0.1.0", - "@superset-ui/legacy-plugin-chart-world-map": "^0.1.0", + "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.1.1", + "@superset-ui/legacy-plugin-chart-partition": "^0.1.1", + "@superset-ui/legacy-plugin-chart-pivot-table": "^0.1.1", + "@superset-ui/legacy-plugin-chart-rose": "^0.1.1", + "@superset-ui/legacy-plugin-chart-sankey": "^0.1.1", + "@superset-ui/legacy-plugin-chart-sunburst": "^0.1.1", + "@superset-ui/legacy-plugin-chart-table": "^0.1.1", + "@superset-ui/legacy-plugin-chart-treemap": "^0.1.1", + "@superset-ui/legacy-plugin-chart-word-cloud": "^0.1.1", + "@superset-ui/legacy-plugin-chart-world-map": "^0.1.1", "@vx/responsive": "0.0.172", "abortcontroller-polyfill": "^1.1.9", "bootstrap": "^3.3.6", "bootstrap-slider": "^10.0.0", "brace": "^0.11.1", "classnames": "^2.2.5", - "d3": "^3.5.17", "d3-array": "^1.2.4", "d3-color": "^1.2.0", "d3-scale": "^2.1.2", "d3-selection": "^1.3.2", - "d3-tip": "^0.9.1", "deck.gl": "^5.3.5", "dnd-core": "^2.6.0", "dompurify": "^1.0.3", @@ -103,7 +101,6 @@ "moment": "^2.20.1", "mousetrap": "^1.6.1", "mustache": "^2.2.1", - "nvd3": "1.8.6", "omnibar": "^2.1.1", "prop-types": "^15.6.0", "re-resizable": "^4.3.1", @@ -119,7 +116,6 @@ "react-dom": "^16.4.1", "react-gravatar": "^2.6.1", "react-hot-loader": "^4.3.6", - "react-loadable": "^5.5.0", "react-map-gl": "^3.0.4", "react-markdown": "^3.3.0", "react-redux": "^5.0.2", @@ -138,15 +134,15 @@ "redux-thunk": "^2.1.0", "redux-undo": "^1.0.0-beta9-9-7", "shortid": "^2.2.6", - "supercluster": "^4.1.1", "underscore": "^1.8.3", "urijs": "^1.18.10", - "viewport-mercator-project": "^5.0.0" + "viewport-mercator-project": "^6.1.1" }, "devDependencies": { "@babel/cli": "^7.2.3", "@babel/core": "^7.2.2", "@babel/node": "^7.2.2", + "@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/polyfill": "^7.0.0", "@babel/preset-env": "^7.2.3", "@babel/preset-react": "^7.0.0", @@ -161,7 +157,6 @@ "babel-plugin-css-modules-transform": "^1.1.0", "babel-plugin-dynamic-import-node": "^1.2.0", "babel-plugin-lodash": "^3.3.4", - "babel-plugin-syntax-dynamic-import": "^6.18.0", "babel-preset-airbnb": "^3.2.0", "cache-loader": "^1.2.2", "clean-webpack-plugin": "^0.1.19", diff --git a/superset/assets/stylesheets/d3tip.css b/superset/assets/stylesheets/d3tip.css deleted file mode 100644 index 1ae8bf57a..000000000 --- a/superset/assets/stylesheets/d3tip.css +++ /dev/null @@ -1,74 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* from d3-tip */ -.d3-tip { - line-height: 1; - padding: 12px; - background: rgba(0, 0, 0, 0.8); - color: #fff; - border-radius: 2px; - pointer-events: none; - z-index: 1000; -} - -/* Creates a small triangle extender for the tooltip */ -.d3-tip:after { - box-sizing: border-box; - display: inline; - font-size: 10px; - width: 100%; - line-height: 1; - color: rgba(0, 0, 0, 0.8); - position: absolute; - pointer-events: none; -} - -/* Northward tooltips */ -.d3-tip.n:after { - content: "\25BC"; - margin: -1px 0 0 0; - top: 100%; - left: 0; - text-align: center; -} - -/* Eastward tooltips */ -.d3-tip.e:after { - content: "\25C0"; - margin: -4px 0 0 0; - top: 50%; - left: -8px; -} - -/* Southward tooltips */ -.d3-tip.s:after { - content: "\25B2"; - margin: 0 0 1px 0; - top: -8px; - left: 0; - text-align: center; -} - -/* Westward tooltips */ -.d3-tip.w:after { - content: "\25B6"; - margin: -4px 0 0 -1px; - top: 50%; - left: 100%; -} diff --git a/superset/assets/webpack.config.js b/superset/assets/webpack.config.js index 81a459ef9..4c587c8b4 100644 --- a/superset/assets/webpack.config.js +++ b/superset/assets/webpack.config.js @@ -140,6 +140,7 @@ const config = { src: path.resolve(APP_DIR, './src'), }, extensions: ['.ts', '.tsx', '.js', '.jsx'], + symlinks: false, }, context: APP_DIR, // to automatically find tsconfig.json module: { @@ -175,11 +176,30 @@ const config = { { test: /\.jsx?$/, exclude: /node_modules/, + include: APP_DIR, loader: 'babel-loader', }, + { + // handle symlinked modules + // for debugging @superset-ui packages via npm link + test: /\.jsx?$/, + include: /node_modules\/[@]superset[-]ui.+\/src/, + use: [ + { + loader: 'babel-loader', + options: { + presets: ['airbnb', '@babel/preset-react', '@babel/preset-env'], + plugins: ['lodash', '@babel/plugin-syntax-dynamic-import', 'react-hot-loader/babel'], + }, + }, + ], + }, { test: /\.css$/, - include: APP_DIR, + include: [ + APP_DIR, + /superset[-]ui.+\/src/, + ], use: [ isDevMode ? 'style-loader' : MiniCssExtractPlugin.loader, 'css-loader',