Skip to content

Commit 0892646

Browse files
authored
Merge pull request #7989 from plotly/cam/7368/update-branch-references-main
chore: Update branch references to main
2 parents 71a2ff7 + 905fd98 commit 0892646

12 files changed

Lines changed: 33 additions & 33 deletions

File tree

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ Thanks for your interest in plotly.js!
33
### Translations:
44

55
- Please @ mention a few other speakers of this language who can help review your translations.
6-
- If you've omitted any keys from [dist/translation_keys.txt](https://github.com/plotly/plotly.js/blob/master/dist/translation-keys.txt) - which means they will fall back on the US English text - just make a short comment about why in the PR description: the English text works fine in your language, or you would like someone else to help translating those, or whatever the reason.
6+
- If you've omitted any keys from [dist/translation_keys.txt](https://github.com/plotly/plotly.js/blob/main/dist/translation-keys.txt) - which means they will fall back on the US English text - just make a short comment about why in the PR description: the English text works fine in your language, or you would like someone else to help translating those, or whatever the reason.
77
- You should only update files in `lib/locales/`, not those in `dist/`
88

99
### Features, Bug fixes, and others:
1010

1111
Before opening a pull request, developer should:
12-
1. make sure they are not on the `master` branch of their fork as using `master` for a pull request would make it difficult to fetch `upstream` changes.
13-
2. fetch latest changes from `upstream/master` into your fork i.e. `origin/master` then pull `origin/master` from you local `master`.
14-
3. then `git rebase master` their local dev branch off the latest `master` which should be sync with `upstream/master` at this time.
12+
1. make sure they are not on the `main` branch of their fork as using `main` for a pull request would make it difficult to fetch `upstream` changes.
13+
2. fetch latest changes from `upstream/main` into your fork i.e. `origin/main` then pull `origin/main` from you local `main`.
14+
3. then `git rebase main` their local dev branch off the latest `main` which should be sync with `upstream/main` at this time.
1515
4. make sure to **not** `git add` the `dist/` folder (the `dist/` is updated only on version bumps).
1616
5. make sure to commit changes to the `package-lock.json` file (if any new dependency required).
1717
6. provide a title and write an overview of what the PR attempts to do with a link to the issue they are trying to address.
1818
7. 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).
1919

2020
After opening a pull request, developer:
21-
- should create a new small markdown log file using the PR number e.g. `1010_fix.md` or `1010_add.md` inside `draftlogs` folder as described in this [README](https://github.com/plotly/plotly.js/blob/master/draftlogs/README.md), commit it and push. A CI check enforces this; PRs that don't warrant a CHANGELOG entry can opt out by applying the `no-draftlog` label.
22-
- should **not** force push (i.e. `git push -f`) to remote branches associated with opened pull requests. Force pushes make it hard for maintainers to keep track of updates. Therefore, if required, please fetch `upstream/master` and "merge" with master instead of "rebase".
21+
- should create a new small markdown log file using the PR number e.g. `1010_fix.md` or `1010_add.md` inside `draftlogs` folder as described in this [README](https://github.com/plotly/plotly.js/blob/main/draftlogs/README.md), commit it and push. A CI check enforces this; PRs that don't warrant a CHANGELOG entry can opt out by applying the `no-draftlog` label.
22+
- should **not** force push (i.e. `git push -f`) to remote branches associated with opened pull requests. Force pushes make it hard for maintainers to keep track of updates. Therefore, if required, please fetch `upstream/main` and "merge" with main instead of "rebase".

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66
pull_request:
77
types:
88
- opened

.github/workflows/publish-dist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Publish Dist
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66
pull_request:
77
types:
88
- opened

.github/workflows/upload-dev-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Upload dev build from PR
22

3-
# See https://github.com/plotly/plotly.js/blob/master/CONTRIBUTING.md#live-links-to-dev-builds
3+
# See https://github.com/plotly/plotly.js/blob/main/CONTRIBUTING.md#live-links-to-dev-builds
44
# for documentation on the usage of this workflow.
55

66
on:
@@ -226,7 +226,7 @@ jobs:
226226
RUN_ID: ${{ github.run_id }}
227227
run: |
228228
RUN_URL="https://github.com/${REPO}/actions/runs/${RUN_ID}"
229-
CONTRIBUTING_URL="https://github.com/${REPO}/blob/master/CONTRIBUTING.md#live-links-to-dev-builds"
229+
CONTRIBUTING_URL="https://github.com/${REPO}/blob/main/CONTRIBUTING.md#live-links-to-dev-builds"
230230
231231
if [ "${IS_FORK}" == "true" ]; then
232232
STATE="success"

BUILDING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Alternative ways to require or build plotly.js
2-
Depending on your needs you may require/import one of [the distributed plotly.js packages](https://github.com/plotly/plotly.js/blob/master/dist/README.md) or [a plotly.js/lib index file](https://github.com/plotly/plotly.js/tree/master/lib) and integrate it into your application.
2+
Depending on your needs you may require/import one of [the distributed plotly.js packages](https://github.com/plotly/plotly.js/blob/main/dist/README.md) or [a plotly.js/lib index file](https://github.com/plotly/plotly.js/tree/main/lib) and integrate it into your application.
33

44
The sections below provide additional info in respect to alternative building frameworks.
55

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
For more context information, please read through the
44
[release notes](https://github.com/plotly/plotly.js/releases).
55

6-
To see all merged commits on the master branch that will be part of the next plotly.js release, go to:
6+
To see all merged commits on the main branch that will be part of the next plotly.js release, go to:
77

8-
<https://github.com/plotly/plotly.js/compare/vX.Y.Z...master>
8+
<https://github.com/plotly/plotly.js/compare/vX.Y.Z...main>
99

1010
where X.Y.Z is the semver of most recent plotly.js release.
1111

CONTRIBUTING.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ cd plotly.js
9797
#### Step 2: Switch to a dev branch
9898

9999
```bash
100-
# please do not use master or main for your dev branch
100+
# please do not use main for your dev branch
101101
git checkout dev-branch-name
102102
```
103103

@@ -138,7 +138,7 @@ comes bundled with some useful tools while developing - all bundled under the
138138
| `Tabs.onReload()` | By default, set to `noop` but you may set `Tabs.onReload` to any function you wish. This is useful for replotting a mock or test every time you reload the plotly.js script. |
139139
| `Tabs.purge()` | Destroys all plots. |
140140

141-
View [the source](https://github.com/plotly/plotly.js/blob/master/devtools/test_dashboard/devtools.js) for more info.
141+
View [the source](https://github.com/plotly/plotly.js/blob/main/devtools/test_dashboard/devtools.js) for more info.
142142

143143
Three additional helpers exist that are refreshed every second:
144144

@@ -205,7 +205,7 @@ previous changes. `npm run regl-codegen` will prompt you to open
205205
a browser window, run through the mocks for each regl-using trace
206206
(`parcoords`, `scattergl`, `scatterpolargl`, `splom`), and store the captured
207207
shader code into
208-
[src/generated/regl-codegen](https://github.com/plotly/plotly.js/blob/master/src/generated/regl-codegen).
208+
[src/generated/regl-codegen](https://github.com/plotly/plotly.js/blob/main/src/generated/regl-codegen).
209209
The four `src/traces/{parcoords,scattergl,scatterpolargl,splom}/regl_precompiled.js`
210210
files are rewritten in the same pass so their imports point at the freshly
211211
generated shader files. Commit any changes that result — both the
@@ -241,7 +241,7 @@ npm run test-jasmine -- <suite>
241241
```
242242

243243
where the `<suite>` corresponds to the suite's file name as found in
244-
[`test/jasmine/tests/`](https://github.com/plotly/plotly.js/tree/master/test/jasmine/tests).
244+
[`test/jasmine/tests/`](https://github.com/plotly/plotly.js/tree/main/test/jasmine/tests).
245245

246246
You can also test multiple suites at a time, for example:
247247

@@ -288,7 +288,7 @@ bash .github/scripts/env_image.sh
288288
#### Without Docker:
289289
Ensure you have Python 3.12+ and [`uv`](https://docs.astral.sh/uv/) installed.
290290

291-
To install required fonts and tools, run the [setup script](https://github.com/plotly/plotly.js/blob/master/.github/scripts/env_image.sh):
291+
To install required fonts and tools, run the [setup script](https://github.com/plotly/plotly.js/blob/main/.github/scripts/env_image.sh):
292292
```sh
293293
bash .github/scripts/env_image.sh
294294
```
@@ -386,10 +386,10 @@ If you would like a link to the dev build for your PR but don't have permission
386386

387387
## Trace module design
388388

389-
The trace modules (found in [`src/traces`](https://github.com/plotly/plotly.js/tree/master/src/traces))
389+
The trace modules (found in [`src/traces`](https://github.com/plotly/plotly.js/tree/main/src/traces))
390390
are defined as plain objects with functions and constants attached to them in an index file
391391
(e.g. `src/traces/scatter/index.js`). The trace modules are "registered" under the `Registry` object
392-
(found in [`src/registry.js`](https://github.com/plotly/plotly.js/blob/master/src/registry.js)) using
392+
(found in [`src/registry.js`](https://github.com/plotly/plotly.js/blob/main/src/registry.js)) using
393393
`Plotly.register` (as done in the index files in `dist/`).
394394

395395
The trace module methods are meant to be called as part of loops during subplot-specific

CUSTOM_BUNDLE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Custom bundle
2-
You can easily make custom bundles yourself if none of the [distributed packages](https://github.com/plotly/plotly.js/blob/master/dist/README.md) meet your needs, or if you want to make a more optimized bundle file with/without specific traces.
2+
You can easily make custom bundles yourself if none of the [distributed packages](https://github.com/plotly/plotly.js/blob/main/dist/README.md) meet your needs, or if you want to make a more optimized bundle file with/without specific traces.
33

44
Make sure you have the versions of node/npm that's recommended:
55
- plotly.js before 2.5: Node 12/npm 6

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<a href="https://plotly.com/javascript/"><img src="https://images.plot.ly/logo/plotlyjs-logo@2x.png" height="70"></a>
22

33
[![npm version](https://badge.fury.io/js/plotly.js.svg)](https://badge.fury.io/js/plotly.js)
4-
[![CI](https://github.com/plotly/plotly.js/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/plotly/plotly.js/actions/workflows/ci.yml)
5-
[![MIT License](https://img.shields.io/badge/License-MIT-brightgreen.svg)](https://github.com/plotly/plotly.js/blob/master/LICENSE)
4+
[![CI](https://github.com/plotly/plotly.js/actions/workflows/ci.yml/badge.svg)](https://github.com/plotly/plotly.js/actions/workflows/ci.yml)
5+
[![MIT License](https://img.shields.io/badge/License-MIT-brightgreen.svg)](https://github.com/plotly/plotly.js/blob/main/LICENSE)
66

77
[Plotly.js](https://plotly.com/javascript) is a standalone JavaScript data visualization library, and it also powers the Python and R modules named `plotly` in those respective ecosystems (referred to as [Plotly.py](https://plotly.com/python) and [Plotly.R](http://plotly.com/r)).
88

@@ -38,7 +38,7 @@ Plotly.js can be used to produce dozens of chart types and visualizations, inclu
3838

3939
---
4040
## Load as a node module
41-
Install [a ready-to-use distributed bundle](https://github.com/plotly/plotly.js/blob/master/dist/README.md)
41+
Install [a ready-to-use distributed bundle](https://github.com/plotly/plotly.js/blob/main/dist/README.md)
4242
```sh
4343
npm i --save plotly.js-dist-min
4444
```
@@ -121,12 +121,12 @@ You may simply load the [virtual-webgl](https://github.com/greggman/virtual-webg
121121

122122
## Bundles
123123
There are two kinds of plotly.js bundles:
124-
1. Complete and partial official bundles that are distributed to `npm` and the `CDN`, described in [the dist README](https://github.com/plotly/plotly.js/blob/master/dist/README.md).
125-
2. Custom bundles you can create yourself to optimize the size of the bundle depending on your needs. Please visit [CUSTOM_BUNDLE](https://github.com/plotly/plotly.js/blob/master/CUSTOM_BUNDLE.md) for more information.
124+
1. Complete and partial official bundles that are distributed to `npm` and the `CDN`, described in [the dist README](https://github.com/plotly/plotly.js/blob/main/dist/README.md).
125+
2. Custom bundles you can create yourself to optimize the size of the bundle depending on your needs. Please visit [CUSTOM_BUNDLE](https://github.com/plotly/plotly.js/blob/main/CUSTOM_BUNDLE.md) for more information.
126126

127127
---
128128
## Alternative ways to load and build plotly.js
129-
If your library needs to bundle or directly load [plotly.js/lib/index.js](https://github.com/plotly/plotly.js/blob/master/lib/index.js) or parts of its modules similar to [index-basic](https://github.com/plotly/plotly.js/blob/master/lib/index-basic.js) in some other way than via an official or a custom bundle, or in case you want to tweak the default build configurations, then please visit [`BUILDING.md`](https://github.com/plotly/plotly.js/blob/master/BUILDING.md).
129+
If your library needs to bundle or directly load [plotly.js/lib/index.js](https://github.com/plotly/plotly.js/blob/main/lib/index.js) or parts of its modules similar to [index-basic](https://github.com/plotly/plotly.js/blob/main/lib/index-basic.js) in some other way than via an official or a custom bundle, or in case you want to tweak the default build configurations, then please visit [`BUILDING.md`](https://github.com/plotly/plotly.js/blob/main/BUILDING.md).
130130

131131
---
132132
## Documentation
@@ -139,12 +139,12 @@ For more info about contributing to Plotly documentation, please read through [c
139139
---
140140
## Bugs and feature requests
141141

142-
Have a bug or a feature request? Please [open a Github issue](https://github.com/plotly/plotly.js/issues/new) keeping in mind the [issue guidelines](https://github.com/plotly/plotly.js/blob/master/.github/ISSUE_TEMPLATE.md). You may also want to read about [how changes get made to Plotly.js](https://github.com/plotly/plotly.js/blob/master/CONTRIBUTING.md).
142+
Have a bug or a feature request? Please [open a Github issue](https://github.com/plotly/plotly.js/issues/new) keeping in mind the [issue guidelines](https://github.com/plotly/plotly.js/blob/main/.github/ISSUE_TEMPLATE.md). You may also want to read about [how changes get made to Plotly.js](https://github.com/plotly/plotly.js/blob/main/CONTRIBUTING.md).
143143

144144
---
145145
## Contributing
146146

147-
Please read through our [contributing guidelines](https://github.com/plotly/plotly.js/blob/master/CONTRIBUTING.md). Included are directions for opening issues, using plotly.js in your project and notes on development.
147+
Please read through our [contributing guidelines](https://github.com/plotly/plotly.js/blob/main/CONTRIBUTING.md). Included are directions for opening issues, using plotly.js in your project and notes on development.
148148

149149
---
150150
## Notable contributors
@@ -182,7 +182,7 @@ Plotly.js is at the core of a large and dynamic ecosystem with many contributors
182182

183183
Code and documentation copyright 2025 Plotly, Inc.
184184

185-
Code released under the [MIT license](https://github.com/plotly/plotly.js/blob/master/LICENSE).
185+
Code released under the [MIT license](https://github.com/plotly/plotly.js/blob/main/LICENSE).
186186

187187
### Versioning
188188

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# plotly.js Security Policy
22

33
The open source plotly.js library is provided "AS IS", with no security guarantees. Please see our
4-
[license](https://raw.githubusercontent.com/plotly/plotly.js/master/LICENSE) for more information.
4+
[license](https://raw.githubusercontent.com/plotly/plotly.js/main/LICENSE) for more information.
55

66
In the 1.x releases of plotly.js, we attempt to protect against XSS attacks (and similar issues) resulting from
77
untrusted data being graphed by plotly.js. However, XSS or other issues may still exist.

0 commit comments

Comments
 (0)