Skip to content

Commit

Permalink
Merge branch 'main' into feat/tanstack-router
Browse files Browse the repository at this point in the history
  • Loading branch information
okineadev authored Nov 6, 2024
2 parents f92cd45 + fa53001 commit 25d780d
Show file tree
Hide file tree
Showing 992 changed files with 3,819 additions and 1,829 deletions.
1 change: 1 addition & 0 deletions .bun-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.1.34
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# See https://git-scm.com/docs/gitattributes#_pattern_format for more about `.gitattributes`.

# Normalize EOL for all files that Git considers text files
* text=auto eol=lf

Expand Down
3 changes: 2 additions & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# These are supported funding model platforms
github: [pkief]
custom: ['https://paypal.me/philippkief', 'https://buymeacoffee.com/pkief']
buy_me_a_coffee: pkief
custom: ['https://paypal.me/philippkief']
59 changes: 59 additions & 0 deletions .github/ISSUE_TEMPLATE/1-icon-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: 🏞️ Icon Request
description: Ask for specific icons to be added
title: "[Icon Request]: <icon_name>"
labels: ["icon-request"]

body:
- type: checkboxes
id: icon-type
attributes:
label: Icon Type
description: What type of icon are you requesting?
options:
- label: Folder
- label: File

- 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
- ...
- 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
- ...
- 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

- 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 ...

- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our [Code of Conduct](../../CODE_OF_CONDUCT.md).
options:
- label: I agree to follow this project's **Code of Conduct**
required: true
78 changes: 78 additions & 0 deletions .github/ISSUE_TEMPLATE/2-bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: πŸ› Bug Report
description: Create a report to help us improve
title: "[Bug]: "
labels: ["bug"]

body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: textarea
id: description
attributes:
label: Describe the bug
description: Provide a detailed description of the bug
validations:
required: true

- type: textarea
id: reproduce
attributes:
label: To Reproduce
description: Steps to reproduce the behavior
placeholder: |
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
validations:
required: true

- type: textarea
id: expected
attributes:
label: Expected behavior
description: What you expected to happen
validations:
required: true

- type: textarea
id: screenshots
attributes:
label: Screenshots
description: Add screenshots if applicable
validations:
required: false

- type: textarea
id: computer-info
attributes:
label: Computer information
description: |
Examples:
- **OS edition**: [e.g. Windows 11 Home]
- **Extension version**: [e.g. 5.6.0]
- **VSCode version**: [e.g. 1.91.1]
value: |
- **OS edition**:
- **Extension version**:
- **VSCode version**:
- type: textarea
id: additional-context
attributes:
label: Additional context
description: Additional context about the problem.
validations:
required: false

- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our [Code of Conduct](../../CODE_OF_CONDUCT.md).
options:
- label: I agree to follow this project's **Code of Conduct**
required: true
41 changes: 0 additions & 41 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

32 changes: 0 additions & 32 deletions .github/ISSUE_TEMPLATE/icon_request.md

This file was deleted.

8 changes: 0 additions & 8 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md

This file was deleted.

22 changes: 22 additions & 0 deletions .github/copilot-instructions.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Copilot instructions

To contribute effectively to this project, follow these guidelines:

1. **Follow the project style**: Ensure all changes adhere to the existing code and documentation style. Review the [project's codebase](/) to understand the conventions used.
2. **Use Material Design color palette**: When working with icons, use colors from the [Material Design color palette](/material-colors.yml). This ensures visual consistency across the project.
3. **Adhere to the project architecture**: Familiarize yourself with the [project's architecture](/src/architecture.md). The core logic is separated from the extension logic. The core handles icon manifest generation, icon associations, and translation. The extension interacts with the VS Code API. Make sure to respect the dependency rules between modules.
4. **Design pixel-perfect icons**: Create icons that are sharp and clear at 16x16 pixels. Align icons to a **16x16 grid** to ensure sharpness and avoid blurriness. More details are available in the [CONTRIBUTING.md](/CONTRIBUTING.md#pixel-perfect-icons).
5. **Write clean, modular, and well-documented code**: Document your code thoroughly and ensure it is easy to understand and maintain.
6. **Test your changes**: Always test your changes to ensure they do not break existing functionality.
7. **Keep it simple**: Aim for simplicity in your solutions and avoid unnecessary complexity.
8. **Add new icons appropriately**:

- Use colors from the [Material Design color palette](https://material.io/design/color/the-color-system.html).
- Ensure icons have proper spacing (Read [CONTRIBUTING.md](/CONTRIBUTING.md#icon-spacing)).
- Assign icons uniquely to file names, extensions, or folder names according to the [project guidelines](/CONTRIBUTING.md).
- Provide separate icons for different color themes if necessary (Read [CONTRIBUTING.md](/CONTRIBUTING.md#icons-for-color-themes)).

9. **Clone existing icons when possible**: If you need a variant of an existing icon with a different color, clone the icon through configuration without creating a new SVG (Read [CONTRIBUTING.md](/CONTRIBUTING.md#icon-cloning)).
10. **Contribute to translations**: If you notice errors in translations, you can help fix them by editing the appropriate translation files (`package.nls*.json`).

Always ensure that your contributions comply with the project's guidelines and do not introduce any disallowed content.
18 changes: 0 additions & 18 deletions .github/dependabot.yml

This file was deleted.

24 changes: 24 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Add 'icons' label to any file changes within 'icons' folder or 'src/core/icons' typescript files
icons:
- changed-files:
- any-glob-to-any-file: ['icons/*', 'src/core/icons/*.ts']

# Add 'translations' label to any changes within 'package.nls*.json' files or 'src/core/i18n' folder
translations:
- changed-files:
- any-glob-to-any-file: ['package.nls*.json', 'src/core/i18n']

# Add 'docs' label to any changes to markdown files
docs:
- changed-files:
- any-glob-to-any-file: '*.md'

# Add 'workflows' label to any changes within '.github/workflows' folder or '.github/labeler.yml' file
workflows:
- changed-files:
- any-glob-to-any-file: ['.github/workflows/*', '.github/labeler.yml']

# Add 'devcontainers' label to any changes within '.devcontainer' folder
devcontainers:
- changed-files:
- any-glob-to-any-file: '.devcontainer/*'
8 changes: 8 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Description

<!-- Please describe in a short sentence or bullet points what changes you have made. -->

## Contribution Guidelines

- [ ] By creating this pull request, I acknowledge that I have read the [Contribution Guidelines](https://github.com/material-extensions/vscode-material-icon-theme/blob/main/CONTRIBUTING.md) for this project
- [ ] I have read the [Code Of Conduct](https://github.com/material-extensions/vscode-material-icon-theme/blob/main/CODE_OF_CONDUCT.md) and promise to abide by these rules
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build + Test
name: πŸ› οΈ Build + Test

on:
push:
Expand All @@ -14,20 +14,20 @@ jobs:
name: Build Material Icon Theme

steps:
- name: Checkout πŸ›Ž
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: πŸ“₯ Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false

- name: Setup Platform πŸ› 
uses: oven-sh/setup-bun@123c6c4e2fea3eb7bffaa91a85eb6b3d505bf7af # v2
- name: πŸ”§ Setup Bun
uses: oven-sh/setup-bun@4bc047ad259df6fc24a6c9b0f9a0cb08cf17fbe5 # v2
with:
bun-version: 1.1.18
bun-version-file: ".bun-version"

- name: Install dependencies πŸ“¦
- name: πŸ“¦ Install dependencies
run: bun install --frozen-lockfile

- name: Test + Build πŸš€
- name: πŸš€ Test + Build
run: |
bun test
bun run vscode:prepublish
11 changes: 5 additions & 6 deletions .github/workflows/color-check.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Check SVG icon colors
name: 🎨 Check SVG icon colors

on:
pull_request:
paths:
- 'icons/*.svg'
- "icons/*.svg"

permissions:
contents: read
Expand All @@ -16,13 +16,12 @@ jobs:
TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}

steps:
- name: Checkout πŸ›ŽοΈ
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: πŸ“₯ Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
persist-credentials: false

- name: Check colors 🎨
- name: 🎨 Check colors
run: |
svgFiles=$(git diff origin/${{ env.TARGET_BRANCH }} --diff-filter=ACMRTUX --name-only | grep '.svg$')
npx svg-color-linter --colors material-colors.yml ${svgFiles}
Loading

0 comments on commit 25d780d

Please sign in to comment.