Skip to content

Commit

Permalink
chore(#207): rename "v5-dev" to "main" (#792)
Browse files Browse the repository at this point in the history
  • Loading branch information
julien-deramond authored Sep 9, 2021
1 parent ac8ee0f commit 31fda13
Show file tree
Hide file tree
Showing 23 changed files with 42 additions and 159 deletions.
2 changes: 1 addition & 1 deletion .bundlewatch.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
],
"ci": {
"trackBranches": [
"v5-dev",
"main",
"v4-dev"
]
}
Expand Down
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,12 @@ project (indentation, accurate comments, etc.) and any other requirements

**Do not edit `boosted.css`, or `boosted.js`and do not commit
any dist files (`dist/` or `js/dist`).** Those files are automatically generated by our build tools. You should edit the
source files in [`/boosted/scss/`](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/tree/master/scss)
and/or [`/boosted/js/src/`](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/tree/master/js/src) instead.
source files in [`/boosted/scss/`](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/tree/main/scss)
and/or [`/boosted/js/src/`](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/tree/main/js/src) instead.

Similarly, when contributing to Boosted's documentation, you should edit the
documentation source files in
[the `/boosted/site/content/docs/` directory of the `master` branch](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/tree/master/site/content/docs).
[the `/boosted/site/content/docs/` directory of the `main` branch](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/tree/main/site/content/docs).
**Do not edit the `gh-pages` branch.** That branch is generated from the
documentation source files and is managed separately by the Boosted Core Team.

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Before opening:

- [Search for duplicate or closed issues](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/issues?utf8=%E2%9C%93&q=is%3Aissue)
- [Validate](https://html5.validator.nu/) any HTML to avoid common problems
- Read the [contributing guidelines](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/master/.github/CONTRIBUTING.md)
- Read the [contributing guidelines](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/main/.github/CONTRIBUTING.md)

Bug reports must include:

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ assignees: Nurovek
Before opening:

- [Search for duplicate or closed issues](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/issues?utf8=%E2%9C%93&q=is%3Aissue)
- Read the [contributing guidelines](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/master/.github/CONTRIBUTING.md)
- Read the [contributing guidelines](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/main/.github/CONTRIBUTING.md)

Feature requests must include:

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/browserstack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ on:
paths:
- 'js/**'
branches:
- v5-dev
- main
- "!dependabot/**"
pull_request:
paths:
- 'js/**'
branches:
- v5-dev
- main
- "!dependabot/**"
env:
FORCE_COLOR: 2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/bundlewatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- 'js/**'
- 'scss/**'
branches:
- v5-dev
- main
- "!dependabot/**"
pull_request:
types:
Expand All @@ -14,7 +14,7 @@ on:
- labeled
- unlabeled
branches:
- v5-dev
- main
- "!dependabot/**"
env:
FORCE_COLOR: 2
Expand Down Expand Up @@ -56,5 +56,5 @@ jobs:
run: npm run bundlewatch
env:
BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}"
CI_BRANCH_BASE: v5-dev
CI_BRANCH_BASE: main
if: github.event_name == 'push' || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip:ci'))
4 changes: 2 additions & 2 deletions .github/workflows/css.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
paths:
- "scss/**"
branches:
- v5-dev
- main
- "!dependabot/**"
pull_request:
types:
Expand All @@ -13,7 +13,7 @@ on:
- labeled
- unlabeled
branches:
- v5-dev
- main
- "!dependabot/**"
env:
FORCE_COLOR: 2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'scss/**'
- 'site/**'
branches:
- v5-dev
- main
- "!dependabot/**"
pull_request:
types:
Expand All @@ -15,7 +15,7 @@ on:
- labeled
- unlabeled
branches:
- v5-dev
- main
- "!dependabot/**"
env:
FORCE_COLOR: 2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
paths:
- 'js/**'
branches:
- v5-dev
- main
- "!dependabot/**"
pull_request:
types:
Expand All @@ -13,7 +13,7 @@ on:
- labeled
- unlabeled
branches:
- v5-dev
- main
- "!dependabot/**"
env:
FORCE_COLOR: 2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- 'js/**'
- 'scss/**'
branches:
- v5-dev
- main
- "!dependabot/**"
pull_request:
types:
Expand All @@ -14,7 +14,7 @@ on:
- labeled
- unlabeled
branches:
- v5-dev
- main
- "!dependabot/**"
env:
FORCE_COLOR: 2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/node-sass.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
paths:
- 'scss/**'
branches:
- v5-dev
- main
- "!dependabot/**"
pull_request:
types:
Expand All @@ -14,7 +14,7 @@ on:
- labeled
- unlabeled
branches:
- v5-dev
- main
- "!dependabot/**"
env:
FORCE_COLOR: 2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pa11y.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'scss/**'
- 'site/**'
branches:
- v5-dev
- main
- "!dependabot/**"
pull_request:
types:
Expand All @@ -15,7 +15,7 @@ on:
- labeled
- unlabeled
branches:
- v5-dev
- main
- "!dependabot/**"
env:
FORCE_COLOR: 2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/percy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'scss/**'
- 'site/content/docs/**/guidelines'
branches:
- v5-dev
- main
- "!dependabot/**"
pull_request:
types:
Expand All @@ -15,7 +15,7 @@ on:
- labeled
- unlabeled
branches:
- v5-dev
- main
- "!dependabot/**"
env:
FORCE_COLOR: 2
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,17 @@ Read the [Getting started page](https://boosted.orange.com/docs/5.1/getting-star

## Status

[![Build Status](https://img.shields.io/github/workflow/status/Orange-OpenSource/Orange-Boosted-Bootstrap/JS%20Tests/v5-dev?label=JS%20Tests&logo=github)](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/actions?query=workflow%3AJS+Tests+branch%3Av5-dev)
[![Build Status](https://img.shields.io/github/workflow/status/Orange-OpenSource/Orange-Boosted-Bootstrap/JS%20Tests/main?label=JS%20Tests&logo=github)](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/actions?query=workflow%3AJS+Tests+branch%3Amain)
[![This project is using Percy.io for visual regression testing.](https://percy.io/static/images/percy-badge.svg)](https://percy.io/Boosted/Boosted)
[![npm version](https://img.shields.io/npm/v/boosted)](https://www.npmjs.com/package/boosted)
[![Packagist Prerelease](https://img.shields.io/packagist/vpre/Orange-OpenSource/Orange-Boosted-Bootstrap.svg)](https://packagist.org/packages/Orange-OpenSource/Orange-Boosted-Bootstrap)
[![NuGet](https://img.shields.io/nuget/vpre/boosted)](https://www.nuget.org/packages/boosted/absoluteLatest)
[![peerDependencies Status](https://img.shields.io/david/peer/Orange-OpenSource/Orange-Boosted-Bootstrap)](https://david-dm.org/Orange-OpenSource/Orange-Boosted-Bootstrap?type=peer)
[![devDependency Status](https://img.shields.io/david/dev/Orange-OpenSource/Orange-Boosted-Bootstrap)](https://david-dm.org/Orange-OpenSource/Orange-Boosted-Bootstrap?type=dev)
[![CSS gzip size](https://img.badgesize.io/Orange-OpenSource/Orange-Boosted-Bootstrap/master/dist/css/boosted.min.css?compression=gzip&label=CSS%20gzip%20size)](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/v5-dev/dist/css/boosted.min.css)
[![CSS Brotli size](https://img.badgesize.io/Orange-OpenSource/Orange-Boosted-Bootstrap/master/dist/css/boosted.min.css?compression=brotli&label=CSS%20Brotli%20size)](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/v5-dev/dist/css/boosted.min.css)
[![JS gzip size](https://img.badgesize.io/Orange-OpenSource/Orange-Boosted-Bootstrap/master/dist/js/boosted.min.js?compression=gzip&label=JS%20gzip%20size)](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/v5-dev/dist/js/boosted.min.js)
[![JS Brotli size](https://img.badgesize.io/Orange-OpenSource/Orange-Boosted-Bootstrap/master/dist/js/boosted.min.js?compression=brotli&label=JS%20Brotli%20size)](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/v5-dev/dist/js/boosted.min.js)
[![CSS gzip size](https://img.badgesize.io/Orange-OpenSource/Orange-Boosted-Bootstrap/main/dist/css/boosted.min.css?compression=gzip&label=CSS%20gzip%20size)](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/main/dist/css/boosted.min.css)
[![CSS Brotli size](https://img.badgesize.io/Orange-OpenSource/Orange-Boosted-Bootstrap/main/dist/css/boosted.min.css?compression=brotli&label=CSS%20Brotli%20size)](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/main/dist/css/boosted.min.css)
[![JS gzip size](https://img.badgesize.io/Orange-OpenSource/Orange-Boosted-Bootstrap/main/dist/js/boosted.min.js?compression=gzip&label=JS%20gzip%20size)](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/main/dist/js/boosted.min.js)
[![JS Brotli size](https://img.badgesize.io/Orange-OpenSource/Orange-Boosted-Bootstrap/main/dist/js/boosted.min.js?compression=brotli&label=JS%20Brotli%20size)](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/main/dist/js/boosted.min.js)
[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=eTYyVGI5REFJZmt4M1hTWjFZOEoxVnR0RElhRm1iTk02ckJUWUpYeGFhQT0tLVRhK0F5L29MNU8wWERHa1pRK2hlaXc9PQ==--a5ee40063cbc3aae870f80421b1f9997b9e2f314%)](https://automate.browserstack.com/public-build/eTYyVGI5REFJZmt4M1hTWjFZOEoxVnR0RElhRm1iTk02ckJUWUpYeGFhQT0tLVRhK0F5L29MNU8wWERHa1pRK2hlaXc9PQ==--a5ee40063cbc3aae870f80421b1f9997b9e2f314%)
[![JS Delivr](https://data.jsdelivr.com/v1/package/npm/boosted/badge)](https://www.jsdelivr.com/package/npm/boosted)

Expand Down Expand Up @@ -121,7 +121,7 @@ We provide compiled CSS and JS (`boosted.*`), as well as compiled and minified C

## Bugs and feature requests

Have a bug or a feature request? Please first read the [issue guidelines](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/master/.github/CONTRIBUTING.md#using-the-issue-tracker) and search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/issues/new).
Have a bug or a feature request? Please first read the [issue guidelines](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/main/.github/CONTRIBUTING.md#using-the-issue-tracker) and search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/issues/new).


## Documentation
Expand All @@ -148,11 +148,11 @@ You can find all our previous releases docs on <https://boosted.orange.com/docs/

## Contributing

Please read through our [contributing guidelines](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/master/.github/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
Please read through our [contributing guidelines](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/main/.github/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.

Moreover, if your pull request contains JavaScript patches or features, you must include [relevant unit tests](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/tree/master/js/tests). All HTML and CSS should conform to the [Code Guide](https://github.com/mdo/code-guide), maintained by [Mark Otto](https://github.com/mdo).
Moreover, if your pull request contains JavaScript patches or features, you must include [relevant unit tests](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/tree/main/js/tests). All HTML and CSS should conform to the [Code Guide](https://github.com/mdo/code-guide), maintained by [Mark Otto](https://github.com/mdo).

Editor preferences are available in the [editor config](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <https://editorconfig.org/>.
Editor preferences are available in the [editor config](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/main/.editorconfig) for easy use in common text editors. Read more and download plugins at <https://editorconfig.org/>.


## Versioning
Expand Down Expand Up @@ -205,5 +205,5 @@ Thanks to [Netlify](https://www.netlify.com/), we are able to deploy pre-release

Code and documentation copyright 2011-2021 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).

Boosted code and documentation copyright 2015-2021 the [Boosted Authors](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/graphs/contributors) and [Orange SA.](https://orange.com) Code released under the [MIT License](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/master/docs/LICENSE).
Boosted code and documentation copyright 2015-2021 the [Boosted Authors](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/graphs/contributors) and [Orange SA.](https://orange.com) Code released under the [MIT License](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/main/docs/LICENSE).

2 changes: 1 addition & 1 deletion build/banner.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function getBanner(pluginFilename) {
* Boosted v${pkg.version} (${pkg.homepage})
* Copyright 2015-${year} The Boosted Authors
* Copyright 2015-${year} Orange
* Licensed under MIT (https://github.com/orange-opensource/orange-boosted-bootstrap/blob/v5-dev/LICENSE)
* Licensed under MIT (https://github.com/orange-opensource/orange-boosted-bootstrap/blob/main/LICENSE)
* This a fork of Bootstrap : Initial license below
* Bootstrap${pluginFilename ? ` ${pluginFilename}` : ''} v${pkg.version} (${pkg.homepage})
* Copyright 2011-${year} ${pkg.author}
Expand Down
116 changes: 0 additions & 116 deletions js/dist/dom/polyfill.js

This file was deleted.

Loading

0 comments on commit 31fda13

Please sign in to comment.