Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 18 commits into from
Feb 10, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
86c6e10
move dist/extras and dist/topojson to vendor folder
archmoj Feb 4, 2021
7a99bf8
ignore vendor folder in eslint
archmoj Feb 4, 2021
e03aac2
add script to copy vendor over to dist
archmoj Feb 4, 2021
bd3f44a
run vendor_to_dist in preporcess before preprocess.js
archmoj Feb 4, 2021
0a38963
use vendor in tasks
archmoj Feb 5, 2021
d981b3d
use vendor in tests
archmoj Feb 5, 2021
198d46d
provide dist_readme at root, clear dist and do not commit dist
archmoj Feb 5, 2021
ef081bf
remove require js fixture - for now
archmoj Feb 4, 2021
a45bff4
use build folder for plotly.js.min for jasmine test
archmoj Feb 5, 2021
3cb18e3
keep cibuild for image test in build - do not pollute dist
archmoj Feb 5, 2021
af1f032
run duplicate key test last
archmoj Feb 9, 2021
335e6b4
specify node options for no-dup-keys test in config.yml
archmoj Feb 9, 2021
2f80ee5
move sane-topojson to dev-dependencies
archmoj Feb 9, 2021
fd427ec
bring back dist folder without extras and mathjax
archmoj Feb 9, 2021
0642fe8
replace vendor_to_dist shell script with add empty_dist.js and topojs…
archmoj Feb 10, 2021
3781b57
no longer need to exclude mathjax in no-new-func test
archmoj Feb 10, 2021
80d3090
add a publish test for requirejs
archmoj Feb 10, 2021
3fd1534
update stats task to point to where to find mathjax files
archmoj Feb 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 8 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion devtools/test_dashboard/devtools.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion devtools/test_dashboard/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
212 changes: 211 additions & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -133,6 +133,7 @@
"browserify": "^17.0.0",
"browserify-transform-tools": "^1.7.0",
"bubleify": "^2.0.0",
"canvas": "^2.6.1",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://www.npmjs.com/package/canvas

"check-node-version": "^4.0.3",
"chttps": "^1.0.6",
"deep-equal": "^2.0.5",
Expand Down Expand Up @@ -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"
Expand Down
Loading