Merge pull request #5487 from plotly/start-vendor-end-dist

Create vendor folder and fresh dist as a target only without extras including mathjax

.circleci/config.yml

@@ -173,15 +173,20 @@ jobs:
       - run:
           name: Test plotly bundles againt unexpected characters
           command: npm run no-bad-char
-      - run:
-          name: Test plotly bundles againt duplicate keys
-          command: npm run no-dup-keys
       - run:
           name: Test certain bundles against function constructors
           command: npm run no-new-func
       - run:
           name: Test plotly bundles against es6
           command: npm run no-es6-dist
+      - run:
+          name: Test plotly bundles againt duplicate keys
+          environment:
+            NODE_OPTIONS: --max_old_space_size=4096
+          command: npm run no-dup-keys
+      - run:
+          name: Test plotly.min.js import using requirejs
+          command: npm run test-requirejs
 
 workflows:
   version: 2

.eslintignore

@@ -1,6 +1,7 @@
 node_modules
+vendor
 dist
 build
 
+tasks/test_requirejs.js
 test/jasmine/assets/jquery-1.8.3.min.js
-src/plots/polar/legacy/micropolar.js

devtools/test_dashboard/devtools.js

@@ -19,7 +19,7 @@ var Tabs = {
         Plotly.setPlotConfig({
 
             // use local topojson files
-            topojsonURL: '../../dist/topojson/',
+            topojsonURL: '../../vendor/topojson/',
 
             // register mapbox access token
             // run `npm run preset` if you haven't yet

devtools/test_dashboard/index.html

@@ -19,7 +19,7 @@
   </div>
   <div id="snapshot"></div>
 
-  <script src="../../dist/extras/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
+  <script src="../../vendor/extras/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
   <script id="source" src="../../build/plotly.js" charset="utf-8"></script>
   <script src="../../build/test_dashboard-bundle.js" charset="utf-8"></script>
 </body>

package.json

@@ -26,12 +26,12 @@
     "header-dist": "node tasks/header_dist.js",
     "stats": "node tasks/stats.js",
     "find-strings": "node tasks/find_locale_strings.js",
-    "build": "npm run preprocess && npm run find-strings && npm run bundle && npm run header-dist && npm run stats",
-    "cibuild": "npm run preprocess && node tasks/cibundle.js",
+    "build": "node tasks/empty_dist.js && npm run preprocess && node tasks/topojson_dist.js && npm run find-strings && npm run bundle && npm run header-dist && npm run stats",
+    "cibuild": "node tasks/empty_dist.js && npm run preprocess && node tasks/cibundle.js",
     "watch": "node tasks/watch.js",
     "lint": "eslint --version && eslint .",
     "lint-fix": "eslint . --fix || true",
-    "no-new-func": "eslint --no-ignore --no-eslintrc --no-inline-config --rule '{no-new-func: error}' $(find dist -type f -iname '*.js' | grep -v plotly-gl* | grep -v plotly-with-meta.* | grep -v plotly.js | grep -v plotly.min.js | grep -v MathJax.js)",
+    "no-new-func": "eslint --no-ignore --no-eslintrc --no-inline-config --rule '{no-new-func: error}' $(find dist -type f -iname '*.js' | grep -v plotly-gl* | grep -v plotly-with-meta.* | grep -v plotly.js | grep -v plotly.min.js)",
     "no-bad-char": "eslint --no-ignore --no-eslintrc --no-inline-config --rule '{no-misleading-character-class: error}' $(find dist -type f -iname '*.js' | grep plotly)",
     "no-dup-keys": "eslint --no-ignore --no-eslintrc --no-inline-config --rule '{no-dupe-keys: error}' $(find dist -type f -iname '*.js' | grep plotly)",
     "no-es6-dist": "node tasks/no_es6_dist.js",
@@ -42,6 +42,7 @@
     "test-export": "node tasks/test_export.js",
     "test-syntax": "node tasks/test_syntax.js && npm run find-strings -- --no-output",
     "test-bundle": "node tasks/test_bundle.js",
+    "test-requirejs": "node tasks/test_requirejs.js",
     "test": "npm run test-jasmine -- --nowatch && npm run test-bundle && npm run test-image && npm run test-export && npm run test-syntax && npm run lint",
     "start-test_dashboard": "node devtools/test_dashboard/server.js",
     "start-image_viewer": "node devtools/image_viewer/server.js",
@@ -118,7 +119,6 @@
     "regl-splom": "^1.0.14",
     "right-now": "^1.0.0",
     "robust-orientation": "^1.1.3",
-    "sane-topojson": "^4.0.0",
     "strongly-connected-components": "^1.0.1",
     "superscript-text": "^1.0.0",
     "svg-path-sdf": "^1.1.3",
@@ -133,6 +133,7 @@
     "browserify": "^17.0.0",
     "browserify-transform-tools": "^1.7.0",
     "bubleify": "^2.0.0",
+    "canvas": "^2.6.1",
     "check-node-version": "^4.0.3",
     "chttps": "^1.0.6",
     "deep-equal": "^2.0.5",
@@ -170,8 +171,8 @@
     "prepend-file": "^2.0.0",
     "prettysize": "^2.0.0",
     "read-last-lines": "^1.7.2",
-    "requirejs": "^2.3.6",
     "run-series": "^1.1.9",
+    "sane-topojson": "^4.0.0",
     "through2": "^4.0.2",
     "true-case-path": "^2.2.1",
     "watchify": "^3.11.1"