diff --git a/.github/ISSUE_TEMPLATE/1-icon-request.yml b/.github/ISSUE_TEMPLATE/1-icon-request.yml index c5a1ba6c6a..c30032e865 100644 --- a/.github/ISSUE_TEMPLATE/1-icon-request.yml +++ b/.github/ISSUE_TEMPLATE/1-icon-request.yml @@ -8,32 +8,30 @@ body: id: icon-type attributes: label: Icon Type + description: What type of icon are you requesting? options: - label: Folder - label: File - required: true - type: textarea id: folder-names attributes: label: Folder names + description: If you are requesting folder icons, please list the folder names here. placeholder: | - folder-name - another-folder-name - ... - validations: - required: false - type: textarea id: file-names attributes: label: File names + description: If you are requesting file icons, please list the file names or file extensions here. placeholder: | - file-name - another-file-name - ... - validations: - required: false - type: textarea id: graphic-ideas @@ -41,8 +39,6 @@ body: label: Graphic ideas description: A clear description of the icon you would like. If the icons are separate for folder and files, please create separate issues. placeholder: Include a link to sample icons if possible - validations: - required: false - type: textarea id: additional-context @@ -50,8 +46,6 @@ body: label: Additional context description: Add any other context about the icons here. placeholder: I consider these icons necessary because ... - validations: - required: false - type: checkboxes id: terms diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a90fabbfdc..56b0d77ffb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: attestations: write steps: - - uses: actions/create-github-app-token@31c86eb3b33c9b601a1f60f98dcbfd1d70f379b4 # v1.10.3 + - uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0 id: app-token with: app-id: ${{ vars.BOT_APP_ID }} @@ -71,7 +71,7 @@ jobs: run: bunx @vscode/vsce package - name: Attest artifacts ✅ - uses: actions/attest-build-provenance@6149ea5740be74af77f260b9db67e633f6b0a9a1 # v1.4.2 + uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3 # Read: https://docs.github.com/en/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds with: subject-path: '${{ env.NAME }}-${{ env.VERSION }}.vsix' diff --git a/CHANGELOG.md b/CHANGELOG.md index 1095fb55cf..07369be595 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,39 @@ All notable changes to this project will be documented in this file. Dates are displayed in UTC. +#### [v5.11.1](https://github.com/material-extensions/vscode-material-icon-theme/compare/v5.11.0...v5.11.1) + +> September 21, 2024 + +- Fix issue with Svelte JS and TS icons (Closes #2603) [`be58bc47`](https://github.com/material-extensions/vscode-material-icon-theme/commit/be58bc47) +- Update preversion script [`1c7a0847`](https://github.com/material-extensions/vscode-material-icon-theme/commit/1c7a0847) + +#### [v5.11.0](https://github.com/material-extensions/vscode-material-icon-theme/compare/v5.10.0...v5.11.0) + +> September 20, 2024 + +- Update preversion script [`12145f8e`](https://github.com/material-extensions/vscode-material-icon-theme/commit/12145f8e) +- Add .svelte.js and .svelte.ts color variants [`#2600`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2600) +- Remove vscode specific fields from module's package json [`#2602`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2602) +- Fix icon request template [`#2596`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2596) +- feat: ecmascript extension patterns for svelte.config [`#2595`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2595) +- Add icons for Lefthook files and folders [`#2582`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2582) +- build(deps): bump actions/create-github-app-token [`#2591`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2591) +- Add `ts`, `cjs` ext for `quasar` [`#2590`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2590) +- Added icon for `wxt.config.ts` file 🧩 [`#2576`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2576) +- build(deps): bump the github-actions group with 2 updates [`#2583`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2583) +- feat: ✨ .clang-format-ignore file icon [`#2580`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2580) +- Added taze configuration file icon [`#2577`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2577) +- added favicons folder icon [`#2578`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2578) +- Feat: added sway icon [`#2573`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2573) +- added src-tauri folder icon [`#2567`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2567) +- refactor: ♻️ Improve scripts in `package.json` [`#2569`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2569) +- Added freemarker icon [`#2396`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2396) +- Add nest interceptor icon [`#2572`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2572) +- Remove coderabbit config [`9f57e5cc`](https://github.com/material-extensions/vscode-material-icon-theme/commit/9f57e5cc) +- feat: ✨ .markdownlintignore file icon [`#2565`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2565) +- docs: 📝 fix broken links in pull_request_template [`#2566`](https://github.com/material-extensions/vscode-material-icon-theme/pull/2566) + #### [v5.10.0](https://github.com/material-extensions/vscode-material-icon-theme/compare/v5.9.0...v5.10.0) > August 29, 2024 diff --git a/icons/folder-favicon-open.svg b/icons/folder-favicon-open.svg new file mode 100644 index 0000000000..9501a3eb2f --- /dev/null +++ b/icons/folder-favicon-open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/folder-favicon.svg b/icons/folder-favicon.svg new file mode 100644 index 0000000000..548584999a --- /dev/null +++ b/icons/folder-favicon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/folder-lefthook-open.svg b/icons/folder-lefthook-open.svg new file mode 100644 index 0000000000..fd1e1e7909 --- /dev/null +++ b/icons/folder-lefthook-open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/folder-lefthook.svg b/icons/folder-lefthook.svg new file mode 100644 index 0000000000..d393376186 --- /dev/null +++ b/icons/folder-lefthook.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/folder-src-tauri-open.svg b/icons/folder-src-tauri-open.svg new file mode 100644 index 0000000000..fe25fe18df --- /dev/null +++ b/icons/folder-src-tauri-open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/folder-src-tauri.svg b/icons/folder-src-tauri.svg new file mode 100644 index 0000000000..db1d1aa5da --- /dev/null +++ b/icons/folder-src-tauri.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/freemarker.svg b/icons/freemarker.svg index 9d58083547..edf98f6df5 100644 --- a/icons/freemarker.svg +++ b/icons/freemarker.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/icons/lefthook.svg b/icons/lefthook.svg new file mode 100644 index 0000000000..66a444b08a --- /dev/null +++ b/icons/lefthook.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/sway.svg b/icons/sway.svg new file mode 100644 index 0000000000..0d93bbbb1b --- /dev/null +++ b/icons/sway.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/taze.svg b/icons/taze.svg new file mode 100644 index 0000000000..596b76d904 --- /dev/null +++ b/icons/taze.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/wxt.svg b/icons/wxt.svg new file mode 100644 index 0000000000..d43b742831 --- /dev/null +++ b/icons/wxt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/contributors.png b/images/contributors.png index 4ef74809fe..9e277aa056 100644 Binary files a/images/contributors.png and b/images/contributors.png differ diff --git a/images/fileIcons.png b/images/fileIcons.png index d81521e45e..4c758db3f5 100644 Binary files a/images/fileIcons.png and b/images/fileIcons.png differ diff --git a/images/folderIcons.png b/images/folderIcons.png index 01b0c81975..44106ac00e 100644 Binary files a/images/folderIcons.png and b/images/folderIcons.png differ diff --git a/package.json b/package.json index 095c795589..fae635881b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "material-icon-theme", "displayName": "Material Icon Theme", "description": "Material Design Icons for Visual Studio Code", - "version": "5.10.0", + "version": "5.11.1", "license": "MIT", "scripts": { "precompile": "rimraf dist && bun run verify", @@ -19,7 +19,7 @@ "generateClones": "bun ./src/scripts/icons/generateClones.ts", "lint": "biome check --write ./src", "format": "biome format --write ./src", - "preversion": "bun run contributors && bun run preview && bun run svgo && git add images/{contributors,fileIcons,folderIcons}.png icons/*.svg", + "preversion": "bun run contributors && bun run preview && bun run svgo && git add images/*.png icons/*.svg", "preview": "bun ./src/scripts/preview/run.ts", "svgo": "svgo -i icons -o icons -q", "test": "bun test", diff --git a/src/core/icons/fileIcons.ts b/src/core/icons/fileIcons.ts index 064ff81f83..d0eb0a2fa5 100644 --- a/src/core/icons/fileIcons.ts +++ b/src/core/icons/fileIcons.ts @@ -266,6 +266,7 @@ export const fileIcons: FileIcons = { '.yardopts', 'manifest.mf', '.clang-format', + '.clang-format-ignore', '.clang-tidy', '.conf', ], @@ -1727,7 +1728,25 @@ export const fileIcons: FileIcons = { { name: 'svelte', fileExtensions: ['svelte'], - fileNames: ['svelte.config.js', 'svelte.config.cjs'], + patterns: { + 'svelte.config': FileNamePattern.Ecmascript, + }, + }, + { + name: 'svelte_js', + fileExtensions: ['svelte.js'], + clone: { + base: 'svelte', + color: 'amber-400', + }, + }, + { + name: 'svelte_ts', + fileExtensions: ['svelte.ts'], + clone: { + base: 'svelte', + color: 'light-blue-700', + }, }, { name: 'vim', @@ -2047,7 +2066,16 @@ export const fileIcons: FileIcons = { { name: 'grain', fileExtensions: ['gr'] }, { name: 'lolcode', fileExtensions: ['lol'] }, { name: 'idris', fileExtensions: ['idr', 'ibc'] }, - { name: 'quasar', fileNames: ['quasar.conf.js', 'quasar.config.js'] }, + { + name: 'quasar', + fileNames: [ + 'quasar.conf.js', + 'quasar.config.js', + 'quasar.conf.ts', + 'quasar.config.ts', + 'quasar.config.cjs', + ], + }, { name: 'dependabot', fileNames: ['dependabot.yml', 'dependabot.yaml'] }, { name: 'pipeline', fileExtensions: ['pipeline'] }, { @@ -2606,5 +2634,44 @@ export const fileIcons: FileIcons = { name: 'gemini-ai', fileNames: ['.aiexclude'], }, + { + name: 'taze', + patterns: { + 'taze.config': FileNamePattern.Ecmascript, + }, + }, + { + name: 'wxt', + patterns: { + 'wxt.config': FileNamePattern.Ecmascript, + }, + }, + { + name: 'sway', + fileExtensions: ['sw'], + }, + { + name: 'lefthook', + fileNames: [ + '.lefthook-local.json', + '.lefthook-local.toml', + '.lefthook-local.yaml', + '.lefthook-local.yml', + '.lefthook.json', + '.lefthook.toml', + '.lefthook.yaml', + '.lefthook.yml', + '.lefthookrc', + 'lefthook-local.json', + 'lefthook-local.toml', + 'lefthook-local.yaml', + 'lefthook-local.yml', + 'lefthook.json', + 'lefthook.toml', + 'lefthook.yaml', + 'lefthook.yml', + 'lefthookrc', + ], + }, ]), }; diff --git a/src/core/icons/folderIcons.ts b/src/core/icons/folderIcons.ts index ad21213fe7..6ba91cc45e 100644 --- a/src/core/icons/folderIcons.ts +++ b/src/core/icons/folderIcons.ts @@ -920,6 +920,15 @@ export const folderIcons: FolderTheme[] = [ }, { name: 'folder-flutter', folderNames: ['flutter'] }, { name: 'folder-snippet', folderNames: ['snippet', 'snippets'] }, + { + name: 'folder-src-tauri', + folderNames: ['src-tauri'], + }, + { + name: 'folder-favicon', + folderNames: ['favicon', 'favicons'], + }, + { name: 'folder-lefthook', folderNames: ['lefthook', 'lefthook-local'] }, ], }, { diff --git a/src/scripts/module/prepare.ts b/src/scripts/module/prepare.ts index 3486636734..efd506e338 100644 --- a/src/scripts/module/prepare.ts +++ b/src/scripts/module/prepare.ts @@ -9,6 +9,7 @@ import { spawn } from 'bun'; */ const prepareModule = async () => { try { + // Set the main field in the package.json to the correct path const setMain = spawn([ 'npm', 'pkg', @@ -17,6 +18,10 @@ const prepareModule = async () => { ]); await setMain; + // Remove vscode specific fields from package.json + const removeBrowser = spawn(['npm', 'pkg', 'delete', 'browser']); + await removeBrowser; + //copy readme into root directory const readmePath = join(process.cwd(), 'src', 'module', 'README.md'); console.log('Copying README.md to root directory...');