Merge pull request #288 from etn-ccis/dev

Publish patch v1.13.1 for icons-svg; update demo build scripts
etn-ccis · Jul 7, 2023 · 16b7845 · 16b7845
2 parents b14f844 + 39681ec
commit 16b7845
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 44 deletions.
diff --git a/demos/react-demo/package.json b/demos/react-demo/package.json
@@ -4,9 +4,9 @@
     "private": true,
     "dependencies": {
         "@brightlayer-ui/colors": "^3.1.1",
-        "@brightlayer-ui/icons": "2.1.0",
-        "@brightlayer-ui/icons-mui": "3.4.0",
-        "@brightlayer-ui/icons-svg": "1.12.0",
+        "@brightlayer-ui/icons": "2.2.0",
+        "@brightlayer-ui/icons-mui": "3.5.0",
+        "@brightlayer-ui/icons-svg": "1.13.0",
         "@brightlayer-ui/react-components": "^6.2.0",
         "@brightlayer-ui/react-native-vector-icons": "^2.0.0",
         "@brightlayer-ui/react-themes": "^7.0.0",
@@ -25,7 +25,7 @@
         "web-vitals": "^2.1.4"
     },
     "scripts": {
-        "start": "react-scripts start",
+        "start": "yarn update:demo && yarn && react-scripts start",
         "build-app": "react-scripts build",
         "test": "react-scripts test --passWithNoTests --watchAll=false",
         "eject": "react-scripts eject",

diff --git a/design/META.json b/design/META.json
@@ -1274,7 +1274,7 @@
         {
             "name": "Silo",
             "filename": "silo.svg",
-            "family": ["Agriculture", "Building"],
+            "family": ["Agriculture", "Maps"],
             "style": "baseline",
             "tags": ["farm", "feed", "food", "grain", "structure"],
             "author": "Unknown",
@@ -1761,7 +1761,7 @@
         {
             "name": "Building",
             "filename": "building.svg",
-            "family": ["industrial"],
+            "family": ["Maps"],
             "style": "baseline",
             "tags": ["pins", "places", "locations", "office"],
             "author": "GreenTurtwig",
@@ -4300,7 +4300,7 @@
         {
             "name": "Garage Closed",
             "filename": "garage_closed.svg",
-            "family": ["System"],
+            "family": ["Maps"],
             "style": "baseline",
             "tags": ["car", "door", "shed", "storage", "tool", "house"],
             "author": "Michael Irigoyen",

diff --git a/package.json b/package.json
@@ -9,6 +9,7 @@
         "demos/react-demo"
     ],
     "scripts": {
+        "update:demo": "node ./scripts/updateDemoDependencies.js",
         "build": "yarn workspaces foreach -v --topological-dev run build",
         "start": "yarn workspaces foreach -v run start",
         "prettier": "yarn workspaces foreach -v run prettier",

diff --git a/packages/icon-font/CHANGELOG.md b/packages/icon-font/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### Added
 
--   New icons: Cloud Done, Cloud Off Filled, Utility Disabled, File CSV, Breaker Closed, Battery Disabled, EV Plug IEC 61851 GB/T, Notification Active Outline, Battery Disabled Alt, Sitemap Outline, Warehouse Alt, Floor Plan, Garage Closed, Cloud Done, Cloud Off Filled, Utility Disabled, File CSV, Breaker Closed, Battery Disabled, EV Plug IEC 61851 GB/T, Notification Active Outline, Battery Disabled Alt, Sitemap Outline, Warehouse Alt, Floor Plan, Garage Closed.
+-   New icons: Cloud Done, Cloud Off Filled, Utility Disabled, File CSV, Breaker Closed, Battery Disabled, EV Plug IEC 61851 GB/T, Notification Active Outline, Battery Disabled Alt, Sitemap Outline, Warehouse Alt, Floor Plan, Garage Closed.
 
 ## v2.1.0 (Feb 28, 2023)
 

diff --git a/packages/mui/CHANGELOG.md b/packages/mui/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### Added
 
--   New icons: Cloud Done, Cloud Off Filled, Utility Disabled, File CSV, Breaker Closed, Battery Disabled, EV Plug IEC 61851 GB/T, Notification Active Outline, Battery Disabled Alt, Sitemap Outline, Warehouse Alt, Floor Plan, Garage Closed, Cloud Done, Cloud Off Filled, Utility Disabled, File CSV, Breaker Closed, Battery Disabled, EV Plug IEC 61851 GB/T, Notification Active Outline, Battery Disabled Alt, Sitemap Outline, Warehouse Alt, Floor Plan, Garage Closed.
+-   New icons: Cloud Done, Cloud Off Filled, Utility Disabled, File CSV, Breaker Closed, Battery Disabled, EV Plug IEC 61851 GB/T, Notification Active Outline, Battery Disabled Alt, Sitemap Outline, Warehouse Alt, Floor Plan, Garage Closed.
 
 ## v3.4.0 (Feb 28, 2023)
 

diff --git a/packages/mui/index.json b/packages/mui/index.json
@@ -1274,7 +1274,7 @@
         {
             "name": "Silo",
             "filename": "silo.svg",
-            "family": ["Agriculture", "Building"],
+            "family": ["Agriculture", "Maps"],
             "style": "baseline",
             "tags": ["farm", "feed", "food", "grain", "structure"],
             "author": "Unknown",
@@ -1761,7 +1761,7 @@
         {
             "name": "Building",
             "filename": "building.svg",
-            "family": ["industrial"],
+            "family": ["Maps"],
             "style": "baseline",
             "tags": ["pins", "places", "locations", "office"],
             "author": "GreenTurtwig",
@@ -4300,7 +4300,7 @@
         {
             "name": "Garage Closed",
             "filename": "garage_closed.svg",
-            "family": ["System"],
+            "family": ["Maps"],
             "style": "baseline",
             "tags": ["car", "door", "shed", "storage", "tool", "house"],
             "author": "Michael Irigoyen",

diff --git a/packages/rn-vector/CHANGELOG.md b/packages/rn-vector/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### Added
 
--   New icons: Cloud Done, Cloud Off Filled, Utility Disabled, File CSV, Breaker Closed, Battery Disabled, EV Plug IEC 61851 GB/T, Notification Active Outline, Battery Disabled Alt, Sitemap Outline, Warehouse Alt, Floor Plan, Garage Closed, Cloud Done, Cloud Off Filled, Utility Disabled, File CSV, Breaker Closed, Battery Disabled, EV Plug IEC 61851 GB/T, Notification Active Outline, Battery Disabled Alt, Sitemap Outline, Warehouse Alt, Floor Plan, Garage Closed.
+-   New icons: Cloud Done, Cloud Off Filled, Utility Disabled, File CSV, Breaker Closed, Battery Disabled, EV Plug IEC 61851 GB/T, Notification Active Outline, Battery Disabled Alt, Sitemap Outline, Warehouse Alt, Floor Plan, Garage Closed.
 
 ## v2.1.0 (Feb 28, 2023)
 

diff --git a/packages/svg/CHANGELOG.md b/packages/svg/CHANGELOG.md
@@ -1,10 +1,16 @@
 # Changelog
 
+## v1.13.1 (July 7, 2023)
+
+### Changed
+
+-   Reassigned 3 icons (Silo, Building, Garage Closed) to the family "maps".
+
 ## v1.13.0 (June 30, 2023)
 
 ### Added
 
--   New icons: Cloud Done, Cloud Off Filled, Utility Disabled, File CSV, Breaker Closed, Battery Disabled, EV Plug IEC 61851 GB/T, Notification Active Outline, Battery Disabled Alt, Sitemap Outline, Warehouse Alt, Floor Plan, Garage Closed, Cloud Done, Cloud Off Filled, Utility Disabled, File CSV, Breaker Closed, Battery Disabled, EV Plug IEC 61851 GB/T, Notification Active Outline, Battery Disabled Alt, Sitemap Outline, Warehouse Alt, Floor Plan, Garage Closed.
+-   New icons: Cloud Done, Cloud Off Filled, Utility Disabled, File CSV, Breaker Closed, Battery Disabled, EV Plug IEC 61851 GB/T, Notification Active Outline, Battery Disabled Alt, Sitemap Outline, Warehouse Alt, Floor Plan, Garage Closed.
 
 ## v1.12.0 (Feb 28, 2023)
 

diff --git a/packages/svg/index.json b/packages/svg/index.json
@@ -1274,7 +1274,7 @@
         {
             "name": "Silo",
             "filename": "silo.svg",
-            "family": ["Agriculture", "Building"],
+            "family": ["Agriculture", "Maps"],
             "style": "baseline",
             "tags": ["farm", "feed", "food", "grain", "structure"],
             "author": "Unknown",
@@ -1761,7 +1761,7 @@
         {
             "name": "Building",
             "filename": "building.svg",
-            "family": ["industrial"],
+            "family": ["Maps"],
             "style": "baseline",
             "tags": ["pins", "places", "locations", "office"],
             "author": "GreenTurtwig",
@@ -4300,7 +4300,7 @@
         {
             "name": "Garage Closed",
             "filename": "garage_closed.svg",
-            "family": ["System"],
+            "family": ["Maps"],
             "style": "baseline",
             "tags": ["car", "door", "shed", "storage", "tool", "house"],
             "author": "Michael Irigoyen",

diff --git a/packages/svg/package.json b/packages/svg/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@brightlayer-ui/icons-svg",
-    "version": "1.13.0",
+    "version": "1.13.1",
     "description": "SVG icons for Eaton applications",
     "main": "index.js",
     "scripts": {

diff --git a/scripts/updateDemoDependencies.js b/scripts/updateDemoDependencies.js
@@ -0,0 +1,15 @@
+const fs = require('fs');
+
+console.log('Updating demo dependency versions');
+const demoJson = JSON.parse(fs.readFileSync('./demos/react-demo/package.json'));
+const fontVersion = JSON.parse(fs.readFileSync('./packages/icon-font/package.json')).version;
+const muiVersion = JSON.parse(fs.readFileSync('./packages/mui/package.json')).version;
+const svgVersion = JSON.parse(fs.readFileSync('./packages/svg/package.json')).version;
+
+demoJson.dependencies['@brightlayer-ui/icons'] = fontVersion;
+demoJson.dependencies['@brightlayer-ui/icons-mui'] = muiVersion;
+demoJson.dependencies['@brightlayer-ui/icons-svg'] = svgVersion;
+
+fs.writeFileSync('./demos/react-demo/package.json', JSON.stringify(demoJson, null, 4), "utf8");
+
+console.log('Updating demo dependency versions: COMPLETE');
diff --git a/yarn.lock b/yarn.lock
@@ -1785,17 +1785,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@brightlayer-ui/icons-mui@npm:3.4.0":
-  version: 3.4.0
-  resolution: "@brightlayer-ui/icons-mui@npm:3.4.0"
-  peerDependencies:
-    "@mui/icons-material": ^5.0.0
-    "@mui/material": ^5.0.0
-  checksum: e856da6935a20b28ee8e6c60c581e70c26cdd85a15abadfd89bc75d08d8dcb645a1bb7eea6865476bf417db2ab41c88a34787261b500e4b3c612d35d05bad131
-  languageName: node
-  linkType: hard
-
-"@brightlayer-ui/icons-mui@workspace:packages/mui":
+"@brightlayer-ui/[email protected], @brightlayer-ui/icons-mui@workspace:packages/mui":
   version: 0.0.0-use.local
   resolution: "@brightlayer-ui/icons-mui@workspace:packages/mui"
   dependencies:
@@ -1821,14 +1811,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@brightlayer-ui/icons-svg@npm:1.12.0":
-  version: 1.12.0
-  resolution: "@brightlayer-ui/icons-svg@npm:1.12.0"
-  checksum: 0e36db3d7ba4b4b26c4f69e7d4fce8fadd09257cacff66ec771f9753c818fd23633975cca05c62a6aeca31965c1b1fc903c736d01ccf440e212c3d32dcce95da
+"@brightlayer-ui/icons-svg@npm:1.13.0":
+  version: 1.13.0
+  resolution: "@brightlayer-ui/icons-svg@npm:1.13.0"
+  checksum: b61ac923222ce5084da4800a33483f71cb837369db71c618d9907d1af06bca3d915b0048a166b474573848059fd13320902e13a33a3ea52473278afff9335318
   languageName: node
   linkType: hard
 
-"@brightlayer-ui/icons@^2.0.0, @brightlayer-ui/icons@workspace:packages/icon-font":
+"@brightlayer-ui/icons@2.2.0, @brightlayer-ui/icons@^2.0.0, @brightlayer-ui/icons@workspace:packages/icon-font":
   version: 0.0.0-use.local
   resolution: "@brightlayer-ui/icons@workspace:packages/icon-font"
   dependencies:
@@ -1839,13 +1829,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@brightlayer-ui/icons@npm:2.1.0":
-  version: 2.1.0
-  resolution: "@brightlayer-ui/icons@npm:2.1.0"
-  checksum: 7849044c50376c9a06eff49f91d3087f462aa6be9a298f3e48fc3e8699542f0408c74c70e44486a07360659ee21a62e090e5bbd7a13fa40e127010fe8a517120
-  languageName: node
-  linkType: hard
-
 "@brightlayer-ui/prettier-config@npm:^1.0.3":
   version: 1.0.3
   resolution: "@brightlayer-ui/prettier-config@npm:1.0.3"
@@ -14381,9 +14364,9 @@ __metadata:
   dependencies:
     "@brightlayer-ui/colors": ^3.1.1
     "@brightlayer-ui/eslint-config": ^3.0.1
-    "@brightlayer-ui/icons": 2.1.0
-    "@brightlayer-ui/icons-mui": 3.4.0
-    "@brightlayer-ui/icons-svg": 1.12.0
+    "@brightlayer-ui/icons": 2.2.0
+    "@brightlayer-ui/icons-mui": 3.5.0
+    "@brightlayer-ui/icons-svg": 1.13.0
     "@brightlayer-ui/prettier-config": ^1.0.3
     "@brightlayer-ui/react-components": ^6.2.0
     "@brightlayer-ui/react-native-vector-icons": ^2.0.0