chore: sync with main

chore: sync with main

.github/CONTRIBUTING.md

@@ -50,7 +50,7 @@ Please see our [Contributor Code of Conduct](./CODE_OF_CONDUCT.md) for informati
 
 1. Run `npm start` from the root directory to start a local version of the icon test.
 2. Modify the icon test as needed in the `index.html` file.
-
+3. If you are modifying icons, you can run `npm run build.files` to re-run the SVG optimization script to verify there are no changes after optimizing the SVG.
 
 <!-- #### Building Changes
 

.github/workflows/actions/test-e2e/action.yml

@@ -55,10 +55,8 @@ runs:
  npx playwright test --shard=${{ inputs.shard }}/${{ inputs.totalShards }} --update-snapshots
  git add src/\*.png --force
  mkdir updated-screenshots
- echo 'made dir'
  rsync -R --progress $(git diff --name-only --cached) updated-screenshots
- echo 'copied images'
- if [ -d updated-screenshots ]; then
+ if [ "$(ls -A updated-screenshots)" ]; then
  echo "hasUpdatedScreenshots=$(echo 'true')" >> $GITHUB_OUTPUT
  cd updated-screenshots
  ls

.github/workflows/release.yml

@@ -55,13 +55,22 @@ jobs:
  env:
  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  shell: bash
- # Lerna does not automatically bump versions
- # of Ionicons dependencies that have changed,
- # so we do that here.
- - name: Bump Package Lock
- run: |
- npx lerna exec "npm install --package-lock-only --legacy-peer-deps"
- git add .
- git commit -m "chore(): update package lock files"
- git push
- shell: bash
+
+ update-package-lock:
+ # This needs to run after finalize-release
+ # because we also push to the repo in that
+ # job. If these jobs ran in parallel then it is
+ # possible for them to push at the same time.
+ needs: [finalize-release]
+ runs-on: ubuntu-latest
+ steps:
+ # Lerna does not automatically bump versions
+ # of Ionicons dependencies that have changed,
+ # so we do that here.
+ - name: Bump Package Lock
+ run: |
+ npx lerna exec "npm install --package-lock-only --legacy-peer-deps"
+ git add .
+ git commit -m "chore(): update package lock files"
+ git push
+ shell: bash

CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.2.2](https://github.com/ionic-team/ionicons/compare/v7.2.1...v7.2.2) (2023-12-13)
+
+
+### Bug Fixes
+
+* **icon:** add better warning when loading icons ([#1297](https://github.com/ionic-team/ionicons/issues/1297)) ([d582e62](https://github.com/ionic-team/ionicons/commit/d582e6208e626722e4350426a509a6870e90a0bc))
+
+
+
+
+
 ## [7.2.1](https://github.com/ionic-team/ionicons/compare/v7.2.0...v7.2.1) (2023-10-10)
 
 

lerna.json

@@ -2,5 +2,5 @@
  "packages": [
  "./"
  ],
- "version": "7.2.1"
+ "version": "7.2.2"
 }

package.json

@@ -1,6 +1,6 @@
 {
  "name": "ionicons",
- "version": "7.2.1",
+ "version": "7.2.2",
  "description": "Premium icons for Ionic.",
  "files": [
  "components/",

playwright.config.ts

@@ -52,14 +52,7 @@ const config: PlaywrightTestConfig = {
  * Maximum time expect() should wait for the condition to be met.
  * For example in `await expect(locator).toHaveText();`
  */
- timeout: 5000,
- toMatchSnapshot: {
- /**
- * Increases the maximum allowed pixel difference to account
- * for slight browser rendering inconsistencies.
- */
- maxDiffPixelRatio: 0.02
- }
+ timeout: 5000
  },
  /* Fail the build on CI if you accidentally left test.only in the source code. */
  forbidOnly: !!process.env.CI,

scripts/build.ts

@@ -53,6 +53,16 @@ async function optimizeSvgs(srcSvgData: SvgData[]) {
  if (!Array.isArray(params.attrs)) {
  params.attrs = [params.attrs];
  }
+
+ /**
+ * All host SVG elements must have
+ * the ionicons class otherwise styles
+ * will not apply.
+ */
+ if (item.elem === 'svg') {
+ item.class.add('ionicon');
+ }
+
  if (item.isElem()) {
  item.eachAttr((attr) => {
  if (attr.name === 'fill') {
@@ -167,14 +177,8 @@ async function optimizeSvg(
  const srcSvgContent = await fs.readFile(svgData.srcFilePath, 'utf8');
 
  const optimizedSvg = await optimizePass.optimize(srcSvgContent, { path: svgData.srcFilePath });
-
- const optimizedCode = optimizedSvg.data.replace(
- /<svg (.*?)>/,
- `<svg xmlns="http://www.w3.org/2000/svg" class="ionicon" viewBox="0 0 512 512">`,
- );
-
- const webComponentSvg = await webComponentPass.optimize(optimizedCode, { path: svgData.srcFilePath });
- const sourceSvg = await sourcePass.optimize(optimizedCode, { path: svgData.srcFilePath });
+ const webComponentSvg = await webComponentPass.optimize(optimizedSvg.data, { path: svgData.srcFilePath });
+ const sourceSvg = await sourcePass.optimize(optimizedSvg.data, { path: svgData.srcFilePath });
 
  svgData.optimizedSvgContent = webComponentSvg.data;
 

src/components/icon/test/icon.e2e.ts

@@ -8,7 +8,7 @@ test.describe('icon: basic', () => {
  // Wait for all SVGs to be lazily loaded before taking screenshots
  await page.waitForLoadState('networkidle');
 
- expect(await page.screenshot({ fullPage: true })).toMatchSnapshot(`icon-diff.png`);
+ await expect(page).toHaveScreenshot(`icon-diff.png`, { fullPage: true });
  });
 
  test('some icons should flip when rtl', async ({ page }) => {

src/components/test/dynamic-type/icon.e2e.ts

@@ -13,7 +13,7 @@ test.describe('icon: dynamic type', () => {
 
  const icons = page.locator('#icons');
 
- expect(await icons.screenshot()).toMatchSnapshot(`icon-dynamic-type-diff.png`);
+ await expect(icons).toHaveScreenshot(`icon-dynamic-type-diff.png`);
  });
 
 });