Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to CoffeeScript 2 #22

Merged
merged 4 commits into from
Jan 12, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ developers += Developer(
addSbtJsEngine("1.3.5")

libraryDependencies ++= Seq(
"org.webjars" % "coffee-script-node" % "1.11.0",
"org.webjars.npm" % "coffeescript" % "2.7.0",
"org.webjars" % "mkdirp" % "0.5.0"
)

2 changes: 1 addition & 1 deletion src/main/resources/coffee.js
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

var args = process.argv,
fs = require("fs"),
coffeeScript = require("coffee-script"),
coffeeScript = require("coffeescript"),
mkdirp = require("mkdirp"),
path = require("path");

5 changes: 4 additions & 1 deletion src/sbt-test/sbt-coffeescript-plugin/coffee/build.sbt
Original file line number Diff line number Diff line change
@@ -12,7 +12,10 @@ checkMapFileContents := {
| "a.coffee"
| ],
| "names": [],
| "mappings": "AAAA;AAAA,MAAA;;EAAA,MAAA,GAAW;;EACX,QAAA,GAAW;AADX"
| "mappings": "AAAA;AAAA,MAAA,MAAA,EAAA;;EAAA,MAAA,GAAW;;EACX,QAAA,GAAW;AADX",
| "sourcesContent": [
| "number = 42\nopposite = true\n"
| ]
|}""".stripMargin) {
sys.error(s"Unexpected contents: $contents")
}
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
addSbtPlugin("com.github.sbt" % "sbt-coffeescript" % sys.props("project.version"))
sys.props.get("project.version") match {
case Some(x) => addSbtPlugin("com.github.sbt" % "sbt-coffeescript" % x)
case _ => sys.error("""|The system property 'project.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
}
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
addSbtPlugin("com.github.sbt" % "sbt-coffeescript" % sys.props("project.version"))
sys.props.get("project.version") match {
case Some(x) => addSbtPlugin("com.github.sbt" % "sbt-coffeescript" % x)
case _ => sys.error("""|The system property 'project.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
}
Loading