diff --git a/package-lock.json b/package-lock.json index 21aa0f6385..e56ce8b448 100644 --- a/package-lock.json +++ b/package-lock.json @@ -96,7 +96,7 @@ "@types/shell-quote": "^1.7.1", "@types/shortid": "0.0.29", "@vitejs/plugin-react-swc": "^3.3.0", - "@vscode/codicons": "0.0.33", + "@vscode/codicons": "0.0.36", "chokidar-cli": "^2.1.0", "cross-env": "^7.0.2", "eslint": "^8.29.0", @@ -9120,9 +9120,9 @@ } }, "node_modules/@vscode/codicons": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.33.tgz", - "integrity": "sha512-VdgpnD75swH9hpXjd34VBgQ2w2quK63WljodlUcOoJDPKiV+rPjHrcUc2sjLCNKxhl6oKqmsZgwOWcDAY2GKKQ==", + "version": "0.0.36", + "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.36.tgz", + "integrity": "sha512-wsNOvNMMJ2BY8rC2N2MNBG7yOowV3ov8KlvUE/AiVUlHKTfWsw3OgAOQduX7h0Un6GssKD3aoTVH+TF3DSQwKQ==", "dev": true }, "node_modules/@yarnpkg/lockfile": { @@ -37089,9 +37089,9 @@ } }, "@vscode/codicons": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.33.tgz", - "integrity": "sha512-VdgpnD75swH9hpXjd34VBgQ2w2quK63WljodlUcOoJDPKiV+rPjHrcUc2sjLCNKxhl6oKqmsZgwOWcDAY2GKKQ==", + "version": "0.0.36", + "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.36.tgz", + "integrity": "sha512-wsNOvNMMJ2BY8rC2N2MNBG7yOowV3ov8KlvUE/AiVUlHKTfWsw3OgAOQduX7h0Un6GssKD3aoTVH+TF3DSQwKQ==", "dev": true }, "@yarnpkg/lockfile": { diff --git a/package.json b/package.json index 345fa48b48..021ff2a817 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "@types/shell-quote": "^1.7.1", "@types/shortid": "0.0.29", "@vitejs/plugin-react-swc": "^3.3.0", - "@vscode/codicons": "0.0.33", + "@vscode/codicons": "0.0.36", "chokidar-cli": "^2.1.0", "cross-env": "^7.0.2", "eslint": "^8.29.0", diff --git a/packages/icons/scripts/build.js b/packages/icons/scripts/build.js index 19cf7273e2..943f8b75ee 100644 --- a/packages/icons/scripts/build.js +++ b/packages/icons/scripts/build.js @@ -18,6 +18,10 @@ const OUTPUT_SIZE = 512; const codiconFolder = { dir: path.resolve(BUILD_DIR, 'svg/vs'), prefix: 'vs' }; const dhiconFolder = { dir: path.resolve(BUILD_DIR, 'svg/dh'), prefix: 'dh' }; +const EXCLUDED_ICONS = [ + 'repo-fetch', // excluded because rounded rects can't be converted to a single path by svgo +]; + function getPrefixedName(name, prefix) { return ( prefix.toLowerCase() + @@ -47,7 +51,12 @@ async function getFiles(src) { const files = await getFilesInFolder(src.dir); const contents = await Promise.all( files - .filter(file => file.slice(file.length - 1) !== '.svg') + .filter( + file => + // file is svg and not in excluded list + file.endsWith('.svg') && + EXCLUDED_ICONS.indexOf(file.slice(0, -4)) === -1 + ) .map(async file => { const name = file.slice(0, -4); return { diff --git a/tests/styleguide.spec.ts-snapshots/icons-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/icons-chromium-linux.png index a100299cdc..52aa72a291 100644 Binary files a/tests/styleguide.spec.ts-snapshots/icons-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/icons-chromium-linux.png differ diff --git a/tests/styleguide.spec.ts-snapshots/icons-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/icons-firefox-linux.png index 4ef99a36fe..7e7d3f5cbc 100644 Binary files a/tests/styleguide.spec.ts-snapshots/icons-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/icons-firefox-linux.png differ diff --git a/tests/styleguide.spec.ts-snapshots/icons-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/icons-webkit-linux.png index 1ef33bdfe9..a8eaf2fd31 100644 Binary files a/tests/styleguide.spec.ts-snapshots/icons-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/icons-webkit-linux.png differ