Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/rewire.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOded Niv <oded.niv@gmail.com>2018-01-16 14:36:19 +0300
committerOded Niv <oded.niv@gmail.com>2018-01-16 14:36:19 +0300
commit1250667cb3f2adeb8546ef3088d8d053ad26d456 (patch)
tree26fb291a4a609a097fb0cc00387df167d1186363
parent18c5d0e09ef0f6cf666d664fbbf74435e190f23c (diff)
use 'coffeescript' package
-rw-r--r--lib/moduleEnv.js13
-rw-r--r--package-lock.json8
-rw-r--r--package.json2
3 files changed, 16 insertions, 7 deletions
diff --git a/lib/moduleEnv.js b/lib/moduleEnv.js
index a9f410a..2f9743c 100644
--- a/lib/moduleEnv.js
+++ b/lib/moduleEnv.js
@@ -89,6 +89,10 @@ function jsExtension(module, filename) {
}
function coffeeExtension(module, filename) {
+ if (!coffee) {
+ throw new Error("please add 'coffeescript' to your devDependencies");
+ }
+
var content = stripBOM(fs.readFileSync(filename, "utf8"));
restoreExtensions();
@@ -113,9 +117,14 @@ function stripBOM(content) {
}
try {
- coffee = require("coffee-script");
+ coffee = require("coffeescript");
} catch (err) {
- // We are not able to provide coffee-script support, but that's ok as long as the user doesn't want it.
+ try {
+ // Trying to load deprecated package
+ coffee = require("coffee-script");
+ } catch (err) {
+ // We are not able to provide coffee-script support, but that's ok as long as the user doesn't want it.
+ }
}
exports.load = load;
diff --git a/package-lock.json b/package-lock.json
index 7cbcd08..a84273a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -238,10 +238,10 @@
}
}
},
- "coffee-script": {
- "version": "1.12.7",
- "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz",
- "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==",
+ "coffeescript": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.1.1.tgz",
+ "integrity": "sha512-Tl2z6/rNMqJ2LqWlVxLKwLF9FniwJpweonfSLCwhX8NFCEsGBcFIErtfKd8+t4XHDSYRshj9FXxPX53BT3lC9w==",
"dev": true
},
"commander": {
diff --git a/package.json b/package.json
index 1079122..a3b58c7 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
"url": "git://github.com/jhnns/rewire.git"
},
"devDependencies": {
- "coffee-script": "^1.8.0",
+ "coffeescript": "^2.1.1",
"expect.js": "^0.3.1",
"mocha": "^4.0.1"
},