From 743006159a9bd89f17ba5323df54bd6b63e5c937 Mon Sep 17 00:00:00 2001 From: Anton Maisak Date: Wed, 24 Mar 2021 13:11:52 +0300 Subject: [PATCH] v. 1.4.1 - bootstrap icons - Update mic and record icons to prevent fill rule issues (#815) - bootstrap icons - Update mic icons to prevent fill rule issues - Fixes #673: Fix fill-rule on record icon - lib peerd ependencies changed to lodash instead camelcase --- changelog.md | 7 ++ package-lock.json | 76 ++++++++++--------- package.json | 6 +- projects/ngx-bootstrap-icons-lib/package.json | 6 +- .../ngx-bootstrap-icons.component.ts | 3 +- .../src/lib/icons/mic-fill.ts | 2 +- .../src/lib/icons/mic-mute-fill.ts | 3 +- .../src/lib/icons/mic-mute.ts | 3 +- .../src/lib/icons/mic.ts | 4 +- .../src/lib/icons/record.ts | 2 +- 10 files changed, 63 insertions(+), 49 deletions(-) diff --git a/changelog.md b/changelog.md index c093791f..7af411d7 100644 --- a/changelog.md +++ b/changelog.md @@ -86,3 +86,10 @@ ## v.1.4.0 (01.03.2021) * Sync version with bootstrap-icons + +## v.1.4.1 (24.03.2021) + +* bootstrap icons - Update mic and record icons to prevent fill rule issues (#815) +* bootstrap icons - Update mic icons to prevent fill rule issues +* Fixes #673: Fix fill-rule on record icon +* lib peerd ependencies changed to lodash instead camelcase diff --git a/package-lock.json b/package-lock.json index 4eda6534..a56efe44 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap-icons-demo", - "version": "1.4.0", + "version": "1.4.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -3223,6 +3223,12 @@ "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", "dev": true }, + "@types/lodash": { + "version": "4.14.168", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz", + "integrity": "sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==", + "dev": true + }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", @@ -3288,13 +3294,13 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.18.0.tgz", - "integrity": "sha512-Lzkc/2+7EoH7+NjIWLS2lVuKKqbEmJhtXe3rmfA8cyiKnZm3IfLf51irnBcmow8Q/AptVV0XBZmBJKuUJTe6cQ==", + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.19.0.tgz", + "integrity": "sha512-CRQNQ0mC2Pa7VLwKFbrGVTArfdVDdefS+gTw0oC98vSI98IX5A8EVH4BzJ2FOB0YlCmm8Im36Elad/Jgtvveaw==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.18.0", - "@typescript-eslint/scope-manager": "4.18.0", + "@typescript-eslint/experimental-utils": "4.19.0", + "@typescript-eslint/scope-manager": "4.19.0", "debug": "^4.1.1", "functional-red-black-tree": "^1.0.1", "lodash": "^4.17.15", @@ -3304,43 +3310,43 @@ }, "dependencies": { "@typescript-eslint/experimental-utils": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.18.0.tgz", - "integrity": "sha512-92h723Kblt9JcT2RRY3QS2xefFKar4ZQFVs3GityOKWQYgtajxt/tuXIzL7sVCUlM1hgreiV5gkGYyBpdOwO6A==", + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.19.0.tgz", + "integrity": "sha512-9/23F1nnyzbHKuoTqFN1iXwN3bvOm/PRIXSBR3qFAYotK/0LveEOHr5JT1WZSzcD6BESl8kPOG3OoDRKO84bHA==", "dev": true, "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/scope-manager": "4.18.0", - "@typescript-eslint/types": "4.18.0", - "@typescript-eslint/typescript-estree": "4.18.0", + "@typescript-eslint/scope-manager": "4.19.0", + "@typescript-eslint/types": "4.19.0", + "@typescript-eslint/typescript-estree": "4.19.0", "eslint-scope": "^5.0.0", "eslint-utils": "^2.0.0" } }, "@typescript-eslint/scope-manager": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.18.0.tgz", - "integrity": "sha512-olX4yN6rvHR2eyFOcb6E4vmhDPsfdMyfQ3qR+oQNkAv8emKKlfxTWUXU5Mqxs2Fwe3Pf1BoPvrwZtwngxDzYzQ==", + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.19.0.tgz", + "integrity": "sha512-GGy4Ba/hLXwJXygkXqMzduqOMc+Na6LrJTZXJWVhRrSuZeXmu8TAnniQVKgj8uTRKe4igO2ysYzH+Np879G75g==", "dev": true, "requires": { - "@typescript-eslint/types": "4.18.0", - "@typescript-eslint/visitor-keys": "4.18.0" + "@typescript-eslint/types": "4.19.0", + "@typescript-eslint/visitor-keys": "4.19.0" } }, "@typescript-eslint/types": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.18.0.tgz", - "integrity": "sha512-/BRociARpj5E+9yQ7cwCF/SNOWwXJ3qhjurMuK2hIFUbr9vTuDeu476Zpu+ptxY2kSxUHDGLLKy+qGq2sOg37A==", + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.19.0.tgz", + "integrity": "sha512-A4iAlexVvd4IBsSTNxdvdepW0D4uR/fwxDrKUa+iEY9UWvGREu2ZyB8ylTENM1SH8F7bVC9ac9+si3LWNxcBuA==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.18.0.tgz", - "integrity": "sha512-wt4xvF6vvJI7epz+rEqxmoNQ4ZADArGQO9gDU+cM0U5fdVv7N+IAuVoVAoZSOZxzGHBfvE3XQMLdy+scsqFfeg==", + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.19.0.tgz", + "integrity": "sha512-3xqArJ/A62smaQYRv2ZFyTA+XxGGWmlDYrsfZG68zJeNbeqRScnhf81rUVa6QG4UgzHnXw5VnMT5cg75dQGDkA==", "dev": true, "requires": { - "@typescript-eslint/types": "4.18.0", - "@typescript-eslint/visitor-keys": "4.18.0", + "@typescript-eslint/types": "4.19.0", + "@typescript-eslint/visitor-keys": "4.19.0", "debug": "^4.1.1", "globby": "^11.0.1", "is-glob": "^4.0.1", @@ -3349,12 +3355,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.18.0.tgz", - "integrity": "sha512-Q9t90JCvfYaN0OfFUgaLqByOfz8yPeTAdotn/XYNm5q9eHax90gzdb+RJ6E9T5s97Kv/UHWKERTmqA0jTKAEHw==", + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.19.0.tgz", + "integrity": "sha512-aGPS6kz//j7XLSlgpzU2SeTqHPsmRYxFztj2vPuMMFJXZudpRSehE3WCV+BaxwZFvfAqMoSd86TEuM0PQ59E/A==", "dev": true, "requires": { - "@typescript-eslint/types": "4.18.0", + "@typescript-eslint/types": "4.19.0", "eslint-visitor-keys": "^2.0.0" } }, @@ -3369,9 +3375,9 @@ } }, "semver": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", - "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -16476,9 +16482,9 @@ "dev": true }, "ua-parser-js": { - "version": "0.7.24", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.24.tgz", - "integrity": "sha512-yo+miGzQx5gakzVK3QFfN0/L9uVhosXBBO7qmnk7c2iw1IhL212wfA3zbnI54B0obGwC/5NWub/iT9sReMx+Fw==", + "version": "0.7.25", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.25.tgz", + "integrity": "sha512-8NFExdfI24Ny8R3Vc6+uUytP/I7dpqk3JERlvxPWlrtx5YboqCgxAXYKPAifbPLV2zKbgmmPL53ufW7mUC/VOQ==", "dev": true }, "unicode-canonical-property-names-ecmascript": { diff --git a/package.json b/package.json index 4e9a8b15..9cb7e049 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap-icons-demo", - "version": "1.4.0", + "version": "1.4.1", "homepage": "https://avmaisak.github.io/ngx-bootstrap-icons/", "scripts": { "ng": "./node_modules/@angular/cli/bin/ng", @@ -50,11 +50,11 @@ "@angular/language-service": "11.2.6", "@types/jasmine": "3.6.7", "@types/jasminewd2": "2.0.8", + "@types/lodash": "^4.14.168", "@types/node": "14.14.35", - "@typescript-eslint/eslint-plugin": "4.18.0", + "@typescript-eslint/eslint-plugin": "4.19.0", "@typescript-eslint/parser": "4.19.0", "bootstrap-icons": "1.4.0", - "camelcase": "6.2.0", "cli-color": "2.0.0", "codelyzer": "6.0.1", "eslint": "7.22.0", diff --git a/projects/ngx-bootstrap-icons-lib/package.json b/projects/ngx-bootstrap-icons-lib/package.json index 550efc5e..6e80f92f 100644 --- a/projects/ngx-bootstrap-icons-lib/package.json +++ b/projects/ngx-bootstrap-icons-lib/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap-icons", - "version": "1.4.0", + "version": "1.4.1", "description": "Bootstrap Icons components library for your Angular Applications", "homepage": "https://avmaisak.github.io/ngx-bootstrap-icons/", "repository": { @@ -28,11 +28,11 @@ "license": "MIT", "engines": { "node": ">= 12.19.0", - "npm": ">= 6.14.8" + "npm": ">= 6.14.10" }, "peerDependencies": { "@angular/common": ">= 10.1.0", "@angular/core": ">= 10.1.0", - "camelcase": ">=6.2.0" + "lodash": ">=4.17.21" } } diff --git a/projects/ngx-bootstrap-icons-lib/src/lib/components/ngx-bootstrap-icons/ngx-bootstrap-icons.component.ts b/projects/ngx-bootstrap-icons-lib/src/lib/components/ngx-bootstrap-icons/ngx-bootstrap-icons.component.ts index ae79f8d7..9e167891 100644 --- a/projects/ngx-bootstrap-icons-lib/src/lib/components/ngx-bootstrap-icons/ngx-bootstrap-icons.component.ts +++ b/projects/ngx-bootstrap-icons-lib/src/lib/components/ngx-bootstrap-icons/ngx-bootstrap-icons.component.ts @@ -1,6 +1,7 @@ import { ChangeDetectorRef, Component, ElementRef, Inject, Input, OnChanges, SimpleChanges, } from '@angular/core'; +import { camelCase } from 'lodash'; import { IModuleConfigOptions, MODULE_CONFIG_TOKEN } from '../../config/module.config'; import { IconNamesEnum } from '../../enums/icon-names.enum'; @@ -40,8 +41,6 @@ export class NgxBootstrapIconsLibComponent implements OnChanges { * @param changes SimpleChanges */ public ngOnChanges(changes: SimpleChanges): void { - // eslint-disable-next-line global-require - const camelCase = require('camelcase'); // icons are provided as an array of objects because of "multi: true" // eslint-disable-next-line @typescript-eslint/no-explicit-any const icons = Object.assign({}, ...(this._icons as any as object[])); diff --git a/projects/ngx-bootstrap-icons-lib/src/lib/icons/mic-fill.ts b/projects/ngx-bootstrap-icons-lib/src/lib/icons/mic-fill.ts index 95510e0b..24c51d08 100644 --- a/projects/ngx-bootstrap-icons-lib/src/lib/icons/mic-fill.ts +++ b/projects/ngx-bootstrap-icons-lib/src/lib/icons/mic-fill.ts @@ -7,5 +7,5 @@ */ export const micFill = ` - + `; diff --git a/projects/ngx-bootstrap-icons-lib/src/lib/icons/mic-mute-fill.ts b/projects/ngx-bootstrap-icons-lib/src/lib/icons/mic-mute-fill.ts index 13e121e2..c324f77d 100644 --- a/projects/ngx-bootstrap-icons-lib/src/lib/icons/mic-mute-fill.ts +++ b/projects/ngx-bootstrap-icons-lib/src/lib/icons/mic-mute-fill.ts @@ -6,5 +6,6 @@ * {@link https://icons.getbootstrap.com/icons/mic-mute-fill/}. */ export const micMuteFill = ` - + + `; diff --git a/projects/ngx-bootstrap-icons-lib/src/lib/icons/mic-mute.ts b/projects/ngx-bootstrap-icons-lib/src/lib/icons/mic-mute.ts index 06e43929..996f1ac5 100644 --- a/projects/ngx-bootstrap-icons-lib/src/lib/icons/mic-mute.ts +++ b/projects/ngx-bootstrap-icons-lib/src/lib/icons/mic-mute.ts @@ -6,5 +6,6 @@ * {@link https://icons.getbootstrap.com/icons/mic-mute/}. */ export const micMute = ` - + + `; diff --git a/projects/ngx-bootstrap-icons-lib/src/lib/icons/mic.ts b/projects/ngx-bootstrap-icons-lib/src/lib/icons/mic.ts index 357b5e03..bba36144 100644 --- a/projects/ngx-bootstrap-icons-lib/src/lib/icons/mic.ts +++ b/projects/ngx-bootstrap-icons-lib/src/lib/icons/mic.ts @@ -6,6 +6,6 @@ * {@link https://icons.getbootstrap.com/icons/mic/}. */ export const mic = ` - - + + `; diff --git a/projects/ngx-bootstrap-icons-lib/src/lib/icons/record.ts b/projects/ngx-bootstrap-icons-lib/src/lib/icons/record.ts index 48daadf7..d7c94de0 100644 --- a/projects/ngx-bootstrap-icons-lib/src/lib/icons/record.ts +++ b/projects/ngx-bootstrap-icons-lib/src/lib/icons/record.ts @@ -6,5 +6,5 @@ * {@link https://icons.getbootstrap.com/icons/record/}. */ export const record = ` - + `;