Use webpack to build final product

.babelrc

@@ -1,3 +1,4 @@
 {
-	"blacklist": [ "strict" ]
+	"blacklist": [ "strict" ],
+	"sourceMaps": "true"
 }

.gitignore

@@ -5,3 +5,6 @@ npm-debug.log
 /gh-tmp
 .DS_Store
 .idea
+/dist/lib
+/dist/util
+/dist/test

Makefile

@@ -10,34 +10,43 @@ BIN := $(THIS_DIR)/node_modules/.bin
 NODE ?= node
 NPM ?= $(NODE) $(shell which npm)
 MOCHA ?= $(NODE) $(BIN)/mocha
-BROWSERIFY ?= $(NODE) $(BIN)/browserify
+BABEL ?= $(NODE) $(BIN)/babel
+WEBPACK ?= $(NODE) $(BIN)/webpack
 
 standalone: dist/wpcom.js
 
-install: node_modules
-
 clean:
-	@rm -rf node_modules dist
+	@rm -rf dist
+
+distclean: clean
+	@rm -rf node_modules
+
+dist: dist/lib dist/test
+	@mkdir -p $@
+
+dist/lib: dist/lib/util
+	@mkdir -p $@
+
+dist/lib/util:
+	@mkdir -p $@
 
-dist:
+dist/test:
 	@mkdir -p $@
 
-dist/wpcom.js: node_modules *.js dist lib/*.js
-	@$(BROWSERIFY) -s WPCOM . > $@
+dist/wpcom.js: *.js dist lib/*.js
+	@$(WEBPACK) -p --config webpack.config.js
 
-node_modules: package.json
-	@NODE_ENV= $(NPM) install
-	@touch node_modules
+babelify: dist
+	@$(BABEL) index.js --out-file dist/index.js
+	@$(BABEL) lib --out-dir dist/lib
+	@$(BABEL) lib/util --out-dir dist/lib/util
+	@$(BABEL) test --out-dir dist/test
 
 example-server:
 	cd examples/server/; $(NPM) install
 	$(NODE) examples/server/index.js
 
-example-browser-cors: all
-	cd examples/browser-cors/; $(NPM) install
-	$(NODE) examples/browser-cors/index.js
-
-test: node_modules
+test: babelify
 	@$(MOCHA) \
 		--compilers js:babel/register \
 		--timeout 120s \
@@ -46,12 +55,15 @@ test: node_modules
 		--bail \
 		--reporter spec
 
-test-all: node_modules
+test-all: babelify
 	@$(MOCHA) \
 		--compilers js:babel/register \
 		--timeout 120s \
 		--slow 3s \
 		--bail \
 		--reporter spec
 
-.PHONY: all standalone install clean test test-all
+publish: clean standalone
+	$(NPM) publish
+
+.PHONY: all standalone clean distclean babelify example-server example-browser-cors test test-all publish

Readme.md

@@ -22,9 +22,11 @@ blog.posts({ number: 8 })
 
 ### Browser
 
-Include `dist/wpcom.js` in a `<script>` tag:
+Include `dist/wpcom.js` and a suitable browser shim if needed
+to support the ES2015 features in `<script>` tags:
 
 ```html
+<script src="https://cdnjs.cloudflare.com/ajax/libs/babel-core/5.8.25/browser-polyfill.js"></script>
 <script src="wpcom.js"></script>
 <script>
   var wpcom = WPCOM('<your-token>');

dist/index.js

@@ -0,0 +1,183 @@
+
+
+/**
+ * Module dependencies.
+ */
+
+var request_handler = require('wpcom-xhr-request');
+
+/**
+ * Local module dependencies.
+ */
+
+var Me = require('./lib/me');
+var Site = require('./lib/site');
+var Users = require('./lib/users');
+var Batch = require('./lib/batch');
+var Req = require('./lib/util/request');
+var sendRequest = require('./lib/util/send-request');
+var debug = require('debug')('wpcom');
+
+/**
+ * Local module constants
+ */
+var DEFAULT_ASYNC_TIMEOUT = 30000;
+
+/**
+ * XMLHttpRequest (and CORS) API access method.
+ *
+ * API authentication is done via an (optional) access `token`,
+ * which needs to be retrieved via OAuth.
+ *
+ * Request Handler is optional and XHR is defined as default.
+ *
+ * @param {String} [token] - OAuth API access token
+ * @param {Function} [reqHandler] - function Request Handler
+ * @public
+ */
+
+function WPCOM(token, reqHandler) {
+  if (!(this instanceof WPCOM)) {
+    return new WPCOM(token, reqHandler);
+  }
+
+  // `token` is optional
+  if ('function' === typeof token) {
+    reqHandler = token;
+    token = null;
+  }
+
+  if (token) {
+    debug('Token defined: %s…', token.substring(0, 6));
+    this.token = token;
+  }
+
+  // Set default request handler
+  if (!reqHandler) {
+    debug('No request handler. Adding default XHR request handler');
+
+    this.request = function (params, fn) {
+      params = params || {};
+
+      // token is optional
+      if (token) {
+        params.authToken = token;
+      }
+
+      return request_handler(params, fn);
+    };
+  } else {
+    this.request = reqHandler;
+  }
+
+  // Add Req instance
+  this.req = new Req(this);
+
+  // Default api version;
+  this.apiVersion = '1.1';
+}
+
+/**
+ * Get `Me` object instance
+ *
+ * @api public
+ */
+
+WPCOM.prototype.me = function () {
+  return new Me(this);
+};
+
+/**
+ * Get `Site` object instance
+ *
+ * @param {String} id
+ * @api public
+ */
+
+WPCOM.prototype.site = function (id) {
+  return new Site(id, this);
+};
+
+/**
+ * Get `Users` object instance
+ *
+ * @api public
+ */
+
+WPCOM.prototype.users = function () {
+  return new Users(this);
+};
+
+WPCOM.prototype.batch = function () {
+  return new Batch(this);
+};
+
+/**
+ * List Freshly Pressed Posts
+ *
+ * @param {Object} [query]
+ * @param {Function} fn callback function
+ * @api public
+ */
+
+WPCOM.prototype.freshlyPressed = function (query, fn) {
+  return this.req.get('/freshly-pressed', query, fn);
+};
+
+/**
+ * Expose send-request
+ * @TODO: use `this.req` instead of this method
+ */
+
+WPCOM.prototype.sendRequest = function (params, query, body, fn) {
+  var msg = 'WARN! Don use `sendRequest() anymore. Use `this.req` method.';
+  if (console && console.warn) {
+    //eslint-disable-line no-console
+    console.warn(msg); //eslint-disable-line no-console
+  } else {
+      console.log(msg); //eslint-disable-line no-console
+    }
+
+  return sendRequest.call(this, params, query, body, fn);
+};
+
+if (!Promise.prototype.timeout) {
+  /**
+      * Returns a new promise with a deadline
+      *
+      * After the timeout interval, the promise will
+      * reject. If the actual promise settles before
+      * the deadline, the timer is cancelled.
+      *
+      * @param {number} delay how many ms to wait
+      * @returns {Promise}
+      */
+  Promise.prototype.timeout = function () {
+    var _this = this;
+
+    var delay = arguments.length <= 0 || arguments[0] === undefined ? DEFAULT_ASYNC_TIMEOUT : arguments[0];
+
+    var cancelTimeout = undefined,
+        timer = undefined,
+        timeout = undefined;
+
+    timeout = new Promise(function (resolve, reject) {
+      timer = setTimeout(function () {
+        reject(new Error('Action timed out while waiting for response.'));
+      }, delay);
+    });
+
+    cancelTimeout = function () {
+      clearTimeout(timer);
+      return _this;
+    };
+
+    return Promise.race([this.then(cancelTimeout)['catch'](cancelTimeout), timeout]);
+  };
+}
+
+/**
+ * Expose `WPCOM` module
+ */
+
+module.exports = WPCOM;