Merge branch 'master' into release

jmdobry · jmdobry · commit ba5eecbe6ae0 · 2016-05-17T23:58:05.000-07:00
diff --git a/.babelrc b/.babelrc
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,5 @@ junit/
 doc/
 node_modules/
 *.log
-typings
+typings
+.nyc_output
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+##### 3.0.0-beta.6 - 17 May 2016
+
+###### Other
+- Switch from webpack to rollup
+- Upgraded dependencies
+
 ##### 3.0.0-beta.5 - 02 May 2016
 
 ###### Bug fixes
diff --git a/bower.json b/bower.json
@@ -28,6 +28,6 @@
     "webpack.config.js"
   ],
   "dependencies": {
-    "js-data": ">=3.0.0-alpha.26"
+    "js-data": ">=3.0.0-beta.6"
   }
 }
diff --git a/circle.yml b/circle.yml
@@ -1,11 +1,19 @@
+general:
+  branches:
+    ignore:
+      - gh-pages
 machine:
   node:
-    version: 4.1.0
+    version: 5.7.0
+dependencies:
+  pre:
+    - npm i -g npm
+    - npm i -g codecov
+    - npm i js-data@beta
 test:
-  override:
-    - npm run ci
+  post:
+    - cat ./coverage/lcov.info | codecov
 general:
   artifacts:
     - "dist"
     - "fetch/dist"
-    - "coverage"
diff --git a/fetch/package.json b/fetch/package.json
@@ -1,7 +1,7 @@
 {
   "name": "js-data-fetch",
   "description": "HTTP adapter for js-data that uses the fetch API.",
-  "version": "3.0.0-beta.5",
+  "version": "3.0.0-beta.6",
   "homepage": "https://github.com/js-data/js-data-http",
   "repository": {
     "type": "git",
@@ -22,6 +22,6 @@
     "fetch"
   ],
   "peerDependencies": {
-    "js-data": "^3.0.0-beta.3"
+    "js-data": "^3.0.0-beta.6"
   }
 }
diff --git a/fetch/rollup.config.js b/fetch/rollup.config.js
@@ -0,0 +1,25 @@
+var babel = require('rollup-plugin-babel')
+var replace = require('rollup-plugin-replace')
+
+module.exports = {
+  moduleName: 'JSDataHttp',
+  moduleId: 'js-data-fetch',
+  external: [
+    'js-data'
+  ],
+  globals: {
+    'js-data': 'JSData'
+  },
+  plugins: [
+    replace({
+      'import axios from \'../node_modules/axios/dist/axios\'': 'var axios = undefined'
+    }),
+    babel({
+      babelrc: false,
+      presets: [
+        'es2015-rollup'
+      ],
+      exclude: 'node_modules/axios/**'
+    })
+  ]
+}
diff --git a/fetch/webpack.config.js b/fetch/webpack.config.js
diff --git a/node/package.json b/node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "js-data-http-node",
   "description": "Node.js HTTP adapter for js-data.",
-  "version": "3.0.0-beta.5",
+  "version": "3.0.0-beta.6",
   "homepage": "https://github.com/js-data/js-data-http",
   "repository": {
     "type": "git",
@@ -22,10 +22,10 @@
     "node.js"
   ],
   "dependencies": {
-    "js-data-adapter": "~0.6.1"
+    "js-data-adapter": "~0.7.2"
   },
   "peerDependencies": {
-    "axios": "^0.11.0",
-    "js-data": "^3.0.0-beta.3"
+    "axios": "^0.11.1",
+    "js-data": "^3.0.0-beta.6"
   }
 }
diff --git a/node/rollup.config.js b/node/rollup.config.js
@@ -0,0 +1,30 @@
+var babel = require('rollup-plugin-babel')
+var replace = require('rollup-plugin-replace')
+
+module.exports = {
+  moduleName: 'JSDataHttpNode',
+  moduleId: 'js-data-http-node',
+  external: [
+    'axios',
+    'js-data',
+    'js-data-adapter'
+  ],
+  globals: {
+    'axios': 'axios',
+    'js-data': 'JSData',
+    'js-data-adapter': 'JSDataAdapter'
+  },
+  plugins: [
+    replace({
+      'import axios from \'../node_modules/axios/dist/axios\'': 'var axios = require(\'axios\')',
+      '\'../node_modules/js-data-adapter/src/index\'': '\'js-data-adapter\''
+    }),
+    babel({
+      babelrc: false,
+      presets: [
+        'es2015-rollup'
+      ],
+      exclude: 'node_modules/axios/**'
+    })
+  ]
+}
diff --git a/node/webpack.config.js b/node/webpack.config.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "js-data-http",
   "description": "HTTP (XHR) adapter for js-data in the browser.",
-  "version": "3.0.0-beta.5",
+  "version": "3.0.0-beta.6",
   "homepage": "https://github.com/js-data/js-data-http",
   "repository": {
     "type": "git",
@@ -47,50 +47,54 @@
       "dist/"
     ]
   },
+  "babel": {
+    "presets": [
+      "es2015"
+    ]
+  },
   "scripts": {
     "lint": "repo-tools lint \"**/*.js\"",
     "doc": "jsdoc -c conf.json src node_modules/js-data-adapter/src && node scripts/cleanup.js",
     "version": "repo-tools write-version dist/js-data-http.js fetch/dist/js-data-fetch.js node/dist/js-data-http-node.js",
-    "webpack": "webpack --config webpack.config.js && webpack --config node/webpack.config.js && webpack --config fetch/webpack.config.js && npm run version",
+    "bundle_http": "rollup -c rollup.config.js -f umd -o dist/js-data-http.js -m dist/js-data-http.js.map src/index.js",
+    "bundle_fetch": "rollup -c fetch/rollup.config.js -f umd -o fetch/dist/js-data-fetch.js -m fetch/dist/js-data-fetch.js.map src/index.js",
+    "bundle_node": "rollup -c node/rollup.config.js -f cjs -o node/dist/js-data-http-node.js -m node/dist/js-data-http-node.js.map src/index.js",
+    "bundle": "npm run bundle_http && npm run bundle_fetch && npm run bundle_node && npm run version",
     "min": "uglifyjs dist/js-data-http.js -o dist/js-data-http.min.js --source-map dist/js-data-http.min.map --source-map-url js-data-http.min.map -v -m -c --screw-ie8",
     "min_fetch": "uglifyjs fetch/dist/js-data-fetch.js -o fetch/dist/js-data-fetch.min.js --source-map fetch/dist/js-data-fetch.min.map --source-map-url js-data-fetch.min.map -v -m -c --screw-ie8",
     "banner": "node scripts/banner.js",
     "gzip": "echo js-data-http gzipped size: $(cat dist/js-data-http.min.js | gzip -f9 | wc -c)kb",
     "gzip_fetch": "echo js-data-fetch gzipped size: $(cat fetch/dist/js-data-fetch.min.js | gzip -f9 | wc -c)kb",
-    "build": "npm run lint && npm run webpack && npm run min && npm run min_fetch && npm run banner",
+    "build": "npm run lint && npm run bundle && npm run min && npm run min_fetch && npm run banner",
     "karma": "karma start",
     "karma_fetch": "karma start fetch/karma.conf.js",
     "mocha": "mocha -t 20000 -R dot -r source-map-support/register node/mocha.start.js test/*.test.js",
     "cover": "istanbul cover -x node/dist/js-data-http-node-tests.js --hook-run-in-context node_modules/mocha/bin/_mocha -- -t 20000 -R dot -r source-map-support/register node/mocha.start.js test/*.test.js",
     "test": "npm run build && npm run karma && npm run karma_fetch && npm run cover",
-    "repo-tools": "repo-tools updates && repo-tools changelog && repo-tools authors",
-    "release": "npm test && npm run doc && npm run repo-tools",
-    "ci": "npm test && cat ./coverage/lcov.info | codecov"
+    "release": "npm test && npm run doc && repo-tools updates && repo-tools changelog && repo-tools authors"
   },
   "dependencies": {
-    "js-data-adapter": "0.6.1"
+    "js-data-adapter": "0.7.2"
   },
   "peerDependencies": {
-    "js-data": "^3.0.0-beta.3"
+    "js-data": "^3.0.0-beta.6"
   },
   "devDependencies": {
-    "axios": "0.11.0",
-    "babel-loader": "6.2.4",
-    "babel-plugin-syntax-async-functions": "6.5.0",
-    "babel-plugin-transform-regenerator": "6.6.5",
-    "babel-polyfill": "6.7.4",
+    "axios": "0.11.1",
+    "babel-plugin-syntax-async-functions": "6.8.0",
+    "babel-plugin-transform-regenerator": "6.9.0",
     "babel-preset-stage-0": "6.5.0",
     "istanbul": "0.4.3",
-    "js-data-repo-tools": "0.5.0",
+    "js-data-repo-tools": "0.5.2",
     "karma": "0.13.22",
-    "karma-browserstack-launcher": "0.1.11",
+    "karma-browserstack-launcher": "1.0.0",
     "karma-chai": "0.1.0",
     "karma-mocha": "1.0.1",
     "karma-phantomjs-launcher": "1.0.0",
-    "karma-sinon": "1.0.4",
+    "karma-sinon": "1.0.5",
     "phantomjs-prebuilt": "2.1.7",
-    "source-map-support": "0.4.0",
-    "uglify-js": "2.6.2",
-    "webpack": "1.13.0"
+    "rollup-plugin-commonjs": "2.2.1",
+    "rollup-plugin-replace": "1.1.0",
+    "uglify-js": "2.6.2"
   }
 }
diff --git a/rollup.config.js b/rollup.config.js
@@ -0,0 +1,25 @@
+var babel = require('rollup-plugin-babel')
+var commonjs = require('rollup-plugin-commonjs')
+
+module.exports = {
+  moduleName: 'JSDataHttp',
+  moduleId: 'js-data-http',
+  external: [
+    'js-data'
+  ],
+  globals: {
+    'js-data': 'JSData'
+  },
+  plugins: [
+    commonjs({
+      include: 'node_modules/axios/**'
+    }),
+    babel({
+      babelrc: false,
+      presets: [
+        'es2015-rollup'
+      ],
+      exclude: 'node_modules/axios/**'
+    })
+  ]
+}
diff --git a/src/index.js b/src/index.js
diff --git a/webpack.config.js b/webpack.config.js

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,6 @@`
`28`	`28`	`"webpack.config.js"`
`29`	`29`	`],`
`30`	`30`	`"dependencies": {`
`31`		`- "js-data": ">=3.0.0-alpha.26"`
	`31`	`+ "js-data": ">=3.0.0-beta.6"`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "js-data-fetch",`
`3`	`3`	`"description": "HTTP adapter for js-data that uses the fetch API.",`
`4`		`- "version": "3.0.0-beta.5",`
	`4`	`+ "version": "3.0.0-beta.6",`
`5`	`5`	`"homepage": "https://github.com/js-data/js-data-http",`
`6`	`6`	`"repository": {`
`7`	`7`	`"type": "git",`
`@@ -22,6 +22,6 @@`
`22`	`22`	`"fetch"`
`23`	`23`	`],`
`24`	`24`	`"peerDependencies": {`
`25`		`- "js-data": "^3.0.0-beta.3"`
	`25`	`+ "js-data": "^3.0.0-beta.6"`
`26`	`26`	`}`
`27`	`27`	`}`