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: jstransformers/jstransformer-scss
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8247e5f4a50c5a2495996e8d433e826159ed5985
Choose a base ref
...
head repository: jstransformers/jstransformer-scss
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 75494d92d93faa713ae5552b2ba1ec5df4596cd2
Choose a head ref

Commits on Apr 29, 2017

  1. Copy the full SHA
    d415498 View commit details
  2. Copy the full SHA
    bee5afe View commit details

Commits on Nov 28, 2017

  1. Copy the full SHA
    16b3a61 View commit details

Commits on Dec 16, 2017

  1. Merge pull request #48 from jstransformers/boilerplate/node-9

    Add Node.js 9 support on Travis
    RobLoach authored Dec 16, 2017
    Copy the full SHA
    cfe5a28 View commit details

Commits on Feb 14, 2018

  1. Copy the full SHA
    6e73390 View commit details
  2. Copy the full SHA
    89e096b View commit details

Commits on Feb 15, 2018

  1. Update Dependencies

    RobLoach committed Feb 15, 2018
    Copy the full SHA
    385ee67 View commit details

Commits on Apr 9, 2018

  1. Copy the full SHA
    3f5eaeb View commit details
  2. Update README.md

    RobLoach authored Apr 9, 2018
    Copy the full SHA
    b48f72e View commit details
  3. Merge pull request #14 from jstransformers/greenkeeper/initial

    Update dependencies to enable Greenkeeper 🌴
    RobLoach authored Apr 9, 2018
    Copy the full SHA
    293c393 View commit details

Commits on Apr 13, 2018

  1. Copy the full SHA
    cc9968c View commit details

Commits on Apr 16, 2018

  1. boilerplate: Remove Travis testing of Node.js 4

    Node.js 4 End-of-life is 2018-04-30. We will be removing Travis testing for this release.
    
    https://github.com/nodejs/Release
    RobLoach authored Apr 16, 2018
    Copy the full SHA
    3dbf0c8 View commit details

Commits on Apr 17, 2018

  1. Merge pull request #51 from jstransformers/travis-email

    boilerplate: Disable email notifications
    RobLoach authored Apr 17, 2018
    Copy the full SHA
    c0add60 View commit details
  2. Copy the full SHA
    2df4574 View commit details

Commits on Apr 27, 2018

  1. Copy the full SHA
    2ec8b9a View commit details

Commits on May 1, 2018

  1. Merge pull request #52 from jstransformers/travis-node-4

    test: Removed Travis Node.js 4, add Node.js 10
    RobLoach authored May 1, 2018
    Copy the full SHA
    1e218bd View commit details

Commits on May 24, 2018

  1. Copy the full SHA
    2886dd2 View commit details

Commits on Oct 4, 2018

  1. travis: Remove Node 6

    RobLoach authored Oct 4, 2018
    Copy the full SHA
    3719e69 View commit details

Commits on Jan 10, 2019

  1. Copy the full SHA
    45ee51d View commit details

Commits on Jan 14, 2019

  1. travis: Add Node.js 11

    RobLoach authored Jan 14, 2019
    Copy the full SHA
    dbb903a View commit details

Commits on Jan 16, 2019

  1. Merge pull request #55 from jstransformers/travis-node-11

    travis: Add Node.js 11
    RobLoach authored Jan 16, 2019
    Copy the full SHA
    900829e View commit details

Commits on Feb 12, 2019

  1. Merge pull request #54 from jstransformers/codecov

    Remove CodeCoverage
    RobLoach authored Feb 12, 2019
    Copy the full SHA
    2ecbb00 View commit details

Commits on Apr 7, 2019

  1. Copy the full SHA
    8abb790 View commit details

Commits on Apr 13, 2019

  1. Merge pull request #57 from jstransformers/boilerplate/node-7-deprecate

    boilerplate: Remove testing of Node.js 7
    RobLoach authored Apr 13, 2019
    Copy the full SHA
    068e3d3 View commit details

Commits on May 3, 2019

  1. Copy the full SHA
    cd40bce View commit details

Commits on May 4, 2019

  1. Merge pull request #58 from jstransformers/boilerplate/node-12

    boilerplate: Add Node.js 12 testing
    RobLoach authored May 4, 2019
    Copy the full SHA
    cc57e8b View commit details

Commits on Sep 29, 2019

  1. Copy the full SHA
    ddb51ea View commit details

Commits on Dec 16, 2019

  1. Update package.json

    Attempting to switch over to "sass" from "node-sass". The reason being is we need a more portable sass runtime. Specifically on Alpine Linux, where we're experimenting with running our application on a Docker container.
    ispyhumanfly authored Dec 16, 2019
    Copy the full SHA
    b9f9d51 View commit details
  2. Update index.js

    After a quick review, it appears we can simply switch out node-sass with "sass", as its syntax for render functions seems to be 1:1.
    ispyhumanfly authored Dec 16, 2019
    Copy the full SHA
    0f07b2d View commit details

Commits on Jan 14, 2020

  1. Using sass instead of node-sass as this is the trend right now. Updat…

    …ed to sass 1.24.4, the most recent version.
    ispyhumanfly committed Jan 14, 2020
    Copy the full SHA
    42ba823 View commit details
  2. Copy the full SHA
    51c1fe8 View commit details
  3. Copy the full SHA
    11e44c1 View commit details
  4. Import test passing. indentation test is not. ABSOLUTELY NO IDEA WHY.…

    … I've even verified using the sass cli and it passes. Extremely odd behavior with this testit framework which NO ONE USES anyway.
    ispyhumanfly committed Jan 14, 2020
    Copy the full SHA
    c2775d1 View commit details

Commits on Apr 26, 2020

  1. Copy the full SHA
    b3403e2 View commit details

Commits on Jun 28, 2022

  1. Update to modern SASS

    RobLoach committed Jun 28, 2022
    Copy the full SHA
    507da44 View commit details
  2. Merge pull request #38 from jstransformers/update-to-sass

    Update to SASS
    RobLoach authored Jun 28, 2022
    Copy the full SHA
    75494d9 View commit details
Showing with 43 additions and 40 deletions.
  1. +5 −10 .travis.yml
  2. +4 −0 HISTORY.md
  3. +0 −1 README.md
  4. +5 −3 index.js
  5. +5 −6 package.json
  6. +8 −6 test/import/expected.css
  7. +6 −5 test/indentedSyntax/expected.css
  8. +1 −3 test/indentedSyntax/input.sass
  9. +6 −5 test/scss/expected.css
  10. +3 −1 test/scss/input.scss
15 changes: 5 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -2,19 +2,14 @@ language: node_js
sudo: false

node_js:
- "4"
- "6"
- "7"
- "8"

after_success:
- npm run coverage
- npm i codecov
- codecov -f coverage/coverage.json
- "9"
- "10"
- "11"
- "12"

notifications:
email:
on_success: never
email: false

cache:
directories:
4 changes: 4 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## v2.0.0: 2022-06-28

- Move to modern SASS ([#25](https://github.com/jstransformers/jstransformer-scss/pull/25) by [@ispyhumanfly](https://github.com/ispyhumanfly))

## v1.0.0: 2017-09-18

- Updated Boilerplate
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@
[![Build Status](https://img.shields.io/travis/jstransformers/jstransformer-scss/master.svg)](https://travis-ci.org/jstransformers/jstransformer-scss)
[![Coverage Status](https://img.shields.io/codecov/c/github/jstransformers/jstransformer-scss/master.svg)](https://codecov.io/gh/jstransformers/jstransformer-scss)
[![Dependency Status](https://img.shields.io/david/jstransformers/jstransformer-scss/master.svg)](http://david-dm.org/jstransformers/jstransformer-scss)
[![Greenkeeper badge](https://badges.greenkeeper.io/jstransformers/jstransformer-scss.svg)](https://greenkeeper.io/)
[![NPM version](https://img.shields.io/npm/v/jstransformer-scss.svg)](https://www.npmjs.org/package/jstransformer-scss)

## Installation
8 changes: 5 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
'use strict'

const path = require('path')
const sass = require('node-sass')
const sass = require('sass')
const extend = require('extend-shallow')

exports.name = 'scss'
exports.outputFormat = 'css'

exports.render = function (str, options) {
const input = extend({}, options, {data: str})
// TODO: Replace with sass.compileString()
const out = sass.renderSync(input)
return {
body: out.css.toString(),
@@ -21,6 +20,7 @@ exports.render = function (str, options) {
exports.renderAsync = function (str, options) {
const input = extend({}, options, {data: str})
return new Promise((resolve, reject) => {
// TODO: Replace with sass.compileStringAsync()
sass.render(input, (err, out) => {
if (err) {
return reject(err)
@@ -40,6 +40,7 @@ exports.renderFile = function (filename, options) {
const input = extend({}, options, {
file: path.resolve(filename)
})
// TODO: Replace with sass.compile()
const out = sass.renderSync(input)
return {
body: out.css.toString(),
@@ -54,6 +55,7 @@ exports.renderFile = function (filename, options) {
exports.renderFileAsync = function (filename, options) {
const input = extend({}, options, {file: path.resolve(filename)})
return new Promise((resolve, reject) => {
// TODO: Replace with sass.compileAsync()
sass.render(input, (err, out) => {
if (err) {
return reject(err)
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"dependencies": {
"extend-shallow": "^2.0.1",
"node-sass": "^4.0.0"
"extend-shallow": "^3.0.2",
"sass": "~1.53.0"
},
"name": "jstransformer-scss",
"version": "1.0.0",
"version": "2.0.0",
"description": "SCSS support for JSTransformers",
"keywords": [
"jstransformer"
@@ -13,13 +13,12 @@
"index.js"
],
"devDependencies": {
"test-jstransformer": "^1.0.0",
"test-jstransformer": "^1.1.0",
"xo": "*"
},
"scripts": {
"coverage": "test-jstransformer coverage",
"test": "test-jstransformer",
"posttest": "xo --space --no-semicolon index.js"
"coverage": "test-jstransformer coverage"
},
"engines": {
"node": ">=4"
14 changes: 8 additions & 6 deletions test/import/expected.css
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
nav ul {
margin: 0;
padding: 0;
list-style: none; }

list-style: none;
}
nav li {
display: inline-block; }

display: inline-block;
}
nav a {
display: block;
padding: 6px 12px;
text-decoration: none; }
text-decoration: none;
}

body {
font: 100% Helvetica, sans-serif;
background-color: #efefef; }
background-color: #efefef;
}
11 changes: 6 additions & 5 deletions test/indentedSyntax/expected.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
nav ul {
margin: 0;
padding: 0;
list-style: none; }

list-style: none;
}
nav li {
display: inline-block; }

display: inline-block;
}
nav a {
display: block;
padding: 6px 12px;
text-decoration: none; }
text-decoration: none;
}
4 changes: 1 addition & 3 deletions test/indentedSyntax/input.sass
Original file line number Diff line number Diff line change
@@ -3,11 +3,9 @@ nav
margin: 0
padding: 0
list-style: none

li
display: inline-block

a
display: block
padding: 6px 12px
text-decoration: none
text-decoration: none
11 changes: 6 additions & 5 deletions test/scss/expected.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
nav ul {
margin: 0;
padding: 0;
list-style: none; }

list-style: none;
}
nav li {
display: inline-block; }

display: inline-block;
}
nav a {
display: block;
padding: 6px 12px;
text-decoration: none; }
text-decoration: none;
}
4 changes: 3 additions & 1 deletion test/scss/input.scss
Original file line number Diff line number Diff line change
@@ -5,7 +5,9 @@ nav {
list-style: none;
}

li { display: inline-block; }
li {
display: inline-block;
}

a {
display: block;