From 9de02d011292834dbf3fab9528d9bf02eeb17848 Mon Sep 17 00:00:00 2001 From: aminya Date: Wed, 22 Jul 2020 05:55:17 -0500 Subject: [PATCH 1/4] using node scripts instead of grunt --- Gruntfile.coffee | 38 -------------------------------------- package.json | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 47 deletions(-) delete mode 100644 Gruntfile.coffee diff --git a/Gruntfile.coffee b/Gruntfile.coffee deleted file mode 100644 index e01d66d..0000000 --- a/Gruntfile.coffee +++ /dev/null @@ -1,38 +0,0 @@ -module.exports = (grunt) -> - grunt.initConfig - pkg: grunt.file.readJSON('package.json') - - coffee: - glob_to_multiple: - expand: true - cwd: 'src' - src: ['*.coffee'] - dest: 'lib' - ext: '.js' - - coffeelint: - options: - no_empty_param_list: - level: 'error' - max_line_length: - level: 'ignore' - - src: ['src/*.coffee'] - test: ['spec/*.coffee'] - - shell: - test: - command: 'node node_modules/jasmine-focused/bin/jasmine-focused --captureExceptions --coffee spec' - options: - stdout: true - stderr: true - failOnError: true - - grunt.loadNpmTasks('grunt-contrib-coffee') - grunt.loadNpmTasks('grunt-shell') - grunt.loadNpmTasks('grunt-coffeelint') - - grunt.registerTask 'clean', -> require('fs-plus').removeSync('lib') - grunt.registerTask('lint', ['coffeelint:src', 'coffeelint:test']) - grunt.registerTask('default', ['coffeelint', 'coffee']) - grunt.registerTask('test', ['default', 'coffeelint:test', 'shell:test']) diff --git a/package.json b/package.json index 24cb667..8d3068f 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,11 @@ "description": "Less compile cache", "main": "./lib/less-cache", "scripts": { - "prepublish": "grunt clean lint coffee", - "test": "grunt test" + "clean": "shx rm -rf lib", + "test": "jasmine-focused --captureExceptions --coffee spec", + "coffee": "npm run clean && shx cp -r src lib && coffee -c -M -o lib lib && shx rm -rf lib/*.coffee", + "build": "npm run coffee", + "prepare": "npm run build" }, "repository": { "type": "git", @@ -33,14 +36,12 @@ "walkdir": "0.0.11" }, "devDependencies": { + "coffeescript": "^1.12.7", "fstream": "^1.0.10", - "grunt": "^1.0.1", - "grunt-cli": "^1.2.0", - "grunt-coffeelint": "0.0.16", - "grunt-contrib-coffee": "^1.0.0", - "grunt-shell": "^1.3.0", - "jasmine-focused": "1.x", + "jasmine-focused": "^1", "temp": "^0.8.3", - "tmp": "0.0.28" + "tmp": "0.0.28", + "shx": "^0.3.2", + "cross-env": "^7.0.2" } } From 99ed49890eb1db33940f918aba0818fb8a0df356 Mon Sep 17 00:00:00 2001 From: aminya Date: Wed, 22 Jul 2020 05:55:38 -0500 Subject: [PATCH 2/4] updating the dependencies --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 8d3068f..d598958 100644 --- a/package.json +++ b/package.json @@ -30,10 +30,10 @@ } ], "dependencies": { - "fs-plus": "^3.0.0", - "less": "^2.7.1", - "underscore-plus": "1.x", - "walkdir": "0.0.11" + "fs-plus": "^3.1.1", + "less": "^3.12.2", + "underscore-plus": "^1.7.0", + "walkdir": "^0.4.1" }, "devDependencies": { "coffeescript": "^1.12.7", From b80d80b466dcda7416528851e2f93c5880249874 Mon Sep 17 00:00:00 2001 From: aminya Date: Wed, 22 Jul 2020 06:08:47 -0500 Subject: [PATCH 3/4] dynamic require from the cjs dist of less --- src/less-cache.coffee | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/less-cache.coffee b/src/less-cache.coffee index b6c8555..751eeff 100644 --- a/src/less-cache.coffee +++ b/src/less-cache.coffee @@ -107,7 +107,12 @@ class LessCache observeImportedFilePaths: (callback) -> importedPaths = [] - lessFs ?= require 'less/lib/less-node/fs.js' + # load or assign less and lessFs + if (less == null) + less = require 'less' + lessFs = less.fs + else if (lessFs == null) + lessFs = less.fs originalFsReadFileSync = lessFs.readFileSync lessFs.readFileSync = (filePath, args...) => relativeFilePath = @relativize(@resourcePath, filePath) if @resourcePath @@ -196,7 +201,12 @@ class LessCache parseLess: (filePath, contents) -> css = null options = filename: filePath, syncImport: true, paths: @importPaths - less ?= require('less') + # load or assign less and lessFs + if (less == null) + less = require 'less' + lessFs = less.fs + else if (lessFs == null) + lessFs = less.fs imports = @observeImportedFilePaths -> less.render contents, options, (error, result) -> if error? From 9f85e26c48a48dbe6685e859e05ce392a1e4a7c0 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Thu, 10 Dec 2020 15:42:08 -0600 Subject: [PATCH 4/4] rebump devDeps --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d598958..30919ce 100644 --- a/package.json +++ b/package.json @@ -37,11 +37,11 @@ }, "devDependencies": { "coffeescript": "^1.12.7", - "fstream": "^1.0.10", + "fstream": "^1.0.12", "jasmine-focused": "^1", - "temp": "^0.8.3", - "tmp": "0.0.28", - "shx": "^0.3.2", - "cross-env": "^7.0.2" + "temp": "^0.9.4", + "tmp": "0.2.1", + "shx": "^0.3.3", + "cross-env": "^7.0.3" } }