Skip to content

Commit 2f26bf7

Browse files
XhmikosRXhmikosR
authored
Merge branch 'main' into deprecate-icons
2 parents 4ef32e3 + 3f637a5 commit 2f26bf7

File tree

399 files changed

+4918
-8347
lines changed

Some content is hidden

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

399 files changed

+4918
-8347
lines changed

‎.fantasticonrc.js

+5-9
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
const codepoints = require('./font/bootstrap-icons.json')
44

55
module.exports = {
6-
inputDir: './icons', // (required)
7-
outputDir: './font', // (required)
6+
inputDir: './icons',
7+
outputDir: './font',
88
fontTypes: ['woff2', 'woff'],
99
assetTypes: ['css', 'scss', 'json'],
1010
name: 'bootstrap-icons',
@@ -17,20 +17,16 @@ module.exports = {
1717
indent: 2
1818
}
1919
},
20-
// Use a custom Handlebars template
20+
// Use our custom Handlebars templates
2121
templates: {
2222
css: './build/font/css.hbs',
23-
scss: './build/font/scss.hbs',
24-
html: './build/font/html.hbs'
23+
scss: './build/font/scss.hbs'
2524
},
2625
pathOptions: {
2726
json: './font/bootstrap-icons.json',
2827
css: './font/bootstrap-icons.css',
2928
scss: './font/bootstrap-icons.scss',
30-
html: './font/index.html',
31-
ttf: './font/fonts/bootstrap-icons.ttf',
3229
woff: './font/fonts/bootstrap-icons.woff',
33-
woff2: './font/fonts/bootstrap-icons.woff2',
34-
eot: './font/fonts/bootstrap-icons.eot'
30+
woff2: './font/fonts/bootstrap-icons.woff2'
3531
}
3632
}

‎.github/workflows/codeql.yml

+11-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ on:
66
- main
77
- "!dependabot/**"
88
pull_request:
9-
# The branches below must be a subset of the branches above
109
branches:
1110
- main
11+
- "!dependabot/**"
1212
schedule:
1313
- cron: "0 0 * * 0"
14+
workflow_dispatch:
1415

1516
jobs:
1617
analyze:
@@ -22,13 +23,21 @@ jobs:
2223
security-events: write
2324

2425
steps:
25-
- name: Checkout repository
26+
- name: Clone repository
2627
uses: actions/checkout@v3
28+
with:
29+
persist-credentials: false
2730

2831
- name: Initialize CodeQL
2932
uses: github/codeql-action/init@v2
3033
with:
3134
languages: "javascript"
35+
queries: +security-and-quality
36+
37+
- name: Autobuild
38+
uses: github/codeql-action/autobuild@v2
3239

3340
- name: Perform CodeQL Analysis
3441
uses: github/codeql-action/analyze@v2
42+
with:
43+
category: "/language:javascript"

‎.github/workflows/deploy.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
env:
99
FORCE_COLOR: 2
10-
NODE: 16
10+
NODE: 18
1111

1212
jobs:
1313
deploy:
@@ -17,6 +17,8 @@ jobs:
1717
steps:
1818
- name: Clone repository
1919
uses: actions/checkout@v3
20+
with:
21+
persist-credentials: false
2022

2123
- name: Set up Node.js
2224
uses: actions/setup-node@v3
@@ -45,7 +47,10 @@ jobs:
4547
needs: deploy
4648
runs-on: ubuntu-latest
4749
steps:
48-
- uses: actions/checkout@v3
50+
- name: Clone repository
51+
uses: actions/checkout@v3
52+
with:
53+
persist-credentials: false
4954

5055
- uses: actions/setup-node@v3
5156
with:

‎.github/workflows/release-notes.yml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
workflow_dispatch:
78

89
jobs:
910
update_release_draft:

‎.github/workflows/test.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ on:
55
branches-ignore:
66
- "dependabot/**"
77
pull_request:
8+
workflow_dispatch:
89

910
env:
1011
FORCE_COLOR: 2
11-
NODE: 16
12+
NODE: 18
1213

1314
jobs:
1415
test:
@@ -17,6 +18,8 @@ jobs:
1718
steps:
1819
- name: Clone repository
1920
uses: actions/checkout@v3
21+
with:
22+
persist-credentials: false
2023

2124
- name: Set up Node.js
2225
uses: actions/setup-node@v3

‎.stylelintrc

-8
This file was deleted.

‎.stylelintrc.json

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"extends": [
3+
"stylelint-config-twbs-bootstrap"
4+
],
5+
"reportInvalidScopeDisables": true,
6+
"reportNeedlessDisables": true,
7+
"overrides": [
8+
{
9+
"files": "**/*.scss",
10+
"rules": {
11+
"scss/selector-no-union-class-name": true
12+
}
13+
}
14+
]
15+
}

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<p align="center">
2-
<a href="https://v5.getbootstrap.com/">
3-
<img src="https://v5.getbootstrap.com/docs/5.0/assets/brand/bootstrap-logo-shadow.png" alt="Bootstrap logo" width="200" height="165">
2+
<a href="https://getbootstrap.com/">
3+
<img src="https://getbootstrap.com/docs/5.2/assets/brand/bootstrap-logo-shadow.png" alt="Bootstrap logo" width="200" height="165">
44
</a>
55
</p>
66

77
<h3 align="center">Bootstrap Icons</h3>
88

99
<p align="center">
10-
Official open source SVG icon library for Bootstrap with over 1,800 icons.
10+
Official open source SVG icon library for Bootstrap with over 1,900 icons.
1111
<br>
1212
<a href="https://icons.getbootstrap.com/"><strong>Explore Bootstrap Icons »</strong></a>
1313
<br>
@@ -80,7 +80,7 @@ Here are some key scripts you'll use during development. Be sure to look to our
8080
Icons are typically only added by @mdo, but exceptions can be made. New glyphs are designed in Figma first on a 16x16px grid, then exported as flattened SVGs with `fill` (no stroke). Once a new SVG icon has been added to the `icons` directory, we use an npm script to:
8181

8282
1. Optimize our SVGs with SVGO.
83-
2. Modify the SVGs source HTML, removing all attributes before setting new attributes and values in our preferred order.
83+
2. Modify the SVGs source code, removing all attributes before setting new attributes and values in our preferred order.
8484

8585
Use `npm run icons` to run the script, run `npm run pages` to build permalink pages, complete those pages, and, finally, commit the results in a new branch for updating.
8686

‎bootstrap-icons.svg

+1-1
Loading

‎build/build-pages.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
'use strict'
44

5-
const fs = require('fs').promises
6-
const path = require('path')
5+
const fs = require('node:fs').promises
6+
const path = require('node:path')
77
const picocolors = require('picocolors')
88

99
const iconsDir = path.join(__dirname, '../icons/')
@@ -53,7 +53,7 @@ tags:
5353

5454
const filesLength = files.length
5555

56-
console.log(picocolors.green('\nSuccess, %s page%s prepared!'), filesLength, filesLength !== 1 ? 's' : '')
56+
console.log(picocolors.green('\nSuccess, %s page%s prepared!'), filesLength, filesLength === 1 ? '' : 's')
5757
console.timeEnd(timeLabel)
5858
} catch (error) {
5959
console.error(error)

‎build/build-svgs.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
'use strict'
44

5-
const fs = require('fs').promises
6-
const path = require('path')
7-
const process = require('process')
5+
const fs = require('node:fs').promises
6+
const path = require('node:path')
7+
const process = require('node:process')
88
const picocolors = require('picocolors')
99
const { loadConfig, optimize } = require('svgo')
1010

@@ -46,7 +46,7 @@ async function processFile(file, config) {
4646

4747
const filesLength = files.length
4848

49-
console.log(picocolors.green('\nSuccess, prepared %s icon%s!'), filesLength, filesLength !== 1 ? 's' : '')
49+
console.log(picocolors.green('\nSuccess, prepared %s icon%s!'), filesLength, filesLength === 1 ? '' : 's')
5050
console.timeEnd(timeLabel)
5151
} catch (error) {
5252
console.error(error)

‎build/font/css.hbs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
src: {{{ fontSrc }}};
55
}
66

7-
.{{prefix}}::before,
8-
[class^="{{prefix}}-"]::before,
9-
[class*=" {{prefix}}-"]::before {
7+
.{{ prefix }}::before,
8+
[class^="{{ prefix }}-"]::before,
9+
[class*=" {{ prefix }}-"]::before {
1010
display: inline-block;
1111
font-family: {{ name }} !important;
1212
font-style: normal;

‎build/font/scss.hbs

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
${{ name }}-font: "{{ name }}" !default;
22
${{ name }}-font-dir: "{{ fontsUrl }}" !default;
33
${{ name }}-font-file: #{${{ name }}-font-dir}/#{${{ name }}-font} !default;
4-
${{ name }}-font-hash: "56c0f95873eb8a64dba9b6190f3e25c4" !default;
5-
${{ name }}-font-src: url("#{${{ name }}-font-file}.woff2?#{${{ name }}-font-hash}") format("woff2"), url("#{${{ name }}-font-file}.woff?#{${{ name }}-font-hash}") format("woff") !default;
4+
${{ name }}-font-hash: "24e3eb84d0bcaf83d77f904c78ac1f47" !default;
5+
${{ name }}-font-src: url("#{${{ name }}-font-file}.woff2?#{${{ name }}-font-hash}") format("woff2"),
6+
url("#{${{ name }}-font-file}.woff?#{${{ name }}-font-hash}") format("woff") !default;
67

78
@font-face {
89
font-display: block;
910
font-family: ${{ name }}-font;
1011
src: ${{ name }}-font-src;
1112
}
1213

13-
.{{prefix}}::before,
14-
[class^="{{prefix}}-"]::before,
15-
[class*=" {{prefix}}-"]::before {
14+
.{{ prefix }}::before,
15+
[class^="{{ prefix }}-"]::before,
16+
[class*=" {{ prefix }}-"]::before {
1617
display: inline-block;
1718
font-family: ${{ name }}-font !important;
1819
font-style: normal;

‎build/vnu-jar.js

+8-4
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,24 @@
22

33
/*!
44
* Script to run vnu-jar if Java is available.
5-
* Copyright 2017-2022 The Bootstrap Authors
6-
* Copyright 2017-2022 Twitter, Inc.
5+
* Copyright 2017-2023 The Bootstrap Authors
76
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
87
*/
98

109
'use strict'
1110

12-
const { execFile, spawn } = require('child_process')
11+
const { execFile, spawn } = require('node:child_process')
1312
const vnu = require('vnu-jar')
1413

1514
execFile('java', ['-version'], (error, stdout, stderr) => {
1615
if (error) {
17-
console.error('Skipping vnu-jar test; Java is missing.')
16+
console.error('Skipping vnu-jar test; Java is probably missing.')
17+
console.error(error)
1818
return
1919
}
2020

21+
console.log('Running vnu-jar validation...')
22+
2123
const is32bitJava = !/64-Bit/.test(stderr)
2224

2325
// vnu-jar accepts multiple ignores joined with a `|`.
@@ -40,6 +42,8 @@ execFile('java', ['-version'], (error, stdout, stderr) => {
4042
args.splice(0, 0, '-Xss512k')
4143
}
4244

45+
console.log(`command used: java ${args.join(' ')}`)
46+
4347
return spawn('java', args, {
4448
shell: true,
4549
stdio: 'inherit'

‎config.yml

+14-9
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,28 @@ module:
4646
target: static/assets/font
4747
- source: node_modules/bootstrap/scss
4848
target: assets/scss/bootstrap
49-
- source: node_modules/bootstrap/dist/js/bootstrap.min.js
50-
target: assets/js/bootstrap.min.js
49+
- source: node_modules/bootstrap/dist/js/bootstrap.bundle.min.js
50+
target: assets/js/vendor/bootstrap.bundle.min.js
51+
- source: node_modules/clipboard/dist/clipboard.min.js
52+
target: assets/js/vendor/clipboard.min.js
53+
- source: node_modules/list.js/dist/list.min.js
54+
target: assets/js/vendor/list.min.js
5155

5256
params:
5357
description: "Official open source SVG icon library for Bootstrap"
5458
social_image_path: /assets/img/bootstrap-icons-social.png
5559

56-
version: "1.9.1"
57-
docs_version: "5.2"
60+
version: "1.10.3"
61+
docs_version: "5.3"
5862

5963
main: "https://getbootstrap.com"
6064
github_org: "https://github.com/twbs"
61-
repo: "https://github.com/twbs/icons"
65+
icons_repo: "https://github.com/twbs/icons"
66+
repo: "https://github.com/twbs/bootstrap"
6267
twitter: "getbootstrap"
63-
slack: "https://bootstrap-slack.herokuapp.com"
64-
blog: "https://blog.getbootstrap.com"
65-
expo: "https://expo.getbootstrap.com"
66-
themes: "https://themes.getbootstrap.com"
6768
opencollective: "https://opencollective.com/bootstrap"
69+
blog: "https://blog.getbootstrap.com/"
70+
themes: "https://themes.getbootstrap.com/"
71+
icons: "https://icons.getbootstrap.com/"
72+
swag: "https://cottonbureau.com/people/bootstrap"
6873
icons_figma: "https://www.figma.com/community/file/1042482994486402696/Bootstrap-Icons"

‎docs/.eslintrc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"node": false
66
},
77
"parserOptions": {
8-
"ecmaVersion": 5,
8+
"ecmaVersion": 6,
99
"sourceType": "script"
1010
},
1111
"extends": [

0 commit comments

Comments
 (0)