Skip to content

Commit 372bf82

Browse files
archmojarchmoj
authored
Merge pull request #5487 from plotly/start-vendor-end-dist
Create vendor folder and fresh dist as a target only without extras including mathjax
2 parents 6f031b2 + 3fd1534 commit 372bf82

File tree

430 files changed

+326
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

430 files changed

+326
-70
lines changed

‎.circleci/config.yml

+8-3
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,20 @@ jobs:
173173
- run:
174174
name: Test plotly bundles againt unexpected characters
175175
command: npm run no-bad-char
176-
- run:
177-
name: Test plotly bundles againt duplicate keys
178-
command: npm run no-dup-keys
179176
- run:
180177
name: Test certain bundles against function constructors
181178
command: npm run no-new-func
182179
- run:
183180
name: Test plotly bundles against es6
184181
command: npm run no-es6-dist
182+
- run:
183+
name: Test plotly bundles againt duplicate keys
184+
environment:
185+
NODE_OPTIONS: --max_old_space_size=4096
186+
command: npm run no-dup-keys
187+
- run:
188+
name: Test plotly.min.js import using requirejs
189+
command: npm run test-requirejs
185190

186191
workflows:
187192
version: 2

‎.eslintignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
node_modules
2+
vendor
23
dist
34
build
45

6+
tasks/test_requirejs.js
57
test/jasmine/assets/jquery-1.8.3.min.js
6-
src/plots/polar/legacy/micropolar.js

‎devtools/test_dashboard/devtools.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var Tabs = {
1919
Plotly.setPlotConfig({
2020

2121
// use local topojson files
22-
topojsonURL: '../../dist/topojson/',
22+
topojsonURL: '../../vendor/topojson/',
2323

2424
// register mapbox access token
2525
// run `npm run preset` if you haven't yet

‎devtools/test_dashboard/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</div>
2020
<div id="snapshot"></div>
2121

22-
<script src="../../dist/extras/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
22+
<script src="../../vendor/extras/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
2323
<script id="source" src="../../build/plotly.js" charset="utf-8"></script>
2424
<script src="../../build/test_dashboard-bundle.js" charset="utf-8"></script>
2525
</body>

‎package-lock.json

+211-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
"header-dist": "node tasks/header_dist.js",
2727
"stats": "node tasks/stats.js",
2828
"find-strings": "node tasks/find_locale_strings.js",
29-
"build": "npm run preprocess && npm run find-strings && npm run bundle && npm run header-dist && npm run stats",
30-
"cibuild": "npm run preprocess && node tasks/cibundle.js",
29+
"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",
30+
"cibuild": "node tasks/empty_dist.js && npm run preprocess && node tasks/cibundle.js",
3131
"watch": "node tasks/watch.js",
3232
"lint": "eslint --version && eslint .",
3333
"lint-fix": "eslint . --fix || true",
34-
"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)",
34+
"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)",
3535
"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)",
3636
"no-dup-keys": "eslint --no-ignore --no-eslintrc --no-inline-config --rule '{no-dupe-keys: error}' $(find dist -type f -iname '*.js' | grep plotly)",
3737
"no-es6-dist": "node tasks/no_es6_dist.js",
@@ -42,6 +42,7 @@
4242
"test-export": "node tasks/test_export.js",
4343
"test-syntax": "node tasks/test_syntax.js && npm run find-strings -- --no-output",
4444
"test-bundle": "node tasks/test_bundle.js",
45+
"test-requirejs": "node tasks/test_requirejs.js",
4546
"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",
4647
"start-test_dashboard": "node devtools/test_dashboard/server.js",
4748
"start-image_viewer": "node devtools/image_viewer/server.js",
@@ -118,7 +119,6 @@
118119
"regl-splom": "^1.0.14",
119120
"right-now": "^1.0.0",
120121
"robust-orientation": "^1.1.3",
121-
"sane-topojson": "^4.0.0",
122122
"strongly-connected-components": "^1.0.1",
123123
"superscript-text": "^1.0.0",
124124
"svg-path-sdf": "^1.1.3",
@@ -133,6 +133,7 @@
133133
"browserify": "^17.0.0",
134134
"browserify-transform-tools": "^1.7.0",
135135
"bubleify": "^2.0.0",
136+
"canvas": "^2.6.1",
136137
"check-node-version": "^4.0.3",
137138
"chttps": "^1.0.6",
138139
"deep-equal": "^2.0.5",
@@ -170,8 +171,8 @@
170171
"prepend-file": "^2.0.0",
171172
"prettysize": "^2.0.0",
172173
"read-last-lines": "^1.7.2",
173-
"requirejs": "^2.3.6",
174174
"run-series": "^1.1.9",
175+
"sane-topojson": "^4.0.0",
175176
"through2": "^4.0.2",
176177
"true-case-path": "^2.2.1",
177178
"watchify": "^3.11.1"

0 commit comments

Comments
 (0)