Skip to content

Commit

Permalink
Fixed testing, added new tests (+ formatting) - PR#373 from glenn2223
Browse files Browse the repository at this point in the history
### Updated

-   `fdir` to `6.4.0` [Changelog][cl:fd]
-   `sass-embedded` to `1.79.4` [Changelog][cl:se]
-   Various dev dependency updates _(nothing user facing)_

### Other

-   Fixed broken tests and added added several new tests
-   Added test badge to README
-   Code formatting and linting

[cl:fd]: https://github.com/thecodrr/fdir/releases
[cl:se]: https://github.com/sass/embedded-host-node/blob/main/CHANGELOG.md
  • Loading branch information
glenn2223 authored Oct 18, 2024
2 parents 87b33f5 + 94ce36e commit e2d6ac7
Show file tree
Hide file tree
Showing 27 changed files with 1,966 additions and 1,018 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Tests

on:
pull_request:
branches:
- "**"

# ALLOW MANUAL RUNS
workflow_dispatch:

jobs:
build:
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 20.x

- name: Install the package dependencies
run: npm ci

- name: Test extension
if: runner.os == 'Linux'
run: xvfb-run -a npm test

- name: Test extension
if: runner.os != 'Linux'
run: npm test

- name: Ensure prePublish script is working
if: runner.os != 'Linux'
run: npm run vscode:prepublish

- name: Ensure prePublish script is working
if: runner.os == 'Linux'
run: xvfb-run -a npm run vscode:prepublish
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,8 @@ Gemfile.lock
Gemfile
.vscode-test
.vscode/*.dict
*.vsix
*.vsix

#Ignore test output (but not the SASS files)
src/test/sample/*
!src/test/sample/*.scss
3 changes: 2 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"tabWidth": 4,
"useTabs": false
"useTabs": false,
"printWidth": 80
}
12 changes: 6 additions & 6 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
],
"sourceMaps": true,
"outFiles": [
"${workspaceRoot}/out/src/**/*.js"
"${workspaceRoot}/**/*.{t,j}s"
],
"preLaunchTask": "pack"
"preLaunchTask": "npm: vscode:prepublish"
},
{
"name": "Launch Tests",
Expand All @@ -23,14 +23,14 @@
"runtimeExecutable": "${execPath}",
"args": [
"--extensionDevelopmentPath=${workspaceRoot}",
"--extensionTestsPath=${workspaceRoot}/out/test/index",
"./assets/"
"--extensionTestsPath=${workspaceRoot}/out/test",
"${workspaceRoot}/src/test/sample"
],
"sourceMaps": true,
"preLaunchTask": "npm: pretest",
"outFiles": [
"${workspaceRoot}/out/test/**/*.js"
"${workspaceRoot}/**/*.{t,j}s"
],
"preLaunchTask": "npm: pretest"
}
]
}
11 changes: 10 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,14 @@
"[NoFormat]": {
"editor.formatOnPaste": false,
"editor.formatOnSave": false
},
"explorer.fileNesting.enabled": true,
"explorer.fileNesting.patterns": {
"*.ts": "${capture}.js, ${capture}.test.ts",
"*.js": "${capture}.js.map, ${capture}.min.js, ${capture}.d.ts",
"*.jsx": "${capture}.js",
"*.tsx": "${capture}.ts",
"tsconfig.json": "tsconfig.*.json",
"package.json": "package-lock.json, yarn.lock, pnpm-lock.yaml, bun.lockb"
}
}
}
3 changes: 1 addition & 2 deletions .vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ assets/**
dist/**
images/Screenshot/**
node_modules/**
out/announcement/**
out/test/**
out/**
src/**

**/*.map
Expand Down
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,22 @@ All notable changes to this project will be documented in this file.

### Changed

- Switched from `[email protected]` to `[email protected].3` - as mentioned above
- Switched from `[email protected]` to `[email protected].4` - as mentioned above

### Updated

- `autoprefixer` to `10.4.20` [Changelog][cl:fd]
- `fdir` to `6.3.0` [Changelog][cl:fd]
- `fdir` to `6.4.0` [Changelog][cl:fd]
- `picomatch` to `4.0.2` [Changelog][cl:pm]
- `postcss` to `8.4.47` [Changelog][cl:pc]
- Various dev dependency updates _(nothing user facing)_

### Other

- Fixed broken tests and added added several new tests
- Added test badge to README
- Code formatting and linting

## [6.1.2] - 2023-11-22

<small>[Compare to previous release][comp:6.1.2]</small>
Expand Down Expand Up @@ -843,3 +849,4 @@ All notable changes to this project will be documented in this file.
[cl:pc]: https://github.com/postcss/postcss/blob/main/CHANGELOG.md
[cl:pm]: https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md
[cl:sa]: https://github.com/sass/dart-sass/blob/main/CHANGELOG.md
[cl:se]: https://github.com/sass/embedded-host-node/blob/main/CHANGELOG.md
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Live Sass Compiler

[![VSCode Marketplace Badge](https://img.shields.io/vscode-marketplace/v/glenn2223.live-sass.svg?label=VSCode%20Marketplace&style=flat-square)](https://marketplace.visualstudio.com/items?itemName=glenn2223.live-sass) [![Total Install](https://img.shields.io/vscode-marketplace/d/glenn2223.live-sass.svg?style=flat-square)](https://marketplace.visualstudio.com/items?itemName=glenn2223.live-sass) [![Average Rating Badge](https://img.shields.io/vscode-marketplace/r/glenn2223.live-sass.svg?style=flat-square)](https://marketplace.visualstudio.com/items?itemName=glenn2223.live-sass) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://github.com/glenn2223/vscode-live-sass-compiler/)
[![Icon for GitHub actions workflow status](https://img.shields.io/github/actions/workflow/status/glenn2223/vscode-live-sass-compiler/test.yml?style=for-the-badge&label=Test)](https://github.com/glenn2223/vscode-live-sass-compiler/actions/workflows/test.yml)
[![VSCode Marketplace Badge](https://img.shields.io/vscode-marketplace/v/glenn2223.live-sass.svg?label=VSCode%20Marketplace&style=flat-square)](https://marketplace.visualstudio.com/items?itemName=glenn2223.live-sass)
[![Total Install](https://img.shields.io/vscode-marketplace/d/glenn2223.live-sass.svg?style=flat-square)](https://marketplace.visualstudio.com/items?itemName=glenn2223.live-sass)
[![Average Rating Badge](https://img.shields.io/vscode-marketplace/r/glenn2223.live-sass.svg?style=flat-square)](https://marketplace.visualstudio.com/items?itemName=glenn2223.live-sass)
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://github.com/glenn2223/vscode-live-sass-compiler/)

[<img align="right" style="width:50%" src="./images/thumbnail-quick-guide.png" title="Watch the YouTube video">](https://youtu.be/9J__JAgQbS0)

Expand Down
Loading

0 comments on commit e2d6ac7

Please sign in to comment.