Skip to content

Commit

Permalink
Merge branch 'main' into vhs-icon
Browse files Browse the repository at this point in the history
  • Loading branch information
Okinea Dev authored Sep 22, 2024
2 parents ebd15fe + 377523e commit 2eedd67
Show file tree
Hide file tree
Showing 21 changed files with 134 additions and 18 deletions.
12 changes: 3 additions & 9 deletions .github/ISSUE_TEMPLATE/1-icon-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,50 +8,44 @@ 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
attributes:
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
attributes:
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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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'
Expand Down
33 changes: 33 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions icons/folder-favicon-open.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/folder-favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/folder-lefthook-open.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/folder-lefthook.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/folder-src-tauri-open.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/folder-src-tauri.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions icons/freemarker.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/lefthook.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/sway.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/taze.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/wxt.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/contributors.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/fileIcons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/folderIcons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
71 changes: 69 additions & 2 deletions src/core/icons/fileIcons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@ export const fileIcons: FileIcons = {
'.yardopts',
'manifest.mf',
'.clang-format',
'.clang-format-ignore',
'.clang-tidy',
'.conf',
],
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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'] },
{
Expand Down Expand Up @@ -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',
],
},
]),
};
9 changes: 9 additions & 0 deletions src/core/icons/folderIcons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'] },
],
},
{
Expand Down
5 changes: 5 additions & 0 deletions src/scripts/module/prepare.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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...');
Expand Down

0 comments on commit 2eedd67

Please sign in to comment.