Skip to content

Commit 003383f

Browse files
committed
Merge remote-tracking branch 'origin/master' into build-with-esbuild
- resolved conflicts in: .circleci/config.yml package-lock.json package.json test/jasmine/karma.conf.js webpack.config.js
2 parents e10ab24 + 64a8442 commit 003383f

File tree

1,574 files changed

+1531162
-1579151
lines changed

Some content is hidden

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

1,574 files changed

+1531162
-1579151
lines changed

Diff for: .circleci/config.yml

+26-70
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ orbs:
1010
# https://hub.docker.com/r/cimg/node/tags/
1111

1212
jobs:
13-
install-and-cibuild: # main cibuild using node 16 & npm 7
13+
install-and-cibuild:
1414
docker:
15-
- image: cimg/node:16.17.1
15+
- image: cimg/node:18.20.4
1616
working_directory: ~/plotly.js
1717
steps:
1818
- checkout
@@ -36,7 +36,7 @@ jobs:
3636
timezone-jasmine:
3737
docker:
3838
# need '-browsers' version to test in real (xvfb-wrapped) browsers
39-
- image: cimg/node:16.17.1-browsers
39+
- image: cimg/node:18.20.4-browsers
4040
working_directory: ~/plotly.js
4141
steps:
4242
- browser-tools/install-browser-tools: &browser-versions
@@ -68,7 +68,7 @@ jobs:
6868
no-gl-jasmine:
6969
docker:
7070
# need '-browsers' version to test in real (xvfb-wrapped) browsers
71-
- image: cimg/node:16.17.1-browsers
71+
- image: cimg/node:18.20.4-browsers
7272
environment:
7373
# Alaska time (arbitrary timezone to test date logic)
7474
TZ: "America/Anchorage"
@@ -87,7 +87,7 @@ jobs:
8787
webgl-jasmine:
8888
docker:
8989
# need '-browsers' version to test in real (xvfb-wrapped) browsers
90-
- image: cimg/node:16.17.1-browsers
90+
- image: cimg/node:18.20.4-browsers
9191
environment:
9292
# Alaska time (arbitrary timezone to test date logic)
9393
TZ: "America/Anchorage"
@@ -106,7 +106,7 @@ jobs:
106106
virtual-webgl-jasmine:
107107
docker:
108108
# need '-browsers' version to test in real (xvfb-wrapped) browsers
109-
- image: cimg/node:16.17.1-browsers
109+
- image: cimg/node:18.20.4-browsers
110110
environment:
111111
# Alaska time (arbitrary timezone to test date logic)
112112
TZ: "America/Anchorage"
@@ -125,7 +125,7 @@ jobs:
125125
flaky-no-gl-jasmine:
126126
docker:
127127
# need '-browsers' version to test in real (xvfb-wrapped) browsers
128-
- image: cimg/node:16.17.1-browsers
128+
- image: cimg/node:18.20.4-browsers
129129
environment:
130130
# Alaska time (arbitrary timezone to test date logic)
131131
TZ: "America/Anchorage"
@@ -143,7 +143,7 @@ jobs:
143143
bundle-jasmine:
144144
docker:
145145
# need '-browsers' version to test in real (xvfb-wrapped) browsers
146-
- image: cimg/node:16.17.1-browsers
146+
- image: cimg/node:18.20.4-browsers
147147
environment:
148148
# Alaska time (arbitrary timezone to test date logic)
149149
TZ: "America/Anchorage"
@@ -158,48 +158,10 @@ jobs:
158158
name: Run jasmine tests (part D)
159159
command: .circleci/test.sh bundle-jasmine
160160

161-
mathjax-firefox81:
162-
docker:
163-
# need '-browsers' version to test in real (xvfb-wrapped) browsers
164-
- image: cimg/node:16.17.1-browsers
165-
environment:
166-
# Alaska time (arbitrary timezone to test date logic)
167-
TZ: "America/Anchorage"
168-
working_directory: ~/plotly.js
169-
steps:
170-
- browser-tools/install-browser-tools: &browser-versions
171-
firefox-version: '81.0'
172-
install-chrome: false
173-
install-chromedriver: false
174-
- attach_workspace:
175-
at: ~/
176-
- run:
177-
name: Test MathJax on firefox-81
178-
command: .circleci/test.sh mathjax-firefox
179-
180-
mathjax-firefox82:
181-
docker:
182-
# need '-browsers' version to test in real (xvfb-wrapped) browsers
183-
- image: cimg/node:16.17.1-browsers
184-
environment:
185-
# Alaska time (arbitrary timezone to test date logic)
186-
TZ: "America/Anchorage"
187-
working_directory: ~/plotly.js
188-
steps:
189-
- browser-tools/install-browser-tools: &browser-versions
190-
firefox-version: '82.0'
191-
install-chrome: false
192-
install-chromedriver: false
193-
- attach_workspace:
194-
at: ~/
195-
- run:
196-
name: Test MathJax on firefox-82
197-
command: .circleci/test.sh mathjax-firefox82+
198-
199161
mathjax-firefoxLatest:
200162
docker:
201163
# need '-browsers' version to test in real (xvfb-wrapped) browsers
202-
- image: cimg/node:16.17.1-browsers
164+
- image: cimg/node:18.20.4-browsers
203165
environment:
204166
# Alaska time (arbitrary timezone to test date logic)
205167
TZ: "America/Anchorage"
@@ -212,10 +174,10 @@ jobs:
212174
at: ~/
213175
- run:
214176
name: Test MathJax on firefox-latest
215-
command: .circleci/test.sh mathjax-firefox82+
177+
command: .circleci/test.sh mathjax-firefox
216178

217179
make-baselines-virtual-webgl:
218-
parallelism: 4
180+
parallelism: 8
219181
docker:
220182
- image: circleci/python:3.8.9
221183
working_directory: ~/plotly.js
@@ -252,7 +214,7 @@ jobs:
252214
- plotly.js
253215

254216
make-baselines:
255-
parallelism: 4
217+
parallelism: 12
256218
docker:
257219
- image: circleci/python:3.8.9
258220
working_directory: ~/plotly.js
@@ -271,7 +233,7 @@ jobs:
271233
- plotly.js
272234

273235
make-baselines-b64:
274-
parallelism: 4
236+
parallelism: 12
275237
docker:
276238
- image: circleci/python:3.8.9
277239
working_directory: ~/plotly.js
@@ -291,7 +253,7 @@ jobs:
291253

292254
test-baselines:
293255
docker:
294-
- image: circleci/node:16.9.0
256+
- image: cimg/node:18.20.4
295257
working_directory: ~/plotly.js
296258
steps:
297259
- attach_workspace:
@@ -305,7 +267,7 @@ jobs:
305267

306268
test-baselines-virtual-webgl:
307269
docker:
308-
- image: circleci/node:16.9.0
270+
- image: cimg/node:18.20.4
309271
working_directory: ~/plotly.js
310272
steps:
311273
- attach_workspace:
@@ -319,7 +281,7 @@ jobs:
319281

320282
test-baselines-b64:
321283
docker:
322-
- image: circleci/node:16.9.0
284+
- image: cimg/node:18.20.4
323285
working_directory: ~/plotly.js
324286
steps:
325287
- attach_workspace:
@@ -333,7 +295,7 @@ jobs:
333295

334296
test-baselines-mathjax3:
335297
docker:
336-
- image: circleci/node:16.9.0
298+
- image: cimg/node:18.20.4
337299
working_directory: ~/plotly.js
338300
steps:
339301
- attach_workspace:
@@ -358,8 +320,8 @@ jobs:
358320
- run:
359321
name: Install poppler-utils to have pdftops for exporting eps
360322
command: |
361-
sudo apt-get update --allow-releaseinfo-change
362-
sudo apt-get install poppler-utils
323+
sudo apt-get update --allow-releaseinfo-change
324+
sudo apt-get install poppler-utils
363325
- run:
364326
name: Create svg, jpg, jpeg, webp, pdf and eps files
365327
command: python3 test/image/make_exports.py
@@ -370,7 +332,7 @@ jobs:
370332

371333
test-exports:
372334
docker:
373-
- image: circleci/node:16.9.0
335+
- image: cimg/node:18.20.4
374336
working_directory: ~/plotly.js
375337
steps:
376338
- attach_workspace:
@@ -384,7 +346,7 @@ jobs:
384346

385347
mock-validation:
386348
docker:
387-
- image: cimg/node:16.17.1
349+
- image: cimg/node:18.20.4
388350
working_directory: ~/plotly.js
389351
steps:
390352
- attach_workspace:
@@ -398,7 +360,7 @@ jobs:
398360

399361
source-syntax:
400362
docker:
401-
- image: cimg/node:16.17.1
363+
- image: cimg/node:18.20.4
402364
working_directory: ~/plotly.js
403365
steps:
404366
- attach_workspace:
@@ -409,7 +371,7 @@ jobs:
409371

410372
publish-dist:
411373
docker:
412-
- image: cimg/node:16.17.1
374+
- image: cimg/node:18.20.4
413375
working_directory: ~/plotly.js
414376
steps:
415377
- checkout
@@ -468,12 +430,12 @@ jobs:
468430
name: Test plotly.min.js import using amdefine
469431
command: npm run test-amdefine
470432
- run:
471-
name: Test plotly bundles against es6
472-
command: npm run no-es6-dist
433+
name: Test plotly.min.js import using requirejs
434+
command: npm run test-requirejs
473435

474436
test-stackgl-bundle:
475437
docker:
476-
- image: cimg/node:16.17.1
438+
- image: cimg/node:18.20.4
477439
working_directory: ~/plotly.js
478440
steps:
479441
- checkout
@@ -501,12 +463,6 @@ workflows:
501463
- bundle-jasmine:
502464
requires:
503465
- install-and-cibuild
504-
- mathjax-firefox81:
505-
requires:
506-
- install-and-cibuild
507-
- mathjax-firefox82:
508-
requires:
509-
- install-and-cibuild
510466
- mathjax-firefoxLatest:
511467
requires:
512468
- install-and-cibuild

Diff for: .circleci/test.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ case $1 in
8484
exit $EXIT_STATE
8585
;;
8686

87-
mathjax-firefox82+)
88-
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --skip-tags=noFF82 --nowatch &&
89-
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --mathjax3 --skip-tags=noFF82 --nowatch &&
87+
mathjax-firefox)
88+
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --nowatch &&
89+
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --mathjax3 --nowatch &&
9090
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_config --mathjax3 --nowatch &&
9191
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_config --nowatch || EXIT_STATE=$?
9292
exit $EXIT_STATE
@@ -95,14 +95,14 @@ case $1 in
9595
make-baselines-virtual-webgl)
9696
SUITE=$({\
9797
find $ROOT/test/image/mocks/gl* -type f -printf "%f\n"; \
98-
find $ROOT/test/image/mocks/mapbox* -type f -printf "%f\n"; \
98+
find $ROOT/test/image/mocks/map* -type f -printf "%f\n"; \
9999
} | sed 's/\.json$//1' | circleci tests split)
100100
python3 test/image/make_baseline.py virtual-webgl $SUITE || EXIT_STATE=$?
101101
exit $EXIT_STATE
102102
;;
103103

104104
make-baselines-mathjax3)
105-
python3 test/image/make_baseline.py mathjax3 legend_mathjax_title_and_items mathjax parcats_grid_subplots table_latex_multitrace_scatter table_plain_birds table_wrapped_birds ternary-mathjax || EXIT_STATE=$?
105+
python3 test/image/make_baseline.py mathjax3 legend_mathjax_title_and_items mathjax parcats_grid_subplots table_latex_multitrace_scatter table_plain_birds table_wrapped_birds ternary-mathjax ternary-mathjax-title-place-subtitle || EXIT_STATE=$?
106106
exit $EXIT_STATE
107107
;;
108108

Diff for: .eslintignore

-8
This file was deleted.

Diff for: .eslintrc

-82
This file was deleted.

Diff for: .gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,3 @@ tags
1515
!.circleci
1616
!.gitignore
1717
!.npmignore
18-
!.eslintrc
19-
!.eslintignore

Diff for: .npmignore

-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,5 @@ bower.json
1414

1515
.ackrc
1616
.agignore
17-
.eslintignore
18-
.eslintrc
1917

2018
npm-debug.log

0 commit comments

Comments
 (0)