Merge branch 'main' into bump-icons-version

johnhwhite · web-flow · commit c7ae9c5a862e · 2025-06-18T14:53:57.000-04:00
diff --git a/.github/workflows/cherry-pick.yml b/.github/workflows/cherry-pick.yml
@@ -20,23 +20,13 @@ jobs:
           ref: ${{ env.TARGET_BRANCH }}
           fetch-depth: 0
           token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
-
       - uses: actions/setup-node@v4
         id: setup-node
         with:
+          cache: 'npm'
           node-version-file: '.nvmrc'
-
-      - name: Cache node modules
-        id: cache
-        uses: actions/cache@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-${{ steps.setup-node.outputs.node-version }}-modules-${{ hashFiles('package-lock.json') }}
-
       - name: npm install
-        if: steps.cache.outputs.cache-hit != 'true'
         run: npm ci
-
       - name: Cherry pick
         id: cherry-pick
         run: |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,6 +15,9 @@ concurrency:
 permissions:
   contents: read
 
+env:
+  CYPRESS_INSTALL_BINARY: 0
+
 jobs:
   install-deps:
     name: Install and cache dependencies
@@ -30,16 +33,12 @@ jobs:
       - uses: actions/setup-node@v4
         id: setup-node
         with:
+          cache: 'npm'
           node-version-file: '.nvmrc'
-      - name: Cache node modules
-        id: cache
-        uses: actions/cache@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-${{ steps.setup-node.outputs.node-version }}-modules-${{ hashFiles('package-lock.json') }}
       - name: npm install
-        if: steps.cache.outputs.cache-hit != 'true'
         run: npm ci
+        env:
+          CYPRESS_INSTALL_BINARY: 0
 
   agents:
     name: Bootup Nx Cloud agent
@@ -52,11 +51,15 @@ jobs:
       NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
     steps:
       - uses: actions/checkout@v4
-      - name: Retrieve node_modules cache
-        uses: actions/cache/restore@v4
+      - uses: actions/setup-node@v4
+        id: setup-node
         with:
-          path: node_modules
-          key: ${{ runner.os }}-node-${{ needs.install-deps.outputs.node-version }}-modules-${{ hashFiles('package-lock.json') }}
+          cache: 'npm'
+          node-version-file: '.nvmrc'
+      - name: npm install
+        run: npm ci
+        env:
+          CYPRESS_INSTALL_BINARY: 0
       - name: Start Nx Agent ${{ matrix.agent }}
         run: npx nx-cloud start-agent
         if: ${{ env.NX_CLOUD_ACCESS_TOKEN }}
@@ -76,16 +79,16 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v4
         with:
+          cache: 'npm'
           node-version-file: '.nvmrc'
       - run: npx nx-cloud start-ci-run --agent-count=3 --distribute-on="manual"
         if: ${{ env.NX_CLOUD_ACCESS_TOKEN }}
         env:
           NX_VERBOSE_LOGGING: ${{ runner.debug || '' }}
-      - name: Retrieve node_modules cache
-        uses: actions/cache/restore@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-${{ needs.install-deps.outputs.node-version }}-modules-${{ hashFiles('package-lock.json') }}
+      - name: npm install
+        run: npm ci
+        env:
+          CYPRESS_INSTALL_BINARY: 0
       - uses: nrwl/nx-set-shas@v4
       - name: Run build, lint, test, and posttest for npm packages
         run: |
@@ -145,12 +148,12 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v4
         with:
+          cache: 'npm'
           node-version-file: '.nvmrc'
-      - name: Retrieve node_modules cache
-        uses: actions/cache/restore@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-${{ needs.install-deps.outputs.node-version }}-modules-${{ hashFiles('package-lock.json') }}
+      - name: npm install
+        run: npm ci
+        env:
+          CYPRESS_INSTALL_BINARY: 0
       - name: Check library dependencies
         run: npx skyux-dev check-lib-dependencies
       - name: Check library missing peers
@@ -181,14 +184,14 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v4
         with:
+          cache: 'npm'
           node-version-file: '.nvmrc'
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
         uses: nrwl/nx-set-shas@v4
-      - name: Retrieve node_modules cache
-        uses: actions/cache/restore@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-${{ needs.install-deps.outputs.node-version }}-modules-${{ hashFiles('package-lock.json') }}
+      - name: npm install
+        run: npm ci
+        env:
+          CYPRESS_INSTALL_BINARY: 0
       - name: Check code formatting
         run: npx nx format:check
         env:
@@ -203,12 +206,12 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
+          cache: 'npm'
           node-version-file: '.nvmrc'
-      - name: Retrieve node_modules cache
-        uses: actions/cache/restore@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-${{ needs.install-deps.outputs.node-version }}-modules-${{ hashFiles('package-lock.json') }}
+      - name: npm install
+        run: npm ci
+        env:
+          CYPRESS_INSTALL_BINARY: 0
       - name: Build packages dist
         run: npx skyux-dev create-packages-dist --skipNxCache
       - name: Notify Slack (failure)
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -48,18 +48,12 @@ jobs:
       - uses: actions/setup-node@v4
         id: setup-node
         with:
+          cache: 'npm'
           node-version-file: '.nvmrc'
-      - name: Cache dependencies
-        id: cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            /home/runner/.cache/Cypress
-          key: ${{ runner.os }}-node-${{ steps.setup-node.outputs.node-version }}-modules-${{ hashFiles('package-lock.json') }}
       - name: npm install
-        if: steps.cache.outputs.cache-hit != 'true'
         run: npm ci
+        env:
+          CYPRESS_INSTALL_BINARY: 0
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
         id: set-shas
         uses: ./.github/actions/nx-set-shas
@@ -93,9 +87,7 @@ jobs:
       - name: Build e2e-schematics
         # Used by .github/actions/e2e-affected/action.yml
         if: steps.cache-e2e-schematics.outputs.cache-hit != 'true'
-        shell: bash
-        run: |
-          npx nx build e2e-schematics --no-parallel
+        run: 'npx nx build e2e-schematics --no-parallel'
 
   build-storybook:
     name: Build Project Storybook
@@ -118,17 +110,14 @@ jobs:
         if: ${{ matrix.project != 'skip' }}
       - uses: actions/setup-node@v4
         with:
+          cache: 'npm'
           node-version-file: '.nvmrc'
         if: ${{ matrix.project != 'skip' }}
-      - name: Retrieve dependencies cache
-        uses: actions/cache/restore@v4
-        with:
-          fail-on-cache-miss: true
-          path: |
-            node_modules
-            /home/runner/.cache/Cypress
-          key: ${{ runner.os }}-node-${{ needs.install-deps.outputs.node-version }}-modules-${{ hashFiles('package-lock.json') }}
+      - name: npm install
         if: ${{ matrix.project != 'skip' }}
+        run: npm ci
+        env:
+          CYPRESS_INSTALL_BINARY: 0
       - name: Build ${{ matrix.project }}
         run: npx nx run ${{ matrix.project }}:build-storybook:ci --no-parallel
         if: ${{ matrix.project != 'skip' }}
@@ -172,17 +161,14 @@ jobs:
         if: ${{ fromJson(needs.install-deps.outputs.parameters).ghPagesRepo == 'skyux-pr-preview' }}
       - uses: actions/setup-node@v4
         with:
+          cache: 'npm'
           node-version-file: '.nvmrc'
         if: ${{ fromJson(needs.install-deps.outputs.parameters).ghPagesRepo == 'skyux-pr-preview' }}
-      - name: Retrieve dependencies cache
-        uses: actions/cache/restore@v4
-        with:
-          fail-on-cache-miss: true
-          path: |
-            node_modules
-            /home/runner/.cache/Cypress
-          key: ${{ runner.os }}-node-${{ needs.install-deps.outputs.node-version }}-modules-${{ hashFiles('package-lock.json') }}
+      - name: npm install
         if: ${{ fromJson(needs.install-deps.outputs.parameters).ghPagesRepo == 'skyux-pr-preview' }}
+        run: npm ci
+        env:
+          CYPRESS_INSTALL_BINARY: 0
       - name: Build ${{ matrix.app }}
         run: |
           npx nx build ${{ matrix.app }} \
@@ -222,15 +208,13 @@ jobs:
           ref: ${{ github.head_ref || github.ref_name || github.event.ref }}
       - uses: actions/setup-node@v4
         with:
+          cache: 'npm'
           node-version-file: '.nvmrc'
-      - name: Retrieve dependencies cache
-        uses: actions/cache/restore@v4
-        with:
-          fail-on-cache-miss: true
-          path: |
-            node_modules
-            /home/runner/.cache/Cypress
-          key: ${{ runner.os }}-node-${{ needs.install-deps.outputs.node-version }}-modules-${{ hashFiles('package-lock.json') }}
+      - name: npm install
+        if: ${{ matrix.project != 'skip' }}
+        run: npm ci
+        env:
+          CYPRESS_INSTALL_BINARY: 0
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
@@ -296,22 +280,24 @@ jobs:
         if: ${{ matrix.project != 'skip' }}
       - uses: actions/setup-node@v4
         with:
+          cache: 'npm'
           node-version-file: '.nvmrc'
         if: ${{ matrix.project != 'skip' }}
-      - name: Retrieve dependencies cache
-        uses: actions/cache/restore@v4
-        with:
-          fail-on-cache-miss: true
-          path: |
-            node_modules
-            /home/runner/.cache/Cypress
-          key: ${{ runner.os }}-node-${{ needs.install-deps.outputs.node-version }}-modules-${{ hashFiles('package-lock.json') }}
+      - name: npm install
         if: ${{ matrix.project != 'skip' }}
+        run: |
+          npm ci
+          npx cypress install
       - name: Cache e2e-schematics
         uses: actions/cache/restore@v4
+        id: cache-e2e-schematics
         with:
           path: ./dist/libs/sdk/e2e-schematics
           key: e2e-schematics-${{ runner.os }}-${{ github.head_ref || github.ref_name || github.event.ref }}
+      - name: Build e2e-schematics
+        # Used by .github/actions/e2e-affected/action.yml
+        if: steps.cache-e2e-schematics.outputs.cache-hit != 'true'
+        run: 'npx nx build e2e-schematics --no-parallel'
       - name: Check if ${{ matrix.project }} is affected
         if: ${{ matrix.project != 'skip' }}
         uses: ./.github/actions/e2e-affected
@@ -441,20 +427,22 @@ jobs:
           ref: ${{ github.head_ref || github.ref_name || github.event.ref }}
       - uses: actions/setup-node@v4
         with:
+          cache: 'npm'
           node-version-file: '.nvmrc'
-      - name: Retrieve dependencies cache
-        uses: actions/cache/restore@v4
-        with:
-          fail-on-cache-miss: true
-          path: |
-            node_modules
-            /home/runner/.cache/Cypress
-          key: ${{ runner.os }}-node-${{ needs.install-deps.outputs.node-version }}-modules-${{ hashFiles('package-lock.json') }}
+      - name: npm install
+        run: npm ci
+        env:
+          CYPRESS_INSTALL_BINARY: 0
       - name: Cache e2e-schematics
         uses: actions/cache/restore@v4
+        id: cache-e2e-schematics
         with:
           path: ./dist/libs/sdk/e2e-schematics
           key: e2e-schematics-${{ runner.os }}-${{ github.head_ref || github.ref_name || github.event.ref }}
+      - name: Build e2e-schematics
+        # Used by .github/actions/e2e-affected/action.yml
+        if: steps.cache-e2e-schematics.outputs.cache-hit != 'true'
+        run: 'npx nx build e2e-schematics --no-parallel'
       - name: Download Percy Build Numbers
         uses: actions/download-artifact@v4
         with:
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -70,22 +70,16 @@ jobs:
       - uses: actions/setup-node@v4
         id: setup-node
         with:
+          cache: 'npm'
           node-version-file: '.nvmrc'
       # Workaround to avoid "Post Run actions/setup-node" failures.
       # See: https://github.com/actions/setup-node/issues/317
       - name: Ensure cache directory exists
         if: ${{ !steps.release.outputs.release_created }}
         run: mkdir -p /home/runner/.npm
         continue-on-error: true
-      - name: Cache node modules
-        if: ${{ steps.release.outputs.release_created }}
-        id: cache
-        uses: actions/cache@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-${{ steps.setup-node.outputs.node-version }}-modules-${{ hashFiles('package-lock.json') }}
       - name: npm install
-        if: ${{ steps.release.outputs.release_created && steps.cache.outputs.cache-hit != 'true' }}
+        if: ${{ steps.release.outputs.release_created }}
         run: npm ci
       - name: Build
         if: ${{ steps.release.outputs.release_created }}
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-20.17.0
+20.19.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## [12.20.0](https://github.com/blackbaud/skyux/compare/12.19.1...12.20.0) (2025-06-18)
+
+
+### Features
+
+* add experimental `skyux-stylelint` package ([#3521](https://github.com/blackbaud/skyux/issues/3521)) ([9b60413](https://github.com/blackbaud/skyux/commit/9b60413bc323164472f5171c809f4c997ae66f4f))
+* create experimental `stylelint-config-skyux` package and relevant schematics ([#3525](https://github.com/blackbaud/skyux/issues/3525)) ([fb4f9cd](https://github.com/blackbaud/skyux/commit/fb4f9cdbce014ef6d51b012e0afdc170d828fe47))
+* updated selected item styles for checkbox, radio, filter, search ([#3509](https://github.com/blackbaud/skyux/issues/3509)) ([792a7b1](https://github.com/blackbaud/skyux/commit/792a7b1d8c210bdeb81dd4a3aef90d3167de5efd))
+
+
+### Bug Fixes
+
+* **components/modals:** tweak styleType description ([#3523](https://github.com/blackbaud/skyux/issues/3523)) ([fc16d25](https://github.com/blackbaud/skyux/commit/fc16d25a5906e518219494ed930aa46c087e4eef))
+* **components/theme:** tokenize font-family for all of BB theme ([#3512](https://github.com/blackbaud/skyux/issues/3512)) ([a0b2cc2](https://github.com/blackbaud/skyux/commit/a0b2cc21d69f0847e101c2f456aa792cb8331024))
+
 ## [12.19.1](https://github.com/blackbaud/skyux/compare/12.19.0...12.19.1) (2025-06-13)
 
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "skyux",
-  "version": "12.19.1",
+  "version": "12.20.0",
   "license": "MIT",
   "scripts": {
     "ng": "nx",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "skyux",`
`3`		`- "version": "12.19.1",`
	`3`	`+ "version": "12.20.0",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"ng": "nx",`