From b4ade9d887c0d5ecc29e25f8e12b576106de712a Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Fri, 22 Mar 2024 16:24:15 -0400 Subject: [PATCH 1/6] feat: update server icon (#1259) resolves #407 --- src/svg/server-outline.svg | 6 +++++- src/svg/server-sharp.svg | 6 +++++- src/svg/server.svg | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/svg/server-outline.svg b/src/svg/server-outline.svg index 82244c826..ccf5609d9 100644 --- a/src/svg/server-outline.svg +++ b/src/svg/server-outline.svg @@ -1 +1,5 @@ - \ No newline at end of file + + + + + diff --git a/src/svg/server-sharp.svg b/src/svg/server-sharp.svg index 9db5c5e61..dde056aba 100644 --- a/src/svg/server-sharp.svg +++ b/src/svg/server-sharp.svg @@ -1 +1,5 @@ - \ No newline at end of file + + + + + diff --git a/src/svg/server.svg b/src/svg/server.svg index dd52fe963..cb87de711 100644 --- a/src/svg/server.svg +++ b/src/svg/server.svg @@ -1 +1,5 @@ - \ No newline at end of file + + + + + From 0963fe20b77a03b0b8b7f4e94b646cd5d7b25f03 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 1 May 2024 14:41:10 -0400 Subject: [PATCH 2/6] feat: add X logo (#1371) resolves #1249 --- src/data.json | 11 ++++++++++- src/svg/logo-x.svg | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 src/svg/logo-x.svg diff --git a/src/data.json b/src/data.json index f472d61ae..a432d3f8f 100644 --- a/src/data.json +++ b/src/data.json @@ -6669,7 +6669,8 @@ "name": "logo-twitter", "tags": [ "logo", - "twitter" + "twitter", + "x" ] }, { @@ -6750,6 +6751,14 @@ "wordpress" ] }, + { + "name": "logo-x", + "tags": [ + "logo", + "twitter", + "x" + ] + }, { "name": "logo-xbox", "tags": [ diff --git a/src/svg/logo-x.svg b/src/svg/logo-x.svg new file mode 100644 index 000000000..2b1c37a44 --- /dev/null +++ b/src/svg/logo-x.svg @@ -0,0 +1,3 @@ + + + From 87f2094890c22b7b03bf754b6fd2651a83fe20ed Mon Sep 17 00:00:00 2001 From: Christian Bromann Date: Wed, 1 May 2024 11:57:37 -0700 Subject: [PATCH 3/6] feat: export setAssetPath (#1372) resolves #1302 --- src/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/index.ts b/src/index.ts index 20f7cd3ac..8692e9521 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,2 +1,4 @@ +export { setAssetPath } from '@stencil/core'; + export { addIcons } from './components/icon/utils'; export type { Components, JSX } from './components'; From f1794e755a95516ce53ed654a14626b26a969017 Mon Sep 17 00:00:00 2001 From: ionitron Date: Wed, 1 May 2024 19:10:54 +0000 Subject: [PATCH 4/6] v7.4.0 --- CHANGELOG.md | 26 ++++++++++++++++++++++++++ lerna.json | 2 +- package-lock.json | 16 ++++++++++------ package.json | 2 +- 4 files changed, 38 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bdf9279e6..5fd4eb814 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,32 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [7.4.0](https://github.com/ionic-team/ionicons/compare/v7.3.0...v7.4.0) (2024-05-01) + + +### Features + +* add X logo ([#1371](https://github.com/ionic-team/ionicons/issues/1371)) ([0963fe2](https://github.com/ionic-team/ionicons/commit/0963fe20b77a03b0b8b7f4e94b646cd5d7b25f03)), closes [#1249](https://github.com/ionic-team/ionicons/issues/1249) +* export setAssetPath ([#1372](https://github.com/ionic-team/ionicons/issues/1372)) ([87f2094](https://github.com/ionic-team/ionicons/commit/87f2094890c22b7b03bf754b6fd2651a83fe20ed)), closes [#1302](https://github.com/ionic-team/ionicons/issues/1302) +* update server icon ([#1259](https://github.com/ionic-team/ionicons/issues/1259)) ([b4ade9d](https://github.com/ionic-team/ionicons/commit/b4ade9d887c0d5ecc29e25f8e12b576106de712a)), closes [#407](https://github.com/ionic-team/ionicons/issues/407) + + + + + +# [7.4.0](https://github.com/ionic-team/ionicons/compare/v7.3.0...v7.4.0) (2024-05-01) + + +### Features + +* add X logo ([#1371](https://github.com/ionic-team/ionicons/issues/1371)) ([0963fe2](https://github.com/ionic-team/ionicons/commit/0963fe20b77a03b0b8b7f4e94b646cd5d7b25f03)), closes [#1249](https://github.com/ionic-team/ionicons/issues/1249) +* export setAssetPath ([#1372](https://github.com/ionic-team/ionicons/issues/1372)) ([87f2094](https://github.com/ionic-team/ionicons/commit/87f2094890c22b7b03bf754b6fd2651a83fe20ed)), closes [#1302](https://github.com/ionic-team/ionicons/issues/1302) +* update server icon ([#1259](https://github.com/ionic-team/ionicons/issues/1259)) ([b4ade9d](https://github.com/ionic-team/ionicons/commit/b4ade9d887c0d5ecc29e25f8e12b576106de712a)), closes [#407](https://github.com/ionic-team/ionicons/issues/407) + + + + + # [7.3.0](https://github.com/ionic-team/ionicons/compare/v7.2.3...v7.3.0) (2024-03-20) diff --git a/lerna.json b/lerna.json index a4864469b..42cf2d6f0 100644 --- a/lerna.json +++ b/lerna.json @@ -2,5 +2,5 @@ "packages": [ "./" ], - "version": "7.3.0" + "version": "7.4.0" } diff --git a/package-lock.json b/package-lock.json index 927963acb..43bdfd86e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ionicons", - "version": "7.3.0", + "version": "7.4.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ionicons", - "version": "7.3.0", + "version": "7.4.0", "license": "MIT", "dependencies": { "@stencil/core": "^4.0.3" @@ -18283,7 +18283,8 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz", "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==", - "dev": true + "dev": true, + "requires": {} }, "@octokit/plugin-rest-endpoint-methods": { "version": "6.8.1", @@ -22726,7 +22727,8 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", - "dev": true + "dev": true, + "requires": {} }, "jest-regex-util": { "version": "27.5.1", @@ -23411,7 +23413,8 @@ "version": "7.5.9", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", - "dev": true + "dev": true, + "requires": {} } } }, @@ -28186,7 +28189,8 @@ "version": "8.13.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", - "dev": true + "dev": true, + "requires": {} }, "xml-name-validator": { "version": "3.0.0", diff --git a/package.json b/package.json index 92f71396f..184f8fb45 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ionicons", - "version": "7.3.0", + "version": "7.4.0", "description": "Premium icons for Ionic.", "files": [ "components/", From 0c34dde9e875e8a41901856a777000c8e4665aa5 Mon Sep 17 00:00:00 2001 From: ionitron Date: Wed, 1 May 2024 19:11:34 +0000 Subject: [PATCH 5/6] chore(): update package lock files --- package-lock.json | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 43bdfd86e..7d1c3914c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18283,8 +18283,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz", "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==", - "dev": true, - "requires": {} + "dev": true }, "@octokit/plugin-rest-endpoint-methods": { "version": "6.8.1", @@ -22727,8 +22726,7 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", - "dev": true, - "requires": {} + "dev": true }, "jest-regex-util": { "version": "27.5.1", @@ -23413,8 +23411,7 @@ "version": "7.5.9", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", - "dev": true, - "requires": {} + "dev": true } } }, @@ -28189,8 +28186,7 @@ "version": "8.13.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", - "dev": true, - "requires": {} + "dev": true }, "xml-name-validator": { "version": "3.0.0", From 70135edf3a74fb19ba4828059323cd5e2607c96f Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 1 May 2024 15:16:30 -0400 Subject: [PATCH 6/6] chore: sync --- CHANGELOG.md | 1 - package.json | 4 ---- 2 files changed, 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0395c569..a32c164cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,6 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. -<<<<<<< HEAD # [7.4.0](https://github.com/ionic-team/ionicons/compare/v7.3.1...v7.4.0) (2024-05-01) diff --git a/package.json b/package.json index 3c73a0a85..78f3be875 100755 --- a/package.json +++ b/package.json @@ -1,10 +1,6 @@ { "name": "ionicons", -<<<<<<< HEAD "version": "7.4.0", -======= - "version": "7.3.1", ->>>>>>> origin/main "description": "Premium icons for Ionic.", "files": [ "components/",