Skip to content

Commit 6a01b88

Browse files
louismaximepitonvprothaisnilloqMaxLardenois
authored
chore (merge main): patched commit → a8ab199 (#2986)
--------- Co-authored-by: Vincent Prothais <[email protected]> Co-authored-by: Samuel Collin <[email protected]> Co-authored-by: Maxime Lardenois <[email protected]>
1 parent c06298e commit 6a01b88

File tree

576 files changed

+39030
-30365
lines changed

Some content is hidden

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

576 files changed

+39030
-30365
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
**/dist/
33
**/vendor/
44
/_site/
5+
/site/public/
56
/js/coverage/
67
/site/static/sw.js
78
/site/layouts/partials/

.eslintrc.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,13 @@
202202
},
203203
{
204204
"files": [
205-
"site/assets/js/**"
205+
"site/src/assets/application.js",
206+
"site/src/assets/color.js",
207+
"site/src/assets/partials/*.js",
208+
"site/src/assets/search.js",
209+
"site/src/assets/snippets.js",
210+
"site/src/assets/stackblitz.js",
211+
"site/src/plugins/*.js"
206212
],
207213
"parserOptions": {
208214
"sourceType": "module",

.github/CONTRIBUTING.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributing to Boosted
22

3-
Looking to contribute something to Boosted? **Here's how you can help.**
3+
Looking to contribute something to Boosted? **Heres how you can help.**
44

55
Please take a moment to review this document in order to make the contribution
66
process easy and effective for everyone involved.
@@ -25,20 +25,20 @@ restrictions:
2525
respect the opinions of others.
2626

2727
- Please **do not** post comments consisting solely of "+1" or ":thumbsup:".
28-
Use [GitHub's "reactions" feature](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/)
28+
Use [GitHubs "reactions" feature](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/)
2929
instead. We reserve the right to delete comments which violate this rule.
3030

3131
## Issues assignment
3232

33-
The core team will be looking at the open issues, analyze them, and provide guidance on how to proceed. **Issues won't be assigned to anyone outside the core team.** However, contributors are welcome to participate in the discussion and provide their input on how to best solve the issue, and even submit a PR if they want to. Please wait that the issue is ready to be worked on before submitting a PR, we don't want to waste your time.
33+
The core team will be looking at the open issues, analyze them, and provide guidance on how to proceed. **Issues wont be assigned to anyone outside the core team.** However, contributors are welcome to participate in the discussion and provide their input on how to best solve the issue, and even submit a PR if they want to. Please wait that the issue is ready to be worked on before submitting a PR, we dont want to waste your time.
3434

35-
Please keep in mind that the core team is small, has limited resources and that we are not always able to respond immediately. We will try to provide feedback as soon as possible, but please be patient. If you don't get a response immediately, it doesn't mean that we are ignoring you or that we don't care about your issue or PR. We will get back to you as soon as we can.
35+
Please keep in mind that the core team is small, has limited resources and that we are not always able to respond immediately. We will try to provide feedback as soon as possible, but please be patient. If you dont get a response immediately, it doesnt mean that we are ignoring you or that we dont care about your issue or PR. We will get back to you as soon as we can.
3636

3737
## Issues and labels
3838

39-
Our bug tracker utilizes several labels to help organize and identify issues. Here's what they represent and how we use them:
39+
Our bug tracker utilizes several labels to help organize and identify issues. Heres what they represent and how we use them:
4040

41-
- `browser bug` - Issues that are reported to us, but actually are the result of a browser-specific bug. These are diagnosed with reduced test cases and result in an issue opened on that browser's own bug tracker.
41+
- `browser bug` - Issues that are reported to us, but actually are the result of a browser-specific bug. These are diagnosed with reduced test cases and result in an issue opened on that browsers own bug tracker.
4242
- `confirmed` - Issues that have been confirmed with a reduced test case and identify a bug in Boosted.
4343
- `css` - Issues stemming from our compiled CSS or source Sass files.
4444
- `docs` - Issues for improving or updating our documentation.
@@ -60,7 +60,7 @@ Good bug reports are extremely helpful, so thanks!
6060
Guidelines for bug reports:
6161

6262
0. **[Validate your HTML](https://html5.validator.nu/)** to ensure your
63-
problem isn't caused by a simple error in your own code.
63+
problem isnt caused by a simple error in your own code.
6464

6565
1. **Use the GitHub issue search** &mdash; check if the issue has already been
6666
reported.
@@ -73,7 +73,7 @@ Guidelines for bug reports:
7373
These [v4 CodePen](https://codepen.io/team/bootstrap/pen/yLabNQL) and [v5 CodePen](https://codepen.io/team/bootstrap/pen/qBamdLj) are helpful templates.
7474

7575

76-
A good bug report shouldn't leave others needing to chase you up for more
76+
A good bug report shouldnt leave others needing to chase you up for more
7777
information. Please try to be as detailed as possible in your report. What is
7878
your environment? What steps will reproduce the issue? What browser(s) and OS
7979
experience the problem? Do other browsers show the bug differently? What
@@ -105,16 +105,16 @@ Sometimes bugs reported to us are actually caused by bugs in the browser(s) them
105105
| Vendor(s) | Browser(s) | Rendering engine | Bug reporting website(s) | Notes |
106106
| ------------- | ---------------------------- | ---------------- | ------------------------------------------------------ | -------------------------------------------------------- |
107107
| Mozilla | Firefox | Gecko | <https://bugzilla.mozilla.org/enter_bug.cgi> | "Core" is normally the right product option to choose. |
108-
| Apple | Safari | WebKit | <https://bugs.webkit.org/enter_bug.cgi?product=WebKit> | In Apple's bug reporter, choose "Safari" as the product. |
108+
| Apple | Safari | WebKit | <https://bugs.webkit.org/enter_bug.cgi?product=WebKit> | In Apples bug reporter, choose "Safari" as the product. |
109109
| Google, Opera | Chrome, Chromium, Opera v15+ | Blink | <https://bugs.chromium.org/p/chromium/issues/list> | Click the "New issue" button. |
110110
| Microsoft | Edge | Blink | <https://developer.microsoft.com/en-us/microsoft-edge/> | Go to "Help > Send Feedback" from the browser |
111111

112112

113113
## Feature requests
114114

115115
Feature requests are welcome. But take a moment to find out whether your idea
116-
fits with the scope and aims of the project. It's up to _you_ to make a strong
117-
case to convince the project's developers of the merits of this feature. Please
116+
fits with the scope and aims of the project. Its up to _you_ to make a strong
117+
case to convince the projects developers of the merits of this feature. Please
118118
provide as much detail and context as possible.
119119

120120

@@ -127,8 +127,8 @@ commits.
127127
**Please ask first** before embarking on any **significant** pull request (e.g.
128128
implementing features, refactoring code, porting to a different language),
129129
otherwise you risk spending a lot of time working on something that the
130-
project's developers might not want to merge into the project. For trivial
131-
things, or things that don't require a lot of your time, you can go ahead and
130+
projects developers might not want to merge into the project. For trivial
131+
things, or things that dont require a lot of your time, you can go ahead and
132132
make a PR.
133133

134134
Please adhere to the [coding guidelines](#code-guidelines) used throughout the
@@ -140,9 +140,9 @@ any dist files (`dist/` or `js/dist`).** Those files are automatically generated
140140
source files in [`/boosted/scss/`](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/tree/main/scss)
141141
and/or [`/boosted/js/src/`](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/tree/main/js/src) instead.
142142

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

@@ -183,7 +183,7 @@ included in the project:
183183

184184
5. Commit your changes in logical chunks. Please adhere to these [git commit
185185
message guidelines](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
186-
or your code is unlikely be merged into the main project. Use Git's
186+
or your code is unlikely be merged into the main project. Use Gits
187187
[interactive rebase](https://help.github.com/articles/about-git-rebase/)
188188
feature to tidy up your commits before making them public.
189189

@@ -224,15 +224,15 @@ includes code changes) and under the terms of the
224224
[Adhere to the Code Guide.](https://codeguide.co/#html)
225225

226226
- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags).
227-
- Use CDNs and HTTPS for third-party JS when possible. We don't use protocol-relative URLs in this case because they break when viewing the page locally via `file://`.
227+
- Use CDNs and HTTPS for third-party JS when possible. We dont use protocol-relative URLs in this case because they break when viewing the page locally via `file://`.
228228
- Use [WAI-ARIA](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA) attributes in documentation examples to promote accessibility.
229229

230230
### CSS
231231

232232
[Adhere to the Code Guide.](https://codeguide.co/#css)
233233

234234
- When feasible, default color palettes should comply with [WCAG color contrast guidelines](https://www.w3.org/TR/WCAG/#distinguishable).
235-
- Except in rare cases, don't remove default `:focus` styles (via e.g. `outline: none;`) without providing alternative styles. See [this A11Y Project post](https://www.a11yproject.com/posts/2013-01-25-never-remove-css-outlines/) for more details.
235+
- Except in rare cases, dont remove default `:focus` styles (via e.g. `outline: none;`) without providing alternative styles. See [this A11Y Project post](https://www.a11yproject.com/posts/2013-01-25-never-remove-css-outlines/) for more details.
236236

237237
### JS
238238

@@ -251,5 +251,5 @@ Run `npm run test` before committing to ensure your changes follow our coding st
251251
By contributing your code, you agree to license your contribution under the [MIT License](../LICENSE).
252252
By contributing to the documentation, you agree to license your contribution under the [Creative Commons Attribution 3.0 Unported License](https://creativecommons.org/licenses/by/3.0/).
253253

254-
Prior to v3.1.0, Bootstrap's code was released under the Apache License v2.0.
254+
Prior to v3.1.0, Bootstraps code was released under the Apache License v2.0.
255255
However there is no prior version to v3.1.0 for Boosted.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ _Note: Please transform `- [ ]` into `- (NA)` in the description when things are
3131
### Checklist
3232

3333
<!-- Go over all the following points, and put an `x` in all the boxes that apply. -->
34-
<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
34+
<!-- If youre unsure about any of these, dont hesitate to ask. Were here to help! -->
3535

3636
#### Contribution
3737

@@ -96,14 +96,14 @@ _Note: Please transform `- [ ]` into `- (NA)` in the description when things are
9696
- [ ] Manually change `version_short` in `package.json`
9797
- [ ] Add docs version to `site/data/docs-versions.yml`
9898
- [ ] Manually change `docs_version` in `hugo.yml` and other references to the previous version
99-
- [ ] Update redirects in docs frontmatter (`site/content/docs/_index.html`?)
100-
- [ ] Move `site/content/docs/5.x` to `site/content/docs/5.x+1`
99+
- [ ] Update redirects in docs frontmatter (`site/src/content/docs/_index.html`?)
100+
- [ ] Move `site/src/content/docs/5.x` to `site/src/content/docs/5.x+1`
101101
- [ ] Increment `site/static/docs/{version}` version
102102
- [ ] Increment version in `nuget/boosted.nuspec`
103103
- [ ] (Major version) Manually update the version in `nuget/boosted.nuspec` and `nuget/boosted.sass.nuspec`
104-
- check wrong matches in `CHANGELOG.md`, and maybe `site/content/docs/<version>/migration.md`
104+
- check wrong matches in `CHANGELOG.md`, and maybe `site/src/content/docs/<version>/migration.md`
105105
- :warning: check the `package-lock.json` and `package.json` content, only "boosted" should have its version changed!
106-
- :warning: `site/content/docs/5.1/**/*.md` should not always be modified
106+
- :warning: `site/src/content/docs/5.1/**/*.md` should not always be modified
107107
- [ ] if the year changed recently, happy new year :tada: but please change © year in `.scss` main files (reboot, grid, utilities, and main file) as well as in `NOTICE.txt`.
108108
- [ ] `npm run release` to compile dist, build Storybook, update SRI hashes in doc, and package the release
109109
- [ ] Prepare changelog:
@@ -117,21 +117,21 @@ _Note: Please transform `- [ ]` into `- (NA)` in the description when things are
117117
- [ ] Tag your version, and push your tag
118118
- [ ] Pack and publish
119119
- `npm pack`
120-
- if you are already logged in to NPM (with a personal account, for example), [you'd better use a repository scoped `.npmrc` file](https://stackoverflow.com/questions/30114166/how-to-have-multiple-npm-users-set-up-locally)
120+
- if you are already logged in to NPM (with a personal account, for example), [youd better use a repository scoped `.npmrc` file](https://stackoverflow.com/questions/30114166/how-to-have-multiple-npm-users-set-up-locally)
121121
- Publish:
122-
- if you're releasing a pre-release, use `--tag`, e.g. for v5-alpha1 `npm publish boosted-5.0.0-alpha1.tgz --tag next`
122+
- if youre releasing a pre-release, use `--tag`, e.g. for v5-alpha1 `npm publish boosted-5.0.0-alpha1.tgz --tag next`
123123
- (v4 only) `npm publish --tag v4.x.y` (if you forgot and v4 becomes the latest version on NPM, you can run `npm dist-tag add [email protected] latest to fix it)
124124
- (v5 only) `npm publish`
125125
- [ ] check release on [NPM](https://www.npmjs.com/package/boosted), [Nuget](https://www.nuget.org/packages/boosted/), [Packagist](https://packagist.org/packages/orange-opensource/orange-boosted-bootstrap)…
126126
- [ ] publish documentation on `gh-pages`:
127-
- [ ] copy `../_site` to the `gh-pages` branch (don't forget to update Storybook as well)
127+
- [ ] copy `../_site` to the `gh-pages` branch (dont forget to update Storybook as well)
128128
- [ ] check every `index.html` used as redirections to redirect to the new release
129-
- [ ] when bumping minor version: ensure `dist` URLs in examples' HTML has changed
129+
- [ ] when bumping minor version: ensure `dist` URLs in examples HTML has changed
130130
- [ ] double-check everything before pushing, starting by searching for forgotten old version number occurrences
131131
- [ ] make an announcement in [GitHub Discussions](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/discussions/categories/announcements) (+ pin the new GH Discussion)
132132
- [ ] [create a GitHub release](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/releases/new):
133133
- attach the zip file
134-
- paste the CHANGELOG / Ship list in the release's description
134+
- paste the CHANGELOG / Ship list in the releases description
135135
- [ ] make an announcement on internal communication channels :tada:
136136
- [ ] [publish on Nuget](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/wiki/Generate-NuGet-packages)
137137
-->

.github/dependabot.yml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ updates:
2929
# Ignore Bootstrap dependencies as they are managed by the Bootstrap team
3030
# Less notifications for us
3131
ignore:
32+
- dependency-name: "@astrojs/check"
33+
- dependency-name: "@astrojs/markdown-remark"
34+
- dependency-name: "@astrojs/mdx"
35+
- dependency-name: "@astrojs/prism"
36+
- dependency-name: "@astrojs/sitemap"
3237
- dependency-name: "@babel/cli"
3338
- dependency-name: "@babel/core"
3439
- dependency-name: "@babel/preset-env"
@@ -39,6 +44,12 @@ updates:
3944
- dependency-name: "@rollup/plugin-node-resolve"
4045
- dependency-name: "@rollup/plugin-replace"
4146
- dependency-name: "@stackblitz/sdk"
47+
- dependency-name: "@types/google.analytics"
48+
- dependency-name: "@types/js-yaml"
49+
- dependency-name: "@types/mime"
50+
- dependency-name: "@types/prismjs"
51+
- dependency-name: "astro"
52+
- dependency-name: "astro-auto-import"
4253
- dependency-name: "autoprefixer"
4354
- dependency-name: "bundlewatch"
4455
- dependency-name: "clean-css-cli"
@@ -50,12 +61,15 @@ updates:
5061
- dependency-name: "eslint-plugin-markdown"
5162
- dependency-name: "eslint-plugin-unicorn"
5263
- dependency-name: "find-unused-sass-variables"
64+
- dependency-name: "github-slugger"
5365
- dependency-name: "globby"
5466
- dependency-name: "hammer-simulator"
55-
- dependency-name: "hugo-bin"
67+
- dependency-name: "htmlparser2"
68+
- dependency-name: "image-size"
5669
- dependency-name: "ip"
5770
- dependency-name: "jasmine"
5871
- dependency-name: "jquery"
72+
- dependency-name: "js-yaml"
5973
- dependency-name: "karma"
6074
- dependency-name: "karma-browserstack-launcher"
6175
- dependency-name: "karma-chrome-launcher"
@@ -66,10 +80,16 @@ updates:
6680
- dependency-name: "karma-jasmine-html-reporter"
6781
- dependency-name: "karma-rollup-preprocessor"
6882
- dependency-name: "lockfile-lint"
83+
- dependency-name: "mime"
6984
- dependency-name: "nodemon"
7085
- dependency-name: "npm-run-all2"
7186
- dependency-name: "postcss"
7287
- dependency-name: "postcss-cli"
88+
- dependency-name: "prettier"
89+
- dependency-name: "prettier-plugin-astro"
90+
- dependency-name: "rehype-autolink-headings"
91+
- dependency-name: "remark"
92+
- dependency-name: "remark-html"
7393
- dependency-name: "rollup"
7494
- dependency-name: "rollup-plugin-istanbul"
7595
- dependency-name: "rtlcss"
@@ -79,4 +99,6 @@ updates:
7999
- dependency-name: "stylelint"
80100
- dependency-name: "stylelint-config-twbs-bootstrap"
81101
- dependency-name: "terser"
102+
- dependency-name: "unist-util-visit"
82103
- dependency-name: "vnu-jar"
104+
- dependency-name: "zod"

.github/workflows/docs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ jobs:
4646
- name: Validate HTML
4747
run: npm run docs-vnu
4848

49+
- name: Prettier Check
50+
run: npm run docs-prettier-check
51+
4952
- name: Run linkinator
5053
uses: JustinBeckwith/linkinator-action@v1
5154
with:

.github/workflows/percy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ on:
66
paths:
77
- 'js/**'
88
- 'scss/**'
9-
- 'site/content/docs/**/components/**'
10-
- 'site/content/docs/**/forms/**'
9+
- 'site/src/content/docs/components/**'
10+
- 'site/src/content/docs/forms/**'
1111
workflow_dispatch:
1212

1313
env:

.gitignore

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# Ignore docs files
22
/_site/
3-
# Hugo files
4-
/resources/
5-
/.hugo_build.lock
63

74
# Numerous always-ignore extensions
85
*.diff
@@ -49,3 +46,9 @@ Thumbs.db
4946
# Storybook
5047
/stories/auto
5148
*storybook.log
49+
50+
# Site
51+
/site/dist
52+
/site/node_modules
53+
/site/.astro
54+
/site/public

.prettierignore

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Prettier is only used for the website
2+
3+
site/.astro
4+
site/dist
5+
site/public
6+
site/src/assets
7+
site/src/scss
8+
site/src/pages/**/*.md
9+
site/src/pages/**/*.mdx
10+
site/src/content/**/*.mdx
11+
site/src/layouts/RedirectLayout.astro
12+
site/static

.storybook/preview-head.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Patent and Trademark Office and may be registered in certain other jurisdictions.
77
Copyright © 2014 Monotype Imaging Inc. All rights reserved.
88
Orange has purchased the right to use Helvetica in its websites and mobile applications.
9-
If you are not autorized to used it, don't include the orangeHelvetica.css
9+
If you are not authorized to use it, dont include the orangeHelvetica.css
1010
See NOTICE.txt for more informations.
1111
-->
1212
<link href="https://cdn.jsdelivr.net/npm/boosted/dist/fonts/HelvNeue55_W1G.woff2" rel="preload" as="font" type="font/woff2" crossorigin="anonymous">

.stylelintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
**/dist/
33
**/vendor/
44
/_site/
5+
/site/public/
56
/js/coverage/

0 commit comments

Comments
 (0)