Skip to content

Use same version of coffeescript as bigmaven #1

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jul 2, 2019
Merged

Use same version of coffeescript as bigmaven #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e31f7e0
Use same version of coffeescript as bigmaven
roblevintennis Jul 1, 2019
76a8f2f
Looks like we have to update coffee-script to coffeescript in a few o…
roblevintennis Jul 2, 2019
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
4 changes: 2 additions & 2 deletions Cakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ task "fixtures", "Generate .coffee fixtures from .eco fixtures", ->
task "dist", "Generate dist/eco.js", ->
build -> bundle ->
fs = require("fs")
coffee = require("coffee-script").compile
coffee = require("coffeescript").compile
uglify = require("uglify-js")

read = (filename) ->
Expand All @@ -58,7 +58,7 @@ task "dist", "Generate dist/eco.js", ->
"./scanner": read "lib/scanner.js"
"./util": read "lib/util.js"
"strscan": read "node_modules/strscan/lib/strscan.js"
"coffee-script": stub "CoffeeScript"
"coffeescript": stub "CoffeeScript"

cake_package = for name, source of modules
"""
Expand Down
2 changes: 1 addition & 1 deletion lib/compiler.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
, "dependencies":
{ "strscan": ">=1.0.1"
, "coffee-script": ">=1.2.0"
, "coffeescript": "^1.12.7"
Copy link

@naganowl naganowl Jul 1, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given that this matches what we've been using, this should be good!

Copy link
Author

@roblevintennis roblevintennis Jul 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Alan. Re

An additional check would be to point to this branch and observe that the test suite is green before merging this in.

I think that's a great idea Alan, and we'll need a PR to update our reference back anyway, so doing that should give us more confidence: https://github.com/mavenlink/mavenlink/pull/16795

I'm assuming this will go like:

  1. Ensure that bigmaven goes green
  2. Merge this
  3. Point back to eco#master from bigmaven, re-run yarn install and check in the update
  4. Ensure that again goes green
  5. Merge that in to bigmaven

Copy link

@naganowl naganowl Jul 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, just like if this were a mavenlink-js change!

}
, "devDependencies":
{ "nodeunit": ">=0.6.4"
Expand Down
2 changes: 1 addition & 1 deletion src/compiler.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CoffeeScript = require "coffee-script"
CoffeeScript = require "coffeescript"
{preprocess} = require "./preprocessor"
{indent} = require "./util"

Expand Down