Merge branch 'main' into deprecate-icons

.fantasticonrc.js

@@ -3,8 +3,8 @@
 const codepoints = require('./font/bootstrap-icons.json')
 
 module.exports = {
-  inputDir: './icons', // (required)
-  outputDir: './font', // (required)
+  inputDir: './icons',
+  outputDir: './font',
   fontTypes: ['woff2', 'woff'],
   assetTypes: ['css', 'scss', 'json'],
   name: 'bootstrap-icons',
@@ -17,20 +17,16 @@ module.exports = {
       indent: 2
     }
   },
-  // Use a custom Handlebars template
+  // Use our custom Handlebars templates
   templates: {
     css: './build/font/css.hbs',
-    scss: './build/font/scss.hbs',
-    html: './build/font/html.hbs'
+    scss: './build/font/scss.hbs'
   },
   pathOptions: {
     json: './font/bootstrap-icons.json',
     css: './font/bootstrap-icons.css',
     scss: './font/bootstrap-icons.scss',
-    html: './font/index.html',
-    ttf: './font/fonts/bootstrap-icons.ttf',
     woff: './font/fonts/bootstrap-icons.woff',
-    woff2: './font/fonts/bootstrap-icons.woff2',
-    eot: './font/fonts/bootstrap-icons.eot'
+    woff2: './font/fonts/bootstrap-icons.woff2'
   }
 }

.github/workflows/codeql.yml

@@ -6,11 +6,12 @@ on:
       - main
       - "!dependabot/**"
   pull_request:
-    # The branches below must be a subset of the branches above
     branches:
       - main
+      - "!dependabot/**"
   schedule:
     - cron: "0 0 * * 0"
+  workflow_dispatch:
 
 jobs:
   analyze:
@@ -22,13 +23,21 @@ jobs:
       security-events: write
 
     steps:
-      - name: Checkout repository
+      - name: Clone repository
         uses: actions/checkout@v3
+        with:
+          persist-credentials: false
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:
           languages: "javascript"
+          queries: +security-and-quality
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:javascript"

.github/workflows/deploy.yml

@@ -7,7 +7,7 @@ on:
 
 env:
   FORCE_COLOR: 2
-  NODE: 16
+  NODE: 18
 
 jobs:
   deploy:
@@ -17,6 +17,8 @@ jobs:
     steps:
       - name: Clone repository
         uses: actions/checkout@v3
+        with:
+          persist-credentials: false
 
       - name: Set up Node.js
         uses: actions/setup-node@v3
@@ -45,7 +47,10 @@ jobs:
     needs: deploy
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Clone repository
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
 
       - uses: actions/setup-node@v3
         with:

.github/workflows/release-notes.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
   update_release_draft:

.github/workflows/test.yml

@@ -5,10 +5,11 @@ on:
     branches-ignore:
       - "dependabot/**"
   pull_request:
+  workflow_dispatch:
 
 env:
   FORCE_COLOR: 2
-  NODE: 16
+  NODE: 18
 
 jobs:
   test:
@@ -17,6 +18,8 @@ jobs:
     steps:
       - name: Clone repository
         uses: actions/checkout@v3
+        with:
+          persist-credentials: false
 
       - name: Set up Node.js
         uses: actions/setup-node@v3

.stylelintrc.json

@@ -0,0 +1,15 @@
+{
+  "extends": [
+    "stylelint-config-twbs-bootstrap"
+  ],
+  "reportInvalidScopeDisables": true,
+  "reportNeedlessDisables": true,
+  "overrides": [
+    {
+      "files": "**/*.scss",
+      "rules": {
+        "scss/selector-no-union-class-name": true
+      }
+    }
+  ]
+}

README.md

@@ -1,13 +1,13 @@
 <p align="center">
-  <a href="https://v5.getbootstrap.com/">
-    <img src="https://v5.getbootstrap.com/docs/5.0/assets/brand/bootstrap-logo-shadow.png" alt="Bootstrap logo" width="200" height="165">
+  <a href="https://getbootstrap.com/">
+    <img src="https://getbootstrap.com/docs/5.2/assets/brand/bootstrap-logo-shadow.png" alt="Bootstrap logo" width="200" height="165">
   </a>
 </p>
 
 <h3 align="center">Bootstrap Icons</h3>
 
 <p align="center">
-  Official open source SVG icon library for Bootstrap with over 1,800 icons.
+  Official open source SVG icon library for Bootstrap with over 1,900 icons.
   <br>
   <a href="https://icons.getbootstrap.com/"><strong>Explore Bootstrap Icons »</strong></a>
   <br>
@@ -80,7 +80,7 @@ Here are some key scripts you'll use during development. Be sure to look to our
 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:
 
 1. Optimize our SVGs with SVGO.
-2. Modify the SVGs source HTML, removing all attributes before setting new attributes and values in our preferred order.
+2. Modify the SVGs source code, removing all attributes before setting new attributes and values in our preferred order.
 
 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.
 

build/build-pages.js

@@ -2,8 +2,8 @@
 
 'use strict'
 
-const fs = require('fs').promises
-const path = require('path')
+const fs = require('node:fs').promises
+const path = require('node:path')
 const picocolors = require('picocolors')
 
 const iconsDir = path.join(__dirname, '../icons/')
@@ -53,7 +53,7 @@ tags:
 
     const filesLength = files.length
 
-    console.log(picocolors.green('\nSuccess, %s page%s prepared!'), filesLength, filesLength !== 1 ? 's' : '')
+    console.log(picocolors.green('\nSuccess, %s page%s prepared!'), filesLength, filesLength === 1 ? '' : 's')
     console.timeEnd(timeLabel)
   } catch (error) {
     console.error(error)

build/build-svgs.js

@@ -2,9 +2,9 @@
 
 'use strict'
 
-const fs = require('fs').promises
-const path = require('path')
-const process = require('process')
+const fs = require('node:fs').promises
+const path = require('node:path')
+const process = require('node:process')
 const picocolors = require('picocolors')
 const { loadConfig, optimize } = require('svgo')
 
@@ -46,7 +46,7 @@ async function processFile(file, config) {
 
     const filesLength = files.length
 
-    console.log(picocolors.green('\nSuccess, prepared %s icon%s!'), filesLength, filesLength !== 1 ? 's' : '')
+    console.log(picocolors.green('\nSuccess, prepared %s icon%s!'), filesLength, filesLength === 1 ? '' : 's')
     console.timeEnd(timeLabel)
   } catch (error) {
     console.error(error)

build/font/css.hbs

@@ -4,9 +4,9 @@
   src: {{{ fontSrc }}};
 }
 
-.{{prefix}}::before,
-[class^="{{prefix}}-"]::before,
-[class*=" {{prefix}}-"]::before {
+.{{ prefix }}::before,
+[class^="{{ prefix }}-"]::before,
+[class*=" {{ prefix }}-"]::before {
   display: inline-block;
   font-family: {{ name }} !important;
   font-style: normal;

build/font/scss.hbs

@@ -1,18 +1,19 @@
 ${{ name }}-font: "{{ name }}" !default;
 ${{ name }}-font-dir: "{{ fontsUrl }}" !default;
 ${{ name }}-font-file: #{${{ name }}-font-dir}/#{${{ name }}-font} !default;
-${{ name }}-font-hash: "56c0f95873eb8a64dba9b6190f3e25c4" !default;
-${{ name }}-font-src: url("#{${{ name }}-font-file}.woff2?#{${{ name }}-font-hash}") format("woff2"), url("#{${{ name }}-font-file}.woff?#{${{ name }}-font-hash}") format("woff") !default;
+${{ name }}-font-hash: "24e3eb84d0bcaf83d77f904c78ac1f47" !default;
+${{ name }}-font-src: url("#{${{ name }}-font-file}.woff2?#{${{ name }}-font-hash}") format("woff2"),
+                           url("#{${{ name }}-font-file}.woff?#{${{ name }}-font-hash}") format("woff") !default;
 
 @font-face {
   font-display: block;
   font-family: ${{ name }}-font;
   src: ${{ name }}-font-src;
 }
 
-.{{prefix}}::before,
-[class^="{{prefix}}-"]::before,
-[class*=" {{prefix}}-"]::before {
+.{{ prefix }}::before,
+[class^="{{ prefix }}-"]::before,
+[class*=" {{ prefix }}-"]::before {
   display: inline-block;
   font-family: ${{ name }}-font !important;
   font-style: normal;

build/vnu-jar.js

@@ -2,22 +2,24 @@
 
 /*!
  * Script to run vnu-jar if Java is available.
- * Copyright 2017-2022 The Bootstrap Authors
- * Copyright 2017-2022 Twitter, Inc.
+ * Copyright 2017-2023 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 
 'use strict'
 
-const { execFile, spawn } = require('child_process')
+const { execFile, spawn } = require('node:child_process')
 const vnu = require('vnu-jar')
 
 execFile('java', ['-version'], (error, stdout, stderr) => {
   if (error) {
-    console.error('Skipping vnu-jar test; Java is missing.')
+    console.error('Skipping vnu-jar test; Java is probably missing.')
+    console.error(error)
     return
   }
 
+  console.log('Running vnu-jar validation...')
+
   const is32bitJava = !/64-Bit/.test(stderr)
 
   // vnu-jar accepts multiple ignores joined with a `|`.
@@ -40,6 +42,8 @@ execFile('java', ['-version'], (error, stdout, stderr) => {
     args.splice(0, 0, '-Xss512k')
   }
 
+  console.log(`command used: java ${args.join(' ')}`)
+
   return spawn('java', args, {
     shell: true,
     stdio: 'inherit'

config.yml

@@ -46,23 +46,28 @@ module:
       target:           static/assets/font
     - source:           node_modules/bootstrap/scss
       target:           assets/scss/bootstrap
-    - source:           node_modules/bootstrap/dist/js/bootstrap.min.js
-      target:           assets/js/bootstrap.min.js
+    - source:           node_modules/bootstrap/dist/js/bootstrap.bundle.min.js
+      target:           assets/js/vendor/bootstrap.bundle.min.js
+    - source:           node_modules/clipboard/dist/clipboard.min.js
+      target:           assets/js/vendor/clipboard.min.js
+    - source:           node_modules/list.js/dist/list.min.js
+      target:           assets/js/vendor/list.min.js
 
 params:
   description:          "Official open source SVG icon library for Bootstrap"
   social_image_path:    /assets/img/bootstrap-icons-social.png
 
-  version:              "1.9.1"
-  docs_version:         "5.2"
+  version:              "1.10.3"
+  docs_version:         "5.3"
 
   main:                 "https://getbootstrap.com"
   github_org:           "https://github.com/twbs"
-  repo:                 "https://github.com/twbs/icons"
+  icons_repo:           "https://github.com/twbs/icons"
+  repo:                 "https://github.com/twbs/bootstrap"
   twitter:              "getbootstrap"
-  slack:                "https://bootstrap-slack.herokuapp.com"
-  blog:                 "https://blog.getbootstrap.com"
-  expo:                 "https://expo.getbootstrap.com"
-  themes:               "https://themes.getbootstrap.com"
   opencollective:       "https://opencollective.com/bootstrap"
+  blog:                 "https://blog.getbootstrap.com/"
+  themes:               "https://themes.getbootstrap.com/"
+  icons:                "https://icons.getbootstrap.com/"
+  swag:                 "https://cottonbureau.com/people/bootstrap"
   icons_figma:          "https://www.figma.com/community/file/1042482994486402696/Bootstrap-Icons"

docs/.eslintrc.json

@@ -5,7 +5,7 @@
     "node": false
   },
   "parserOptions": {
-    "ecmaVersion": 5,
+    "ecmaVersion": 6,
     "sourceType": "script"
   },
   "extends": [