Use self-hosted material-icons in demo (npm: material-icons@1.13.1, repository: https://github.com/marella/material-icons)

ShreckYe · ShreckYe · commit d6f035574fcd · 2022-12-07T18:09:23.000+08:00
diff --git a/demo/build.gradle.kts b/demo/build.gradle.kts
@@ -24,19 +24,22 @@ kotlin {
                 implementation(compose.desktop.currentOs)
             }
         }
-        /* TODO: uncomment or remove
         named("jsMain") {
             dependencies {
+                /* TODO: uncomment or remove
                 // copied from https://github.com/mpetuska/kmdc
 
                 // SCSS dependencies
                 implementation(devNpm("style-loader", "^3.3.1"))
                 implementation(devNpm("css-loader", "^6.7.1"))
                 implementation(devNpm("sass-loader", "^13.0.0"))
                 implementation(devNpm("sass", "^1.52.1"))
+                */
+
+
+                implementation(npm("material-icons", "1.13.1"))
             }
         }
-        */
     }
 }
 
diff --git a/demo/src/jsMain/resources/index.html b/demo/src/jsMain/resources/index.html
@@ -5,7 +5,6 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta charset="UTF-8">
     <title>Compose Multiplatform Material demo</title>
-    <link href="https://fonts.googleapis.com/css?family=Material+Icons&display=block" rel="stylesheet">
 </head>
 
 <body>
diff --git a/demo/webpack.config.d/material-icons-css.js b/demo/webpack.config.d/material-icons-css.js
@@ -0,0 +1,5 @@
+const mainEntryExtras = ['material-icons/iconfont/material-icons.css',];
+if (config.entry.main != null)
+    config.entry.main.push(...mainEntryExtras);
+else
+    config.entry.main = mainEntryExtras;
diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
@@ -2336,6 +2336,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+material-icons@1.13.1:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/material-icons/-/material-icons-1.13.1.tgz#27de79bf68a4db0a1caec099d4f54ba658770e89"
+  integrity sha512-6EwhlEa4rwydNSWw11ig1oz/h/KcarJXn4n50Wd69v5Eh026Y6xBo9zLPeX4iF8+qUZV862X0AUUA0m0VaihWg==
+
 material-icons@^1.10.4:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/material-icons/-/material-icons-1.12.2.tgz#68dbf74309ebfbd791eea75b5fec2d74b07d558f"

Original file line number	Diff line number	Diff line change
`@@ -24,19 +24,22 @@ kotlin {`
`24`	`24`	`implementation(compose.desktop.currentOs)`
`25`	`25`	`}`
`26`	`26`	`}`
`27`		`- /* TODO: uncomment or remove`
`28`	`27`	`named("jsMain") {`
`29`	`28`	`dependencies {`
	`29`	`+ /* TODO: uncomment or remove`
`30`	`30`	`// copied from https://github.com/mpetuska/kmdc`
`31`	`31`
`32`	`32`	`// SCSS dependencies`
`33`	`33`	`implementation(devNpm("style-loader", "^3.3.1"))`
`34`	`34`	`implementation(devNpm("css-loader", "^6.7.1"))`
`35`	`35`	`implementation(devNpm("sass-loader", "^13.0.0"))`
`36`	`36`	`implementation(devNpm("sass", "^1.52.1"))`
	`37`	`+ */`
	`38`	`+`
	`39`	`+`
	`40`	`+ implementation(npm("material-icons", "1.13.1"))`
`37`	`41`	`}`
`38`	`42`	`}`
`39`		`- */`
`40`	`43`	`}`
`41`	`44`	`}`
`42`	`45`