Skip to content

Commit

Permalink
Merge pull request #23 from apostrophecms/pro-6570-sass-warning
Browse files Browse the repository at this point in the history
Pro 6570 sass warning
  • Loading branch information
haroun authored Sep 12, 2024
2 parents 6bfa271 + 0c54cb6 commit e4a4faf
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 4 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# This is a basic workflow to help you get started with Actions

name: tests

# Controls when the action will run.
on:
push:
branches: [ "main" ]
pull_request:
branches: [ '*' ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18, 20, 22]

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Git checkout
uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- run: npm install

- run: npm test
env:
CI: true
2 changes: 1 addition & 1 deletion .stylelintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@
"disableFix": true
}
],
"scss/at-import-partial-extension": "never",
"scss/at-mixin-named-arguments": [
"always",
{ "ignore": ["single-argument"] }
Expand All @@ -244,6 +243,7 @@
}
],
"scss/dollar-variable-pattern": "^([a-z][a-z0-9]*)(-[a-z0-9]+)*$",
"scss/load-partial-extension": "never",
"scss/no-duplicate-mixins": true
},
"overrides": [
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## UNRELEASED

### Changed

* Replace deprecated `at-import-partial-extension` with `load-partial-extension`.

## 4.1.0 (2024-06-12)

### Added
Expand Down
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
"scripts": {
"compare": "node ./lib/index",
"eslint": "npx eslint .",
"lint": "npm run eslint && npm run stylelint",
"pretest": "npm run lint",
"stylelint": "npx stylelint 'test/*.scss' --config .stylelintrc.json",
"test": "npx mocha"
},
Expand Down Expand Up @@ -33,9 +35,9 @@
"eslint": "^8.39.0",
"eslint-config-apostrophe": "^4.0.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-n": "^17.10.2",
"eslint-plugin-promise": "^6.1.1",
"mocha": "^10.2.0",
"postcss-scss": "^4.0.9"
}
}
}
2 changes: 1 addition & 1 deletion test/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ html {
font-size: 1rem;
}

@media (min-width: 320px) {
@media (320px < min-width) {
.one {
color: $grey;
}
Expand Down

0 comments on commit e4a4faf

Please sign in to comment.