[CS2] Add webpack support

Cakefile

@@ -1,4 +1,5 @@
 fs = require 'fs'
+os = require 'os'
 path = require 'path'
 _ = require 'underscore'
 { spawn, exec, execSync } = require 'child_process'
@@ -51,14 +52,8 @@ run = (args, callback) ->
 buildParser = ->
  helpers.extend global, require 'util'
  require 'jison'
- parser = require('./lib/coffeescript/grammar').parser.generate()
- # Patch Jison’s output, until https://github.com/zaach/jison/pull/339 is accepted,
- # to ensure that require('fs') is only called where it exists.
- parser = parser.replace "var source = require('fs')", """
- var source = '';
- var fs = require('fs');
- if (typeof fs !== 'undefined' && fs !== null)
- source = fs"""
+ # We don't need `moduleMain`, since the parser is unlikely to be run standalone.
+ parser = require('./lib/coffeescript/grammar').parser.generate(moduleMain: ->)
  fs.writeFileSync 'lib/coffeescript/parser.js', parser
 
 buildExceptParser = (callback) ->
@@ -135,7 +130,7 @@ task 'build:browser', 'merge the built scripts into a single file for use in a b
  var CoffeeScript = function() {
  function require(path){ return require[path]; }
  #{code}
- return require['./coffeescript'];
+ return require['./browser'];
  }();
 
  if (typeof define === 'function' && define.amd) {
@@ -368,7 +363,7 @@ task 'bench', 'quick benchmark of compilation time', ->
 
 # Run the CoffeeScript test suite.
 runTests = (CoffeeScript) ->
- CoffeeScript.register()
+ CoffeeScript.register() unless global.testingBrowser
  startTime = Date.now()
 
  # These are attached to `global` so that they’re accessible from within
@@ -440,3 +435,17 @@ task 'test:browser', 'run the test suite against the merged browser script', ->
  (-> eval source).call result
  testResults = runTests result.CoffeeScript
  process.exit 1 unless testResults
+
+task 'test:webpack', 'run webpack test', ->
+ args = [
+ "./node_modules/webpack/bin/webpack.js"
+ "--entry=./lib/coffeescript/browser.js", 
+ "--output-path=#{os.tmpdir()}",
+ "--output-filename=coffeescript.js"
+ ]
+
+ console.log 'webpack', args.slice(1).join(' ')
+
+ spawnNodeProcess args, 'both', (status) ->
+ console.log "webpack exits with #{status}"
+ process.exit(status)

bower.json

@@ -1,7 +1,7 @@
 {
  "name": "coffeescript",
  "main": [
- "lib/coffeescript/coffeescript.js"
+ "lib/coffeescript/browser.js"
  ],
  "description": "Unfancy JavaScript",
  "keywords": [

package.json

@@ -16,7 +16,8 @@
  "directories": {
  "lib": "./lib/coffeescript"
  },
- "main": "./lib/coffeescript/coffeescript",
+ "main": "./lib/coffeescript/index",
+ "browser": "./lib/coffeescript/browser",
  "bin": {
  "coffee": "./bin/coffee",
  "cake": "./bin/cake"
@@ -46,7 +47,8 @@
  "highlight.js": "~9.11.0",
  "jison": ">=0.4.17",
  "markdown-it": "^8.3.1",
- "underscore": "~1.8.3"
+ "underscore": "~1.8.3",
+ "webpack": "^2.5.1"
  },
  "dependencies": {}
 }

src/browser.coffee

@@ -4,7 +4,6 @@
 # `text/coffeescript` script tags, source maps via data-URLs, and so on.
 
 CoffeeScript = require './coffeescript'
-CoffeeScript.require = require
 compile = CoffeeScript.compile
 
 # Use standard JavaScript `eval` to eval code.
@@ -18,11 +17,15 @@ CoffeeScript.run = (code, options = {}) ->
  options.shiftLine = on
  Function(compile code, options)()
 
-# If we're not in a browser environment, we're finished with the public API.
+# Export this more limited `CoffeeScript` than what is exported by
+# `index.coffee`, which is intended for a Node environment.
+module.exports = CoffeeScript
+
+# If we’re not in a browser environment, we’re finished with the public API.
 return unless window?
 
-# Include source maps where possible. If we've got a base64 encoder, a
-# JSON serializer, and tools for escaping unicode characters, we're good to go.
+# Include source maps where possible. If we’ve got a base64 encoder, a
+# JSON serializer, and tools for escaping unicode characters, we’re good to go.
 # Ported from https://developer.mozilla.org/en-US/docs/DOM/window.btoa
 if btoa? and JSON?
  compile = (code, options = {}) ->

src/cake.coffee

@@ -11,7 +11,7 @@ fs = require 'fs'
 path = require 'path'
 helpers = require './helpers'
 optparse = require './optparse'
-CoffeeScript = require './coffeescript'
+CoffeeScript = require './'
 
 # Register .coffee extension
 CoffeeScript.register()