Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: postcss/postcss-scss
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4.0.2
Choose a base ref
...
head repository: postcss/postcss-scss
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4.0.3
Choose a head ref
  • 4 commits
  • 11 files changed
  • 2 contributors

Commits on Jan 10, 2022

  1. Fix incorrect generic type parameter (#135)

    The introduction of the `Document` type [in this PR](postcss/postcss#1498) incorrectly advertises that `parse` can return a `Document` object.
    dmisdm authored Jan 10, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3986614 View commit details
  2. Copy the full SHA
    d7b080b View commit details
  3. Clean dependencies and configs

    ai committed Jan 10, 2022
    Copy the full SHA
    68d3910 View commit details
  4. Release 4.0.3 version

    ai committed Jan 10, 2022
    Copy the full SHA
    96b2743 View commit details
Showing with 1,628 additions and 4,642 deletions.
  1. +14 −6 .github/workflows/test.yml
  2. +0 −1 .gitignore
  3. +0 −4 .npmignore
  4. +3 −0 CHANGELOG.md
  5. +1 −1 lib/scss-syntax.d.ts
  6. +11 −38 package.json
  7. +1,446 −0 pnpm-lock.yaml
  8. +117 −113 test/parse.test.js
  9. +20 −16 test/stringify.test.js
  10. +16 −12 test/tokenize.test.js
  11. +0 −4,451 yarn.lock
20 changes: 14 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -9,15 +9,19 @@ jobs:
steps:
- name: Checkout the repository
uses: actions/checkout@v2
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: latest
- name: Install Node.js
uses: actions/setup-node@v2
with:
node-version: 17
cache: yarn
cache: pnpm
- name: Install dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile --ignore-scripts
- name: Run tests
run: yarn test
run: pnpm test
env:
FORCE_COLOR: 2
short:
@@ -32,14 +36,18 @@ jobs:
steps:
- name: Checkout the repository
uses: actions/checkout@v2
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: latest
- name: Install Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: yarn
cache: pnpm
- name: Install dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile --ignore-scripts
- name: Run unit tests
run: npx jest
run: pnpm unit
env:
FORCE_COLOR: 2
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
node_modules/
yarn-error.log
4 changes: 0 additions & 4 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
yarn-error.log
yarn.lock

test/
.github/
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Change Log
This project adheres to [Semantic Versioning](http://semver.org/).

## 4.0.3
* Fixes types (by Daniel Manning).

## 4.0.2
* Fixed at-rules with interpolated parsing (by Natalie Weizenbaum).

2 changes: 1 addition & 1 deletion lib/scss-syntax.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as postcss from 'postcss';

export const parse: postcss.Parser;
export const parse: postcss.Parser<postcss.Root>;
export const stringify: postcss.Stringifier;
49 changes: 11 additions & 38 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "postcss-scss",
"version": "4.0.2",
"version": "4.0.3",
"description": "SCSS parser for PostCSS",
"keywords": [
"css",
@@ -26,7 +26,8 @@
"./package.json": "./package.json"
},
"scripts": {
"test": "jest && eslint . && ./test/integration.js"
"unit": "uvu . '\\.test\\.js$'",
"test": "pnpm unit && eslint . && ./test/integration.js"
},
"funding": {
"type": "opencollective",
@@ -36,27 +37,17 @@
"postcss": "^8.3.3"
},
"devDependencies": {
"@logux/eslint-config": "^46.0.1",
"clean-publish": "^3.4.2",
"eslint": "^8.1.0",
"@logux/eslint-config": "^46.1.1",
"clean-publish": "^3.4.5",
"eslint": "^8.6.0",
"eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-jest": "^25.2.2",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prefer-let": "^3.0.0",
"eslint-plugin-promise": "^5.1.1",
"eslint-plugin-security": "^1.4.0",
"eslint-plugin-unicorn": "^37.0.1",
"jest": "^27.3.1",
"lint-staged": "^11.2.6",
"postcss": "^8.3.11",
"eslint-plugin-prefer-let": "^3.0.1",
"eslint-plugin-promise": "^6.0.0",
"postcss": "^8.4.5",
"postcss-parser-tests": "^8.3.7",
"postcss-sharec-config": "^0.5.2",
"prettier": "^2.4.1",
"simple-git-hooks": "^2.7.0"
},
"simple-git-hooks": {
"pre-commit": "npx lint-staged"
"uvu": "^0.5.3"
},
"prettier": {
"arrowParens": "avoid",
@@ -66,31 +57,13 @@
"singleQuote": true,
"trailingComma": "none"
},
"lint-staged": {
"*.js": [
"prettier --write",
"eslint --fix"
]
},
"eslintConfig": {
"extends": "@logux/eslint-config",
"rules": {
"consistent-return": "off"
}
},
"jest": {
"testEnvironment": "node",
"coverageThreshold": {
"global": {
"statements": 100
}
}
},
"clean-publish": {
"cleanDocs": true
},
"sharec": {
"config": "postcss-sharec-config",
"version": "0.5.2"
}
}
Loading