8000 Use Node 10 and npm 6 for development by etpinard · Pull Request #2934 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

Use Node 10 and npm 6 for development #2934

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

Merged
merged 13 commits into from
Aug 23, 2018
Merged

Use Node 10 and npm 6 for development #2934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f6b37de
update package-lock for npm@6.2.0
etpinard Aug 20, 2018
42da79e
use node:10.9.0 images on CI
etpinard Aug 20, 2018
8e1e7b2
update CONTRIBUTING making node10 + npm6 recommended
etpinard Aug 20, 2018
3d5b752
enforce node 10 and npm 6 in preversion step
etpinard Aug 20, 2018
06346a8
Merge branch 'master' into node10
etpinard Aug 21, 2018
fadd617
try adding --disable-fine-grained-time-zone-detection
etpinard Aug 23, 2018
4a623d5
lower tolerence in splom drag test
etpinard Aug 23, 2018
c2bdf2a
try more timezone-related flags
etpinard Aug 23, 2018
9c63701
export TZ env variable to setup localtime for chrome
etpinard Aug 23, 2018
f4f95f5
move timezone setup to test.sh
etpinard Aug 23, 2018
9615736
clean package-lock version
etpinard Aug 23, 2018
5e4364d
Merge branch 'master' into node10
etpinard Aug 23, 2018
9b45219
post master-merge package-lock fixups
etpinard Aug 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions .circleci/config.yml
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version: 2.0
jobs:
build:
docker:
- image: circleci/node:8.9.4
- image: circleci/node:10.9.0
working_directory: ~/plotly.js
steps:
- checkout
Expand Down Expand Up @@ -47,33 +47,25 @@ jobs:
test-jasmine:
docker:
# need '-browsers' version to test in real (xvfb-wrapped) browsers
- image: circleci/node:8.9.4-browsers
- image: circleci/node:10.9.0-browsers
working_directory: ~/plotly.js
steps:
- checkout
- attach_workspace:
at: ~/plotly.js
- run:
name: Set timezone to Alaska time (arbitrary timezone to test date logic)
command: |
sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
- run:
name: Run jasmine tests (batch 1)
command: ./.circleci/test.sh jasmine

test-jasmine2:
docker:
# need '-browsers' version to test in real (xvfb-wrapped) browsers
- image: circleci/node:8.9.4-browsers
- image: circleci/node:10.9.0-browsers
working_directory: ~/plotly.js
steps:
- checkout
- attach_workspace:
at: ~/plotly.js
- run:
name: Set timezone to Alaska time (arbitrary timezone to test date logic)
command: |
sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
- run:
name: Run jasmine tests (batch 2)
command: ./.circleci/test.sh jasmine2
Expand Down Expand Up @@ -118,7 +110,7 @@ jobs:

test-syntax:
docker:
- image: circleci/node:8.9.4
- image: circleci/node:10.9.0
working_directory: ~/plotly.js
steps:
- checkout
Expand Down
11 changes: 11 additions & 0 deletions .circleci/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,27 @@ retry () {
fi
}

# set timezone to Alaska time (arbitrary timezone to test date logic)
set_tz () {
sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
export TZ='America/Anchorage'
}

case $1 in

jasmine)
set_tz

npm run test-jasmine -- --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
retry npm run test-jasmine -- --tags=flaky --skip-tags=noCI
npm run test-bundle || EXIT_STATE=$?

exit $EXIT_STATE
;;

jasmine2)
set_tz

SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=gl))

for s in ${SHARDS[@]}; do
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
#### Prerequisites

- git
- [node.js](https://nodejs.org/en/). We recommend using node.js v8.x, but all
- [node.js](https://nodejs.org/en/). We recommend using node.js v10.x, but all
versions starting from v6 should work. Upgrading and managing node versions
can be easily done using [`nvm`](https://github.com/creationix/nvm) or its
Windows alternatives.
- [`npm`](https://www.npmjs.com/) v5.x and up (which ships by default with
node.js v8.x) to ensure that the
- [`npm`](https://www.npmjs.com/) v6.x and up (which ships by default with
node.js v10.x) to ensure that the
[`package-lock.json`](https://docs.npmjs.com/files/package-lock.json) file is
used and updated correctly.

Expand Down
Loading
0