fix: Don't get version from package.json on browser build

This change improves usability of this package with webpack, by not requiring people to use the json
loader.

Author: trodrigues

browser.js

@@ -1,6 +1,6 @@
 // To understand why axios is vendored, check SETUP.md
-var axios = require('./vendor-node/axios')
-var contentful = require('./lib/contentful').default
+var axios = require('./vendor-browser/axios')
+var contentful = require('./dist/contentful').default
 module.exports = {
   createClient: function (params) {
     return contentful(axios, params)

karma.base.conf.js

@@ -3,16 +3,18 @@
 // Use karma.conf.saucelabs.js for saucelabs tests
 
 var _ = require('lodash')
-var webpack = _.cloneDeep(require('./webpack.config.js'))
-delete webpack.entry
-delete webpack.output
-webpack.devtool = 'inline-source-map'
+var webpack = require('webpack')
+var webpackConfig = _.cloneDeep(require('./webpack.config.js'))
+delete webpackConfig.entry
+delete webpackConfig.output
+webpackConfig.devtool = 'inline-source-map'
 
 // https://webpack.github.io/docs/configuration.html#node
 // https://rmurphey.com/blog/2015/07/20/karma-webpack-tape-code-coverage
-webpack.node = {
+webpackConfig.node = {
   fs: 'empty'
 }
+webpackConfig.plugins.push(new webpack.NormalModuleReplacementPlugin(/\.\/dist\/contentful/g, './lib/contentful'))
 
 module.exports = {
   plugins: [
@@ -31,7 +33,7 @@ module.exports = {
     'test/unit/**/*.js': ['webpack']
   },
 
-  webpack: webpack,
+  webpack: webpackConfig,
 
   reporters: [ 'dots' ],
   port: 9876,

lib/create-http-client.js

@@ -1,6 +1,6 @@
 /* @flow */
 import qs from 'querystring'
-import packageFile from '../package.json'
+import version from '../version'
 
 type HttpClientParams = {
   space: string,
@@ -21,7 +21,7 @@ export default function createHttpClient (axios: Object, {space, accessToken, in
   port = port || (insecure ? 80 : 443)
   headers = headers || {}
   headers['Content-Type'] = 'application/vnd.contentful.delivery.v1+json'
-  headers['X-Contentful-User-Agent'] = 'contentful.js/' + packageFile.version
+  headers['X-Contentful-User-Agent'] = 'contentful.js/' + version
 
   if (process && process.release && process.release.name === 'node') {
     headers['user-agent'] = 'node.js/' + process.version

package.json

@@ -24,9 +24,10 @@
     "test:integration": "babel-node ./test/integration/tests.js",
     "test:browser-local": "BABEL_ENV=test ./node_modules/.bin/karma start karma.conf.local.js",
     "test:browser-remote": "BABEL_ENV=test ./node_modules/.bin/karma start karma.conf.saucelabs.js",
-    "vendor": "npm run vendor:node && npm run vendor:browser",
+    "vendor": "npm run vendor:node && npm run vendor:browser && npm run vendor:version",
     "vendor:node": "rimraf vendor-node && mkdirp vendor-node && babel node_modules/axios/lib/ --out-dir vendor-node/",
     "vendor:browser": "rimraf vendor-browser && mkdirp vendor-browser && babel node_modules/axios/dist/axios.js --out-file vendor-browser/axios.js",
+    "vendor:version": "echo \"module.exports = '`cat package.json|json version`'\" > version.js",
     "browser-coverage": "npm run test:cover && opener coverage/lcov-report/index.html",
     "prepublish": "in-publish && npm run build || not-in-publish",
     "postpublish": "npm run docs:publish && npm run clean",
@@ -36,7 +37,9 @@
   },
   "browser": "./browser.js",
   "files": [
+    "browser.js",
     "index.js",
+    "version.js",
     "dist",
     "browser-dist",
     "vendor-browser",
@@ -63,6 +66,7 @@
     "in-publish": "^2.0.0",
     "istanbul": "^1.0.0-alpha.2",
     "jsdoc": "^3.4.0",
+    "json": "^9.0.3",
     "json-loader": "^0.5.4",
     "karma": "^0.13.21",
     "karma-babel-preprocessor": "^6.0.1",

test/unit/create-http-client-test.js

@@ -8,9 +8,7 @@ test('Calls axios with expected URL', t => {
     create: sinon.stub()
   }
 
-  createHttpClient.__Rewire__('packageFile', {
-    version: 'version'
-  })
+  createHttpClient.__Rewire__('version', 'version')
 
   createHttpClient(axios, {
     accessToken: 'clientAccessToken',

version.js

@@ -0,0 +1 @@
+module.exports = require('./package.json').version