From df11f7fe646597e8e50b93d9bcb14eb8b5ab3b9a Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Sun, 12 Mar 2017 00:55:34 +0100 Subject: [PATCH] add includePaths --- .gitlab-ci.yml | 10 +++++++++- dist/index.d.ts | 2 ++ dist/index.js | 11 +++++++++-- dist/smartsass.includes.d.ts | 0 dist/smartsass.includes.js | 3 +++ ts/index.ts | 12 ++++++++++-- 6 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 dist/smartsass.includes.d.ts create mode 100644 dist/smartsass.includes.js diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb9847b..8232a1b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,10 @@ # gitzone standard -image: hosttoday/ht-docker-node:npmts +image: hosttoday/ht-docker-node:npmci + +cache: + paths: + - .yarn/ + key: "$CI_BUILD_STAGE" stages: - test @@ -11,6 +16,7 @@ testLEGACY: stage: test script: - npmci test legacy + coverage: /\d+.?\d+?\%\s*coverage/ tags: - docker allow_failure: true @@ -19,6 +25,7 @@ testLTS: stage: test script: - npmci test lts + coverage: /\d+.?\d+?\%\s*coverage/ tags: - docker @@ -26,6 +33,7 @@ testSTABLE: stage: test script: - npmci test stable + coverage: /\d+.?\d+?\%\s*coverage/ tags: - docker diff --git a/dist/index.d.ts b/dist/index.d.ts index 8471187..2e7fe03 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -1,8 +1,10 @@ import { Result } from 'node-sass'; export interface ISmartsassConstructorOptions { entryFilePath: string; + includePaths?: string[]; } export declare class Smartsass { + includePaths: any[]; entryFilePath: string; constructor(optionsArg: ISmartsassConstructorOptions); /** diff --git a/dist/index.js b/dist/index.js index cb3f60c..1cef96d 100644 --- a/dist/index.js +++ b/dist/index.js @@ -11,7 +11,13 @@ Object.defineProperty(exports, "__esModule", { value: true }); const plugins = require("./smartsass.plugins"); class Smartsass { constructor(optionsArg) { + this.includePaths = []; this.entryFilePath = optionsArg.entryFilePath; + if (optionsArg.includePaths) { + for (let includePath of optionsArg.includePaths) { + this.includePaths.push(includePath); + } + } } /** * renders the Smartsass classes' entryfile and returns result as string @@ -19,7 +25,8 @@ class Smartsass { render() { let done = plugins.smartq.defer(); plugins.sass.render({ - file: this.entryFilePath + file: this.entryFilePath, + includePaths: this.includePaths }, function (err, result) { if (err) { console.log(err); @@ -40,4 +47,4 @@ class Smartsass { } } exports.Smartsass = Smartsass; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEsK0NBQThDO0FBUzlDO0lBRUUsWUFBWSxVQUF3QztRQUNsRCxJQUFJLENBQUMsYUFBYSxHQUFHLFVBQVUsQ0FBQyxhQUFhLENBQUE7SUFDL0MsQ0FBQztJQUVEOztPQUVHO0lBQ0gsTUFBTTtRQUNKLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUF1QixDQUFBO1FBQ3RELE9BQU8sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDO1lBQ2xCLElBQUksRUFBRSxJQUFJLENBQUMsYUFBYTtTQUN6QixFQUFFLFVBQVUsR0FBRyxFQUFFLE1BQU07WUFDdEIsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztnQkFDUixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO2dCQUNoQixJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQ2xCLENBQUM7WUFDRCxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO1FBQ3RCLENBQUMsQ0FBQyxDQUFBO1FBQ0YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7SUFDckIsQ0FBQztJQUVEOztPQUVHO0lBQ0csY0FBYyxDQUFFLGNBQXNCOztZQUMxQyxJQUFJLE1BQU0sR0FBRyxNQUFNLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQTtZQUNoQyxNQUFNLE9BQU8sQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxFQUFFLGNBQWMsQ0FBQyxDQUFBO1FBQzVFLENBQUM7S0FBQTtDQUNGO0FBOUJELDhCQThCQyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEsK0NBQThDO0FBVTlDO0lBR0UsWUFBWSxVQUF3QztRQUZwRCxpQkFBWSxHQUFHLEVBQUUsQ0FBQTtRQUdmLElBQUksQ0FBQyxhQUFhLEdBQUcsVUFBVSxDQUFDLGFBQWEsQ0FBQTtRQUM3QyxFQUFFLENBQUEsQ0FBQyxVQUFVLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQztZQUMzQixHQUFHLENBQUMsQ0FBQyxJQUFJLFdBQVcsSUFBSSxVQUFVLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQztnQkFDaEQsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUE7WUFDckMsQ0FBQztRQUNILENBQUM7SUFDSCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxNQUFNO1FBQ0osSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQXVCLENBQUE7UUFDdEQsT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUM7WUFDbEIsSUFBSSxFQUFFLElBQUksQ0FBQyxhQUFhO1lBQ3hCLFlBQVksRUFBRSxJQUFJLENBQUMsWUFBWTtTQUNoQyxFQUFFLFVBQVUsR0FBRyxFQUFFLE1BQU07WUFDdEIsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztnQkFDUixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO2dCQUNoQixJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQ2xCLENBQUM7WUFDRCxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO1FBQ3RCLENBQUMsQ0FBQyxDQUFBO1FBQ0YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7SUFDckIsQ0FBQztJQUVEOztPQUVHO0lBQ0csY0FBYyxDQUFFLGNBQXNCOztZQUMxQyxJQUFJLE1BQU0sR0FBRyxNQUFNLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQTtZQUNoQyxNQUFNLE9BQU8sQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxFQUFFLGNBQWMsQ0FBQyxDQUFBO1FBQzVFLENBQUM7S0FBQTtDQUNGO0FBckNELDhCQXFDQyJ9 \ No newline at end of file diff --git a/dist/smartsass.includes.d.ts b/dist/smartsass.includes.d.ts new file mode 100644 index 0000000..e69de29 diff --git a/dist/smartsass.includes.js b/dist/smartsass.includes.js new file mode 100644 index 0000000..53d50fb --- /dev/null +++ b/dist/smartsass.includes.js @@ -0,0 +1,3 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzYXNzLmluY2x1ZGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzYXNzLmluY2x1ZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ== \ No newline at end of file diff --git a/ts/index.ts b/ts/index.ts index 5b2493d..1ba0718 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -4,13 +4,20 @@ import * as plugins from './smartsass.plugins' import { Result } from 'node-sass' export interface ISmartsassConstructorOptions { - entryFilePath: string + entryFilePath: string, + includePaths?: string[] } export class Smartsass { + includePaths = [] entryFilePath: string constructor(optionsArg: ISmartsassConstructorOptions) { this.entryFilePath = optionsArg.entryFilePath + if(optionsArg.includePaths) { + for (let includePath of optionsArg.includePaths) { + this.includePaths.push(includePath) + } + } } /** @@ -19,7 +26,8 @@ export class Smartsass { render() { let done = plugins.smartq.defer() plugins.sass.render({ - file: this.entryFilePath + file: this.entryFilePath, + includePaths: this.includePaths }, function (err, result) { if (err) { console.log(err)