Skip to content

Switch to node8 & npm5#2323

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
etpinard merged 11 commits into from
Feb 2, 2018
Merged

Switch to node8 & npm5 #2323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
671861a
bump to node8/npm5 -> add package-lock.json
etpinard Feb 1, 2018
8b906cb
fix typos in md files
etpinard Feb 1, 2018
a859456
bump to node8/npm5 -> update circleci config
etpinard Feb 1, 2018
14a934b
update contributing info about node/npm versions
etpinard Feb 1, 2018
21c73e9
rm dedupe step in preversion (npm5 takes care of that ;)
etpinard Feb 1, 2018
0c1ff28
add check-node-version step in preversion
etpinard Feb 1, 2018
12bfbcc
bump eslint to 4.16.0
etpinard Feb 1, 2018
6c13e9a
:hocho: dist/npm-ls.json
etpinard Feb 1, 2018
278e7dc
update dev deps
etpinard Feb 1, 2018
c57a507
bump browserify & karma
etpinard Feb 1, 2018
b975f0b
move minify-stream a from deps -> dev-deps
etpinard Feb 1, 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: 8 additions & 8 deletions .circleci/config.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,25 +3,25 @@ version: 2.0
# Inspired by:
# https://github.com/CircleCI-Public/circleci-demo-workflows/blob/workspace-forwarding/.circleci/config.yml
# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
#
# For list of official CircleCI node.js images, go to:
# https://hub.docker.com/r/circleci/node/tags/

jobs:
build:
docker:
- image: circleci/node:6.10.3
- image: circleci/node:8.9.4
working_directory: ~/plotly.js
steps:
- checkout
- restore_cache:
keys:
- v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package.json" }}
- v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package.json" }}
- v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package-lock.json" }}
- v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package-lock.json" }}
- run:
name: Install dependencies
command: |
npm install
npm dedupe
npm prune
npm install
- run:
name: List dependency versions
command: |
Expand All@@ -47,7 +47,7 @@ jobs:
test-jasmine:
docker:
# need '-browsers' version to test in real (xvfb-wrapped) browsers
- image: circleci/node:6.10.3-browsers
- image: circleci/node:8.9.4-browsers
working_directory: ~/plotly.js
steps:
- checkout
Expand DownExpand Up@@ -82,7 +82,7 @@ jobs:

test-syntax:
docker:
- image: circleci/node:6.10.3
- image: circleci/node:8.9.4
working_directory: ~/plotly.js
steps:
- checkout
Expand Down
8 changes: 5 additions & 3 deletions .eslintrc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@
"no-trailing-spaces": [2],
"no-multiple-empty-lines": [2, {"max": 2, "maxEOF": 0}],
"eol-last": [2],
"indent": [2, 4, {"SwitchCase": 1}],
"indent": [0],
"indent-legacy": [2, 4, {"SwitchCase": 1}],
"max-len": [0, 80],
"brace-style": [0, "stroustrup", {"allowSingleLine": true}],
"curly": [2, "multi-line"],
Expand All@@ -46,7 +47,7 @@
"space-before-blocks": [2],
"spaced-comment": [2, "always"],
"no-tabs": [2],
"no-multi-spaces": [2],
"no-multi-spaces": [2, {"ignoreEOLComments": true}],
"no-whitespace-before-property": [2],
"no-unexpected-multiline": [2],
"no-floating-decimal": [2],
Expand All@@ -65,6 +66,7 @@
"no-use-before-define": [2, "nofunc"],
"no-loop-func": [2],
"no-console": [0],
"no-unused-labels": [2]
"no-unused-labels": [2],
"no-useless-escape": [0]

@alexcjohnsonalexcjohnsonFeb 1, 2018

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

how badly do we break this rule?

@etpinardetpinardFeb 1, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

this bad:

image

@etpinardetpinardFeb 2, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

... and they are not auto-fixable (using eslint . --fix) unfortunately.

@etpinardetpinardFeb 2, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

... and I don't want to waste time with linting stuff. I really think we should be switching to standardjs and be done with it (cc #950) 😛

}
}
3 changes: 2 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@ Developers are strongly encouraged to first make a PR to their own plotly.js for
Before opening a pull request, developer should:

- `git rebase` their local branch off the latest `master`,
- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on verion bumps),
- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on version bumps),
- make sure to commit changes to the `package-lock.json` file (if any),
- write an overview of what the PR attempts to do,
- select the _Allow edits from maintainers_ option (see this [article](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) for more details).

Expand Down
17 changes: 11 additions & 6 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,19 +24,24 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
| `type: community` | issue left open for community input and pull requests |
| `type: duplicate` | *self-explanatory* |
| `type: wontfix` | *self-explanatory* |
| `status: discussion needed` | Issue or PR that required discussion among maintaners before moving forward |
| `status: in progress` | PRs that required some intial feedback but not ready to merge |
| `status: discussion needed` | Issue or PR that required discussion among maintainers before moving forward |
| `status: in progress` | PRs that required some initial feedback but not ready to merge |
| `status: reviewable` | PRs that are completed from the author's perspective |
| `status: on hold` | PRs that are put on hold |

## Development

#### Perequisites
#### Prerequisites

- git
- [node.js](https://nodejs.org/en/). We recommend using node.js v6.x or v4.x (both LTS).
Upgrading and managing node versions can be easily done using
[`nvm`](https://github.com/creationix/nvm) or its Windows alternatives.
- [node.js](https://nodejs.org/en/). We recommend using node.js v8.x, but all
versions starting from v4 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
[`package-lock.json`](https://docs.npmjs.com/files/package-lock.json) file is
used and updated correctly.

#### Step 1: Clone the plotly.js repo and install its dependencies

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Switch to node8 & npm5 by etpinard · Pull Request #2323 · plotly/plotly.js · GitHub
Skip to content
Switch to node8 & npm5#2323

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

etpinard
merged 11 commits into

from

Feb 2, 2018
 Merged


Switch to node8 & npm5
#2323
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
671861a

bump to node8/npm5 -> add package-lock.json


etpinard Feb 1, 2018
8b906cb

fix typos in md files


etpinard Feb 1, 2018
a859456

bump to node8/npm5 -> update circleci config


etpinard Feb 1, 2018
14a934b

update contributing info about node/npm versions


etpinard Feb 1, 2018
21c73e9

rm dedupe step in preversion (npm5 takes care of that ;)


etpinard Feb 1, 2018
0c1ff28

add check-node-version step in preversion


etpinard Feb 1, 2018
12bfbcc

bump eslint to 4.16.0


etpinard Feb 1, 2018
6c13e9a

:hocho: dist/npm-ls.json


etpinard Feb 1, 2018
278e7dc

update dev deps


etpinard Feb 1, 2018
c57a507

bump browserify & karma


etpinard Feb 1, 2018
b975f0b

move minify-stream a from deps -> dev-deps


etpinard Feb 1, 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: 8 additions & 8 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,25 +3,25 @@ version: 2.0
# Inspired by:
# https://github.com/CircleCI-Public/circleci-demo-workflows/blob/workspace-forwarding/.circleci/config.yml
# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
#
# For list of official CircleCI node.js images, go to:
# https://hub.docker.com/r/circleci/node/tags/

jobs:
 build:
 docker:
 - image: circleci/node:6.10.3
 - image: circleci/node:8.9.4
 working_directory: ~/plotly.js
 steps:
 - checkout
 - restore_cache:
 keys:
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package-lock.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package-lock.json" }}
 - run:
 name: Install dependencies
 command: |
 npm install
 npm dedupe
 npm prune
 npm install
 - run:
 name: List dependency versions
 command: |
Expand All@@ -47,7 +47,7 @@ jobs:
 test-jasmine:
 docker:
 # need '-browsers' version to test in real (xvfb-wrapped) browsers
 - image: circleci/node:6.10.3-browsers
 - image: circleci/node:8.9.4-browsers
 working_directory: ~/plotly.js
 steps:
 - checkout
Expand DownExpand Up@@ -82,7 +82,7 @@ jobs:

 test-syntax:
 docker:
 - image: circleci/node:6.10.3
 - image: circleci/node:8.9.4
 working_directory: ~/plotly.js
 steps:
 - checkout
Expand Down

8 changes: 5 additions & 3 deletions
.eslintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@
 "no-trailing-spaces": [2],
 "no-multiple-empty-lines": [2, {"max": 2, "maxEOF": 0}],
 "eol-last": [2],
 "indent": [2, 4, {"SwitchCase": 1}],
 "indent": [0],
 "indent-legacy": [2, 4, {"SwitchCase": 1}],
 "max-len": [0, 80],
 "brace-style": [0, "stroustrup", {"allowSingleLine": true}],
 "curly": [2, "multi-line"],
Expand All@@ -46,7 +47,7 @@
 "space-before-blocks": [2],
 "spaced-comment": [2, "always"],
 "no-tabs": [2],
 "no-multi-spaces": [2],
 "no-multi-spaces": [2, {"ignoreEOLComments": true}],
 "no-whitespace-before-property": [2],
 "no-unexpected-multiline": [2],
 "no-floating-decimal": [2],
Expand All@@ -65,6 +66,7 @@
 "no-use-before-define": [2, "nofunc"],
 "no-loop-func": [2],
 "no-console": [0],
 "no-unused-labels": [2]
 "no-unused-labels": [2],
 "no-useless-escape": [0]
@alexcjohnsonalexcjohnsonFeb 1, 2018

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

how badly do we break this rule?
@etpinardetpinardFeb 1, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

this bad:
image
@etpinardetpinardFeb 2, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

... and they are not auto-fixable (using eslint . --fix) unfortunately.
@etpinardetpinardFeb 2, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

... and I don't want to waste time with linting stuff. I really think we should be switching to standardjs and be done with it (cc #950) 😛
 }
}

3 changes: 2 additions & 1 deletion
.github/PULL_REQUEST_TEMPLATE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@ Developers are strongly encouraged to first make a PR to their own plotly.js for
Before opening a pull request, developer should: 

- `git rebase` their local branch off the latest `master`,
- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on verion bumps),
- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on version bumps),
- make sure to commit changes to the `package-lock.json` file (if any),
- write an overview of what the PR attempts to do,
- select the _Allow edits from maintainers_ option (see this [article](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) for more details).

Expand Down

17 changes: 11 additions & 6 deletions
CONTRIBUTING.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,19 +24,24 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
| `type: community` | issue left open for community input and pull requests |
| `type: duplicate` | *self-explanatory* |
| `type: wontfix` | *self-explanatory* |
| `status: discussion needed` | Issue or PR that required discussion among maintaners before moving forward |
| `status: in progress` | PRs that required some intial feedback but not ready to merge |
| `status: discussion needed` | Issue or PR that required discussion among maintainers before moving forward |
| `status: in progress` | PRs that required some initial feedback but not ready to merge |
| `status: reviewable` | PRs that are completed from the author's perspective |
| `status: on hold` | PRs that are put on hold |

## Development

#### Perequisites
#### Prerequisites

- git
- [node.js](https://nodejs.org/en/). We recommend using node.js v6.x or v4.x (both LTS).
 Upgrading and managing node versions can be easily done using
 [`nvm`](https://github.com/creationix/nvm) or its Windows alternatives.
- [node.js](https://nodejs.org/en/). We recommend using node.js v8.x, but all
 versions starting from v4 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
 [`package-lock.json`](https://docs.npmjs.com/files/package-lock.json) file is
 used and updated correctly.

#### Step 1: Clone the plotly.js repo and install its dependencies

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Switch to node8 & npm5 by etpinard · Pull Request #2323 · plotly/plotly.js · GitHub
Skip to content
Switch to node8 & npm5#2323

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

etpinard
merged 11 commits into

from

Feb 2, 2018
 Merged


Switch to node8 & npm5
#2323
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
671861a

bump to node8/npm5 -> add package-lock.json


etpinard Feb 1, 2018
8b906cb

fix typos in md files


etpinard Feb 1, 2018
a859456

bump to node8/npm5 -> update circleci config


etpinard Feb 1, 2018
14a934b

update contributing info about node/npm versions


etpinard Feb 1, 2018
21c73e9

rm dedupe step in preversion (npm5 takes care of that ;)


etpinard Feb 1, 2018
0c1ff28

add check-node-version step in preversion


etpinard Feb 1, 2018
12bfbcc

bump eslint to 4.16.0


etpinard Feb 1, 2018
6c13e9a

:hocho: dist/npm-ls.json


etpinard Feb 1, 2018
278e7dc

update dev deps


etpinard Feb 1, 2018
c57a507

bump browserify & karma


etpinard Feb 1, 2018
b975f0b

move minify-stream a from deps -> dev-deps


etpinard Feb 1, 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: 8 additions & 8 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,25 +3,25 @@ version: 2.0
# Inspired by:
# https://github.com/CircleCI-Public/circleci-demo-workflows/blob/workspace-forwarding/.circleci/config.yml
# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
#
# For list of official CircleCI node.js images, go to:
# https://hub.docker.com/r/circleci/node/tags/

jobs:
 build:
 docker:
 - image: circleci/node:6.10.3
 - image: circleci/node:8.9.4
 working_directory: ~/plotly.js
 steps:
 - checkout
 - restore_cache:
 keys:
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package-lock.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package-lock.json" }}
 - run:
 name: Install dependencies
 command: |
 npm install
 npm dedupe
 npm prune
 npm install
 - run:
 name: List dependency versions
 command: |
Expand All@@ -47,7 +47,7 @@ jobs:
 test-jasmine:
 docker:
 # need '-browsers' version to test in real (xvfb-wrapped) browsers
 - image: circleci/node:6.10.3-browsers
 - image: circleci/node:8.9.4-browsers
 working_directory: ~/plotly.js
 steps:
 - checkout
Expand DownExpand Up@@ -82,7 +82,7 @@ jobs:

 test-syntax:
 docker:
 - image: circleci/node:6.10.3
 - image: circleci/node:8.9.4
 working_directory: ~/plotly.js
 steps:
 - checkout
Expand Down

8 changes: 5 additions & 3 deletions
.eslintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@
 "no-trailing-spaces": [2],
 "no-multiple-empty-lines": [2, {"max": 2, "maxEOF": 0}],
 "eol-last": [2],
 "indent": [2, 4, {"SwitchCase": 1}],
 "indent": [0],
 "indent-legacy": [2, 4, {"SwitchCase": 1}],
 "max-len": [0, 80],
 "brace-style": [0, "stroustrup", {"allowSingleLine": true}],
 "curly": [2, "multi-line"],
Expand All@@ -46,7 +47,7 @@
 "space-before-blocks": [2],
 "spaced-comment": [2, "always"],
 "no-tabs": [2],
 "no-multi-spaces": [2],
 "no-multi-spaces": [2, {"ignoreEOLComments": true}],
 "no-whitespace-before-property": [2],
 "no-unexpected-multiline": [2],
 "no-floating-decimal": [2],
Expand All@@ -65,6 +66,7 @@
 "no-use-before-define": [2, "nofunc"],
 "no-loop-func": [2],
 "no-console": [0],
 "no-unused-labels": [2]
 "no-unused-labels": [2],
 "no-useless-escape": [0]
@alexcjohnsonalexcjohnsonFeb 1, 2018

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

how badly do we break this rule?
@etpinardetpinardFeb 1, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

this bad:
image
@etpinardetpinardFeb 2, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

... and they are not auto-fixable (using eslint . --fix) unfortunately.
@etpinardetpinardFeb 2, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

... and I don't want to waste time with linting stuff. I really think we should be switching to standardjs and be done with it (cc #950) 😛
 }
}

3 changes: 2 additions & 1 deletion
.github/PULL_REQUEST_TEMPLATE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@ Developers are strongly encouraged to first make a PR to their own plotly.js for
Before opening a pull request, developer should: 

- `git rebase` their local branch off the latest `master`,
- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on verion bumps),
- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on version bumps),
- make sure to commit changes to the `package-lock.json` file (if any),
- write an overview of what the PR attempts to do,
- select the _Allow edits from maintainers_ option (see this [article](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) for more details).

Expand Down

17 changes: 11 additions & 6 deletions
CONTRIBUTING.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,19 +24,24 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
| `type: community` | issue left open for community input and pull requests |
| `type: duplicate` | *self-explanatory* |
| `type: wontfix` | *self-explanatory* |
| `status: discussion needed` | Issue or PR that required discussion among maintaners before moving forward |
| `status: in progress` | PRs that required some intial feedback but not ready to merge |
| `status: discussion needed` | Issue or PR that required discussion among maintainers before moving forward |
| `status: in progress` | PRs that required some initial feedback but not ready to merge |
| `status: reviewable` | PRs that are completed from the author's perspective |
| `status: on hold` | PRs that are put on hold |

## Development

#### Perequisites
#### Prerequisites

- git
- [node.js](https://nodejs.org/en/). We recommend using node.js v6.x or v4.x (both LTS).
 Upgrading and managing node versions can be easily done using
 [`nvm`](https://github.com/creationix/nvm) or its Windows alternatives.
- [node.js](https://nodejs.org/en/). We recommend using node.js v8.x, but all
 versions starting from v4 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
 [`package-lock.json`](https://docs.npmjs.com/files/package-lock.json) file is
 used and updated correctly.

#### Step 1: Clone the plotly.js repo and install its dependencies

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Switch to node8 & npm5 by etpinard · Pull Request #2323 · plotly/plotly.js · GitHub
Skip to content
Switch to node8 & npm5#2323

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

etpinard
merged 11 commits into

from

Feb 2, 2018
 Merged


Switch to node8 & npm5
#2323
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
671861a

bump to node8/npm5 -> add package-lock.json


etpinard Feb 1, 2018
8b906cb

fix typos in md files


etpinard Feb 1, 2018
a859456

bump to node8/npm5 -> update circleci config


etpinard Feb 1, 2018
14a934b

update contributing info about node/npm versions


etpinard Feb 1, 2018
21c73e9

rm dedupe step in preversion (npm5 takes care of that ;)


etpinard Feb 1, 2018
0c1ff28

add check-node-version step in preversion


etpinard Feb 1, 2018
12bfbcc

bump eslint to 4.16.0


etpinard Feb 1, 2018
6c13e9a

:hocho: dist/npm-ls.json


etpinard Feb 1, 2018
278e7dc

update dev deps


etpinard Feb 1, 2018
c57a507

bump browserify & karma


etpinard Feb 1, 2018
b975f0b

move minify-stream a from deps -> dev-deps


etpinard Feb 1, 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: 8 additions & 8 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,25 +3,25 @@ version: 2.0
# Inspired by:
# https://github.com/CircleCI-Public/circleci-demo-workflows/blob/workspace-forwarding/.circleci/config.yml
# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
#
# For list of official CircleCI node.js images, go to:
# https://hub.docker.com/r/circleci/node/tags/

jobs:
 build:
 docker:
 - image: circleci/node:6.10.3
 - image: circleci/node:8.9.4
 working_directory: ~/plotly.js
 steps:
 - checkout
 - restore_cache:
 keys:
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package-lock.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package-lock.json" }}
 - run:
 name: Install dependencies
 command: |
 npm install
 npm dedupe
 npm prune
 npm install
 - run:
 name: List dependency versions
 command: |
Expand All@@ -47,7 +47,7 @@ jobs:
 test-jasmine:
 docker:
 # need '-browsers' version to test in real (xvfb-wrapped) browsers
 - image: circleci/node:6.10.3-browsers
 - image: circleci/node:8.9.4-browsers
 working_directory: ~/plotly.js
 steps:
 - checkout
Expand DownExpand Up@@ -82,7 +82,7 @@ jobs:

 test-syntax:
 docker:
 - image: circleci/node:6.10.3
 - image: circleci/node:8.9.4
 working_directory: ~/plotly.js
 steps:
 - checkout
Expand Down

8 changes: 5 additions & 3 deletions
.eslintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@
 "no-trailing-spaces": [2],
 "no-multiple-empty-lines": [2, {"max": 2, "maxEOF": 0}],
 "eol-last": [2],
 "indent": [2, 4, {"SwitchCase": 1}],
 "indent": [0],
 "indent-legacy": [2, 4, {"SwitchCase": 1}],
 "max-len": [0, 80],
 "brace-style": [0, "stroustrup", {"allowSingleLine": true}],
 "curly": [2, "multi-line"],
Expand All@@ -46,7 +47,7 @@
 "space-before-blocks": [2],
 "spaced-comment": [2, "always"],
 "no-tabs": [2],
 "no-multi-spaces": [2],
 "no-multi-spaces": [2, {"ignoreEOLComments": true}],
 "no-whitespace-before-property": [2],
 "no-unexpected-multiline": [2],
 "no-floating-decimal": [2],
Expand All@@ -65,6 +66,7 @@
 "no-use-before-define": [2, "nofunc"],
 "no-loop-func": [2],
 "no-console": [0],
 "no-unused-labels": [2]
 "no-unused-labels": [2],
 "no-useless-escape": [0]
@alexcjohnsonalexcjohnsonFeb 1, 2018

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

how badly do we break this rule?
@etpinardetpinardFeb 1, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

this bad:
image
@etpinardetpinardFeb 2, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

... and they are not auto-fixable (using eslint . --fix) unfortunately.
@etpinardetpinardFeb 2, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

... and I don't want to waste time with linting stuff. I really think we should be switching to standardjs and be done with it (cc #950) 😛
 }
}

3 changes: 2 additions & 1 deletion
.github/PULL_REQUEST_TEMPLATE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@ Developers are strongly encouraged to first make a PR to their own plotly.js for
Before opening a pull request, developer should: 

- `git rebase` their local branch off the latest `master`,
- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on verion bumps),
- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on version bumps),
- make sure to commit changes to the `package-lock.json` file (if any),
- write an overview of what the PR attempts to do,
- select the _Allow edits from maintainers_ option (see this [article](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) for more details).

Expand Down

17 changes: 11 additions & 6 deletions
CONTRIBUTING.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,19 +24,24 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
| `type: community` | issue left open for community input and pull requests |
| `type: duplicate` | *self-explanatory* |
| `type: wontfix` | *self-explanatory* |
| `status: discussion needed` | Issue or PR that required discussion among maintaners before moving forward |
| `status: in progress` | PRs that required some intial feedback but not ready to merge |
| `status: discussion needed` | Issue or PR that required discussion among maintainers before moving forward |
| `status: in progress` | PRs that required some initial feedback but not ready to merge |
| `status: reviewable` | PRs that are completed from the author's perspective |
| `status: on hold` | PRs that are put on hold |

## Development

#### Perequisites
#### Prerequisites

- git
- [node.js](https://nodejs.org/en/). We recommend using node.js v6.x or v4.x (both LTS).
 Upgrading and managing node versions can be easily done using
 [`nvm`](https://github.com/creationix/nvm) or its Windows alternatives.
- [node.js](https://nodejs.org/en/). We recommend using node.js v8.x, but all
 versions starting from v4 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
 [`package-lock.json`](https://docs.npmjs.com/files/package-lock.json) file is
 used and updated correctly.

#### Step 1: Clone the plotly.js repo and install its dependencies

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Switch to node8 & npm5 by etpinard · Pull Request #2323 · plotly/plotly.js · GitHub
Skip to content
Switch to node8 & npm5#2323

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

etpinard
merged 11 commits into

from

Feb 2, 2018
 Merged


Switch to node8 & npm5
#2323
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
671861a

bump to node8/npm5 -> add package-lock.json


etpinard Feb 1, 2018
8b906cb

fix typos in md files


etpinard Feb 1, 2018
a859456

bump to node8/npm5 -> update circleci config


etpinard Feb 1, 2018
14a934b

update contributing info about node/npm versions


etpinard Feb 1, 2018
21c73e9

rm dedupe step in preversion (npm5 takes care of that ;)


etpinard Feb 1, 2018
0c1ff28

add check-node-version step in preversion


etpinard Feb 1, 2018
12bfbcc

bump eslint to 4.16.0


etpinard Feb 1, 2018
6c13e9a

:hocho: dist/npm-ls.json


etpinard Feb 1, 2018
278e7dc

update dev deps


etpinard Feb 1, 2018
c57a507

bump browserify & karma


etpinard Feb 1, 2018
b975f0b

move minify-stream a from deps -> dev-deps


etpinard Feb 1, 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: 8 additions & 8 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,25 +3,25 @@ version: 2.0
# Inspired by:
# https://github.com/CircleCI-Public/circleci-demo-workflows/blob/workspace-forwarding/.circleci/config.yml
# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
#
# For list of official CircleCI node.js images, go to:
# https://hub.docker.com/r/circleci/node/tags/

jobs:
 build:
 docker:
 - image: circleci/node:6.10.3
 - image: circleci/node:8.9.4
 working_directory: ~/plotly.js
 steps:
 - checkout
 - restore_cache:
 keys:
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package-lock.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package-lock.json" }}
 - run:
 name: Install dependencies
 command: |
 npm install
 npm dedupe
 npm prune
 npm install
 - run:
 name: List dependency versions
 command: |
Expand All@@ -47,7 +47,7 @@ jobs:
 test-jasmine:
 docker:
 # need '-browsers' version to test in real (xvfb-wrapped) browsers
 - image: circleci/node:6.10.3-browsers
 - image: circleci/node:8.9.4-browsers
 working_directory: ~/plotly.js
 steps:
 - checkout
Expand DownExpand Up@@ -82,7 +82,7 @@ jobs:

 test-syntax:
 docker:
 - image: circleci/node:6.10.3
 - image: circleci/node:8.9.4
 working_directory: ~/plotly.js
 steps:
 - checkout
Expand Down

8 changes: 5 additions & 3 deletions
.eslintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@
 "no-trailing-spaces": [2],
 "no-multiple-empty-lines": [2, {"max": 2, "maxEOF": 0}],
 "eol-last": [2],
 "indent": [2, 4, {"SwitchCase": 1}],
 "indent": [0],
 "indent-legacy": [2, 4, {"SwitchCase": 1}],
 "max-len": [0, 80],
 "brace-style": [0, "stroustrup", {"allowSingleLine": true}],
 "curly": [2, "multi-line"],
Expand All@@ -46,7 +47,7 @@
 "space-before-blocks": [2],
 "spaced-comment": [2, "always"],
 "no-tabs": [2],
 "no-multi-spaces": [2],
 "no-multi-spaces": [2, {"ignoreEOLComments": true}],
 "no-whitespace-before-property": [2],
 "no-unexpected-multiline": [2],
 "no-floating-decimal": [2],
Expand All@@ -65,6 +66,7 @@
 "no-use-before-define": [2, "nofunc"],
 "no-loop-func": [2],
 "no-console": [0],
 "no-unused-labels": [2]
 "no-unused-labels": [2],
 "no-useless-escape": [0]
@alexcjohnsonalexcjohnsonFeb 1, 2018

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

how badly do we break this rule?
@etpinardetpinardFeb 1, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

this bad:
image
@etpinardetpinardFeb 2, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

... and they are not auto-fixable (using eslint . --fix) unfortunately.
@etpinardetpinardFeb 2, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

... and I don't want to waste time with linting stuff. I really think we should be switching to standardjs and be done with it (cc #950) 😛
 }
}

3 changes: 2 additions & 1 deletion
.github/PULL_REQUEST_TEMPLATE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@ Developers are strongly encouraged to first make a PR to their own plotly.js for
Before opening a pull request, developer should: 

- `git rebase` their local branch off the latest `master`,
- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on verion bumps),
- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on version bumps),
- make sure to commit changes to the `package-lock.json` file (if any),
- write an overview of what the PR attempts to do,
- select the _Allow edits from maintainers_ option (see this [article](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) for more details).

Expand Down

17 changes: 11 additions & 6 deletions
CONTRIBUTING.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,19 +24,24 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
| `type: community` | issue left open for community input and pull requests |
| `type: duplicate` | *self-explanatory* |
| `type: wontfix` | *self-explanatory* |
| `status: discussion needed` | Issue or PR that required discussion among maintaners before moving forward |
| `status: in progress` | PRs that required some intial feedback but not ready to merge |
| `status: discussion needed` | Issue or PR that required discussion among maintainers before moving forward |
| `status: in progress` | PRs that required some initial feedback but not ready to merge |
| `status: reviewable` | PRs that are completed from the author's perspective |
| `status: on hold` | PRs that are put on hold |

## Development

#### Perequisites
#### Prerequisites

- git
- [node.js](https://nodejs.org/en/). We recommend using node.js v6.x or v4.x (both LTS).
 Upgrading and managing node versions can be easily done using
 [`nvm`](https://github.com/creationix/nvm) or its Windows alternatives.
- [node.js](https://nodejs.org/en/). We recommend using node.js v8.x, but all
 versions starting from v4 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
 [`package-lock.json`](https://docs.npmjs.com/files/package-lock.json) file is
 used and updated correctly.

#### Step 1: Clone the plotly.js repo and install its dependencies

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Switch to node8 & npm5 by etpinard · Pull Request #2323 · plotly/plotly.js · GitHub
Skip to content
Switch to node8 & npm5#2323

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

etpinard
merged 11 commits into

from

Feb 2, 2018
 Merged


Switch to node8 & npm5
#2323
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
671861a

bump to node8/npm5 -> add package-lock.json


etpinard Feb 1, 2018
8b906cb

fix typos in md files


etpinard Feb 1, 2018
a859456

bump to node8/npm5 -> update circleci config


etpinard Feb 1, 2018
14a934b

update contributing info about node/npm versions


etpinard Feb 1, 2018
21c73e9

rm dedupe step in preversion (npm5 takes care of that ;)


etpinard Feb 1, 2018
0c1ff28

add check-node-version step in preversion


etpinard Feb 1, 2018
12bfbcc

bump eslint to 4.16.0


etpinard Feb 1, 2018
6c13e9a

:hocho: dist/npm-ls.json


etpinard Feb 1, 2018
278e7dc

update dev deps


etpinard Feb 1, 2018
c57a507

bump browserify & karma


etpinard Feb 1, 2018
b975f0b

move minify-stream a from deps -> dev-deps


etpinard Feb 1, 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: 8 additions & 8 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,25 +3,25 @@ version: 2.0
# Inspired by:
# https://github.com/CircleCI-Public/circleci-demo-workflows/blob/workspace-forwarding/.circleci/config.yml
# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
#
# For list of official CircleCI node.js images, go to:
# https://hub.docker.com/r/circleci/node/tags/

jobs:
 build:
 docker:
 - image: circleci/node:6.10.3
 - image: circleci/node:8.9.4
 working_directory: ~/plotly.js
 steps:
 - checkout
 - restore_cache:
 keys:
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package-lock.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package-lock.json" }}
 - run:
 name: Install dependencies
 command: |
 npm install
 npm dedupe
 npm prune
 npm install
 - run:
 name: List dependency versions
 command: |
Expand All@@ -47,7 +47,7 @@ jobs:
 test-jasmine:
 docker:
 # need '-browsers' version to test in real (xvfb-wrapped) browsers
 - image: circleci/node:6.10.3-browsers
 - image: circleci/node:8.9.4-browsers
 working_directory: ~/plotly.js
 steps:
 - checkout
Expand DownExpand Up@@ -82,7 +82,7 @@ jobs:

 test-syntax:
 docker:
 - image: circleci/node:6.10.3
 - image: circleci/node:8.9.4
 working_directory: ~/plotly.js
 steps:
 - checkout
Expand Down

8 changes: 5 additions & 3 deletions
.eslintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@
 "no-trailing-spaces": [2],
 "no-multiple-empty-lines": [2, {"max": 2, "maxEOF": 0}],
 "eol-last": [2],
 "indent": [2, 4, {"SwitchCase": 1}],
 "indent": [0],
 "indent-legacy": [2, 4, {"SwitchCase": 1}],
 "max-len": [0, 80],
 "brace-style": [0, "stroustrup", {"allowSingleLine": true}],
 "curly": [2, "multi-line"],
Expand All@@ -46,7 +47,7 @@
 "space-before-blocks": [2],
 "spaced-comment": [2, "always"],
 "no-tabs": [2],
 "no-multi-spaces": [2],
 "no-multi-spaces": [2, {"ignoreEOLComments": true}],
 "no-whitespace-before-property": [2],
 "no-unexpected-multiline": [2],
 "no-floating-decimal": [2],
Expand All@@ -65,6 +66,7 @@
 "no-use-before-define": [2, "nofunc"],
 "no-loop-func": [2],
 "no-console": [0],
 "no-unused-labels": [2]
 "no-unused-labels": [2],
 "no-useless-escape": [0]
@alexcjohnsonalexcjohnsonFeb 1, 2018

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

how badly do we break this rule?
@etpinardetpinardFeb 1, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

this bad:
image
@etpinardetpinardFeb 2, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

... and they are not auto-fixable (using eslint . --fix) unfortunately.
@etpinardetpinardFeb 2, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

... and I don't want to waste time with linting stuff. I really think we should be switching to standardjs and be done with it (cc #950) 😛
 }
}

3 changes: 2 additions & 1 deletion
.github/PULL_REQUEST_TEMPLATE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@ Developers are strongly encouraged to first make a PR to their own plotly.js for
Before opening a pull request, developer should: 

- `git rebase` their local branch off the latest `master`,
- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on verion bumps),
- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on version bumps),
- make sure to commit changes to the `package-lock.json` file (if any),
- write an overview of what the PR attempts to do,
- select the _Allow edits from maintainers_ option (see this [article](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) for more details).

Expand Down

17 changes: 11 additions & 6 deletions
CONTRIBUTING.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,19 +24,24 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
| `type: community` | issue left open for community input and pull requests |
| `type: duplicate` | *self-explanatory* |
| `type: wontfix` | *self-explanatory* |
| `status: discussion needed` | Issue or PR that required discussion among maintaners before moving forward |
| `status: in progress` | PRs that required some intial feedback but not ready to merge |
| `status: discussion needed` | Issue or PR that required discussion among maintainers before moving forward |
| `status: in progress` | PRs that required some initial feedback but not ready to merge |
| `status: reviewable` | PRs that are completed from the author's perspective |
| `status: on hold` | PRs that are put on hold |

## Development

#### Perequisites
#### Prerequisites

- git
- [node.js](https://nodejs.org/en/). We recommend using node.js v6.x or v4.x (both LTS).
 Upgrading and managing node versions can be easily done using
 [`nvm`](https://github.com/creationix/nvm) or its Windows alternatives.
- [node.js](https://nodejs.org/en/). We recommend using node.js v8.x, but all
 versions starting from v4 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
 [`package-lock.json`](https://docs.npmjs.com/files/package-lock.json) file is
 used and updated correctly.

#### Step 1: Clone the plotly.js repo and install its dependencies

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Switch to node8 & npm5 by etpinard · Pull Request #2323 · plotly/plotly.js · GitHub
Skip to content
Switch to node8 & npm5#2323

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

etpinard
merged 11 commits into

from

Feb 2, 2018
 Merged


Switch to node8 & npm5
#2323
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
671861a

bump to node8/npm5 -> add package-lock.json


etpinard Feb 1, 2018
8b906cb

fix typos in md files


etpinard Feb 1, 2018
a859456

bump to node8/npm5 -> update circleci config


etpinard Feb 1, 2018
14a934b

update contributing info about node/npm versions


etpinard Feb 1, 2018
21c73e9

rm dedupe step in preversion (npm5 takes care of that ;)


etpinard Feb 1, 2018
0c1ff28

add check-node-version step in preversion


etpinard Feb 1, 2018
12bfbcc

bump eslint to 4.16.0


etpinard Feb 1, 2018
6c13e9a

:hocho: dist/npm-ls.json


etpinard Feb 1, 2018
278e7dc

update dev deps


etpinard Feb 1, 2018
c57a507

bump browserify & karma


etpinard Feb 1, 2018
b975f0b

move minify-stream a from deps -> dev-deps


etpinard Feb 1, 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: 8 additions & 8 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,25 +3,25 @@ version: 2.0
# Inspired by:
# https://github.com/CircleCI-Public/circleci-demo-workflows/blob/workspace-forwarding/.circleci/config.yml
# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
#
# For list of official CircleCI node.js images, go to:
# https://hub.docker.com/r/circleci/node/tags/

jobs:
 build:
 docker:
 - image: circleci/node:6.10.3
 - image: circleci/node:8.9.4
 working_directory: ~/plotly.js
 steps:
 - checkout
 - restore_cache:
 keys:
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package-lock.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package-lock.json" }}
 - run:
 name: Install dependencies
 command: |
 npm install
 npm dedupe
 npm prune
 npm install
 - run:
 name: List dependency versions
 command: |
Expand All@@ -47,7 +47,7 @@ jobs:
 test-jasmine:
 docker:
 # need '-browsers' version to test in real (xvfb-wrapped) browsers
 - image: circleci/node:6.10.3-browsers
 - image: circleci/node:8.9.4-browsers
 working_directory: ~/plotly.js
 steps:
 - checkout
Expand DownExpand Up@@ -82,7 +82,7 @@ jobs:

 test-syntax:
 docker:
 - image: circleci/node:6.10.3
 - image: circleci/node:8.9.4
 working_directory: ~/plotly.js
 steps:
 - checkout
Expand Down

8 changes: 5 additions & 3 deletions
.eslintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@
 "no-trailing-spaces": [2],
 "no-multiple-empty-lines": [2, {"max": 2, "maxEOF": 0}],
 "eol-last": [2],
 "indent": [2, 4, {"SwitchCase": 1}],
 "indent": [0],
 "indent-legacy": [2, 4, {"SwitchCase": 1}],
 "max-len": [0, 80],
 "brace-style": [0, "stroustrup", {"allowSingleLine": true}],
 "curly": [2, "multi-line"],
Expand All@@ -46,7 +47,7 @@
 "space-before-blocks": [2],
 "spaced-comment": [2, "always"],
 "no-tabs": [2],
 "no-multi-spaces": [2],
 "no-multi-spaces": [2, {"ignoreEOLComments": true}],
 "no-whitespace-before-property": [2],
 "no-unexpected-multiline": [2],
 "no-floating-decimal": [2],
Expand All@@ -65,6 +66,7 @@
 "no-use-before-define": [2, "nofunc"],
 "no-loop-func": [2],
 "no-console": [0],
 "no-unused-labels": [2]
 "no-unused-labels": [2],
 "no-useless-escape": [0]
@alexcjohnsonalexcjohnsonFeb 1, 2018

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

how badly do we break this rule?
@etpinardetpinardFeb 1, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

this bad:
image
@etpinardetpinardFeb 2, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

... and they are not auto-fixable (using eslint . --fix) unfortunately.
@etpinardetpinardFeb 2, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

... and I don't want to waste time with linting stuff. I really think we should be switching to standardjs and be done with it (cc #950) 😛
 }
}

3 changes: 2 additions & 1 deletion
.github/PULL_REQUEST_TEMPLATE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@ Developers are strongly encouraged to first make a PR to their own plotly.js for
Before opening a pull request, developer should: 

- `git rebase` their local branch off the latest `master`,
- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on verion bumps),
- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on version bumps),
- make sure to commit changes to the `package-lock.json` file (if any),
- write an overview of what the PR attempts to do,
- select the _Allow edits from maintainers_ option (see this [article](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) for more details).

Expand Down

17 changes: 11 additions & 6 deletions
CONTRIBUTING.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,19 +24,24 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
| `type: community` | issue left open for community input and pull requests |
| `type: duplicate` | *self-explanatory* |
| `type: wontfix` | *self-explanatory* |
| `status: discussion needed` | Issue or PR that required discussion among maintaners before moving forward |
| `status: in progress` | PRs that required some intial feedback but not ready to merge |
| `status: discussion needed` | Issue or PR that required discussion among maintainers before moving forward |
| `status: in progress` | PRs that required some initial feedback but not ready to merge |
| `status: reviewable` | PRs that are completed from the author's perspective |
| `status: on hold` | PRs that are put on hold |

## Development

#### Perequisites
#### Prerequisites

- git
- [node.js](https://nodejs.org/en/). We recommend using node.js v6.x or v4.x (both LTS).
 Upgrading and managing node versions can be easily done using
 [`nvm`](https://github.com/creationix/nvm) or its Windows alternatives.
- [node.js](https://nodejs.org/en/). We recommend using node.js v8.x, but all
 versions starting from v4 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
 [`package-lock.json`](https://docs.npmjs.com/files/package-lock.json) file is
 used and updated correctly.

#### Step 1: Clone the plotly.js repo and install its dependencies

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Switch to node8 & npm5 by etpinard · Pull Request #2323 · plotly/plotly.js · GitHub
Skip to content
Switch to node8 & npm5#2323

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

etpinard
merged 11 commits into

from

Feb 2, 2018
 Merged


Switch to node8 & npm5
#2323
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
671861a

bump to node8/npm5 -> add package-lock.json


etpinard Feb 1, 2018
8b906cb

fix typos in md files


etpinard Feb 1, 2018
a859456

bump to node8/npm5 -> update circleci config


etpinard Feb 1, 2018
14a934b

update contributing info about node/npm versions


etpinard Feb 1, 2018
21c73e9

rm dedupe step in preversion (npm5 takes care of that ;)


etpinard Feb 1, 2018
0c1ff28

add check-node-version step in preversion


etpinard Feb 1, 2018
12bfbcc

bump eslint to 4.16.0


etpinard Feb 1, 2018
6c13e9a

:hocho: dist/npm-ls.json


etpinard Feb 1, 2018
278e7dc

update dev deps


etpinard Feb 1, 2018
c57a507

bump browserify & karma


etpinard Feb 1, 2018
b975f0b

move minify-stream a from deps -> dev-deps


etpinard Feb 1, 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: 8 additions & 8 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,25 +3,25 @@ version: 2.0
# Inspired by:
# https://github.com/CircleCI-Public/circleci-demo-workflows/blob/workspace-forwarding/.circleci/config.yml
# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
#
# For list of official CircleCI node.js images, go to:
# https://hub.docker.com/r/circleci/node/tags/

jobs:
 build:
 docker:
 - image: circleci/node:6.10.3
 - image: circleci/node:8.9.4
 working_directory: ~/plotly.js
 steps:
 - checkout
 - restore_cache:
 keys:
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-{{ .Branch }}-{{ checksum "package-lock.json" }}
 - v{{ .Environment.CIRCLE_CACHE_VERSION }}-deps-master-{{ checksum "package-lock.json" }}
 - run:
 name: Install dependencies
 command: |
 npm install
 npm dedupe
 npm prune
 npm install
 - run:
 name: List dependency versions
 command: |
Expand All@@ -47,7 +47,7 @@ jobs:
 test-jasmine:
 docker:
 # need '-browsers' version to test in real (xvfb-wrapped) browsers
 - image: circleci/node:6.10.3-browsers
 - image: circleci/node:8.9.4-browsers
 working_directory: ~/plotly.js
 steps:
 - checkout
Expand DownExpand Up@@ -82,7 +82,7 @@ jobs:

 test-syntax:
 docker:
 - image: circleci/node:6.10.3
 - image: circleci/node:8.9.4
 working_directory: ~/plotly.js
 steps:
 - checkout
Expand Down

8 changes: 5 additions & 3 deletions
.eslintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@
 "no-trailing-spaces": [2],
 "no-multiple-empty-lines": [2, {"max": 2, "maxEOF": 0}],
 "eol-last": [2],
 "indent": [2, 4, {"SwitchCase": 1}],
 "indent": [0],
 "indent-legacy": [2, 4, {"SwitchCase": 1}],
 "max-len": [0, 80],
 "brace-style": [0, "stroustrup", {"allowSingleLine": true}],
 "curly": [2, "multi-line"],
Expand All@@ -46,7 +47,7 @@
 "space-before-blocks": [2],
 "spaced-comment": [2, "always"],
 "no-tabs": [2],
 "no-multi-spaces": [2],
 "no-multi-spaces": [2, {"ignoreEOLComments": true}],
 "no-whitespace-before-property": [2],
 "no-unexpected-multiline": [2],
 "no-floating-decimal": [2],
Expand All@@ -65,6 +66,7 @@
 "no-use-before-define": [2, "nofunc"],
 "no-loop-func": [2],
 "no-console": [0],
 "no-unused-labels": [2]
 "no-unused-labels": [2],
 "no-useless-escape": [0]
@alexcjohnsonalexcjohnsonFeb 1, 2018

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

how badly do we break this rule?
@etpinardetpinardFeb 1, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

this bad:
image
@etpinardetpinardFeb 2, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

... and they are not auto-fixable (using eslint . --fix) unfortunately.
@etpinardetpinardFeb 2, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

... and I don't want to waste time with linting stuff. I really think we should be switching to standardjs and be done with it (cc #950) 😛
 }
}

3 changes: 2 additions & 1 deletion
.github/PULL_REQUEST_TEMPLATE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@ Developers are strongly encouraged to first make a PR to their own plotly.js for
Before opening a pull request, developer should: 

- `git rebase` their local branch off the latest `master`,
- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on verion bumps),
- make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on version bumps),
- make sure to commit changes to the `package-lock.json` file (if any),
- write an overview of what the PR attempts to do,
- select the _Allow edits from maintainers_ option (see this [article](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) for more details).

Expand Down

17 changes: 11 additions & 6 deletions
CONTRIBUTING.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,19 +24,24 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
| `type: community` | issue left open for community input and pull requests |
| `type: duplicate` | *self-explanatory* |
| `type: wontfix` | *self-explanatory* |
| `status: discussion needed` | Issue or PR that required discussion among maintaners before moving forward |
| `status: in progress` | PRs that required some intial feedback but not ready to merge |
| `status: discussion needed` | Issue or PR that required discussion among maintainers before moving forward |
| `status: in progress` | PRs that required some initial feedback but not ready to merge |
| `status: reviewable` | PRs that are completed from the author's perspective |
| `status: on hold` | PRs that are put on hold |

## Development

#### Perequisites
#### Prerequisites

- git
- [node.js](https://nodejs.org/en/). We recommend using node.js v6.x or v4.x (both LTS).
 Upgrading and managing node versions can be easily done using
 [`nvm`](https://github.com/creationix/nvm) or its Windows alternatives.
- [node.js](https://nodejs.org/en/). We recommend using node.js v8.x, but all
 versions starting from v4 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
 [`package-lock.json`](https://docs.npmjs.com/files/package-lock.json) file is
 used and updated correctly.

#### Step 1: Clone the plotly.js repo and install its dependencies

Expand Down
Loading