chore(ui-icons,ui-scripts): move icon generation to ui-scipts (except…

… icon fonts)
instructure · Oct 2, 2023 · 9a8feb4 · 9a8feb4
1 parent cd5e681
commit 9a8feb4
Show file tree

Hide file tree

Showing 10 changed files with 630 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/ui-icons/gulpfile.js b/packages/ui-icons/gulpfile.js
@@ -23,21 +23,6 @@
  */
 
 const gulp = require('gulp')
+const { buildFonts } = require('@instructure/ui-icons-build')
 
-const {
-  optimizeSVGs,
-  buildSVGs,
-  buildFonts,
-  buildReact,
-  buildAll,
-  clean
-} = require('@instructure/ui-icons-build')
-
-gulp.task('clean', clean)
-gulp.task('optimize', optimizeSVGs)
-gulp.task('build:svgs', buildSVGs)
-gulp.task('build:fonts', buildFonts)
-gulp.task('build:react', buildReact)
-gulp.task('build', buildAll)
-
-gulp.task('default', buildAll)
+gulp.task('default', buildFonts)
diff --git a/packages/ui-icons/package.json b/packages/ui-icons/package.json
@@ -14,9 +14,10 @@
   "bugs": "https://github.com/instructure/instructure-ui/issues",
   "scripts": {
     "clean": "gulp clean && ui-scripts clean",
-    "prepare-build": "gulp",
+    "prepare-build": "npm run build-icons",
+    "build-icons": "ui-scripts build-icons --svgoConfig svgo.config.js --config icons.config.js && gulp",
     "build": "ui-scripts build __build__ --copy-files --modules es,cjs",
-    "export": "gulp clean && gulp && npm run build:types",
+    "export": "npm run build-icons && npm run build:types",
     "build:types": "tsc -p tsconfig.build.json",
     "ts:check": "tsc -p tsconfig.build.json --noEmit --emitDeclarationOnly false"
   },

diff --git a/packages/ui-icons/svgo.config.js b/packages/ui-icons/svgo.config.js
@@ -52,6 +52,12 @@ module.exports = {
       name: 'convertPathData',
       active: false
     },
+    {
+      name: 'removeAttrs',
+      params: {
+        attrs: '(fill)'
+      }
+    },
     {
       // Custom plugin for wrapping multiple path svg-s into a `<g>` tag.
       // This is needed because all svg files are supposed to have

diff --git a/packages/ui-scripts/lib/commands/index.js b/packages/ui-scripts/lib/commands/index.js
@@ -34,6 +34,7 @@ import bundle from '../build/webpack.js'
 import clean from '../build/clean.js'
 import build from '../build/babel.js'
 import generateAllTokens from '../build/generate-all-tokens.js'
+import buildIcons from '../icons/build-icons.js'
 
 export const yargCommands = [
   bump,
@@ -47,5 +48,6 @@ export const yargCommands = [
   bundle,
   clean,
   build,
-  generateAllTokens
+  generateAllTokens,
+  buildIcons
 ]