js-data
diff --git a/‎.gitignore
+2 b/‎.gitignore
+2
diff --git a/‎CHANGELOG.md
+2 b/‎CHANGELOG.md
+2
diff --git a/‎Gruntfile.js
+6-4 b/‎Gruntfile.js
+6-4
diff --git a/‎bower.json
+4-2 b/‎bower.json
+4-2
diff --git a/‎build_examples/r.js/README.md
+3 b/‎build_examples/r.js/README.md
+3
diff --git a/‎build_examples/r.js/app.js
+9 b/‎build_examples/r.js/app.js
+9
diff --git a/‎build_examples/r.js/index.html
+14 b/‎build_examples/r.js/index.html
+14
diff --git a/‎build_examples/r.js/main.js
+24 b/‎build_examples/r.js/main.js
+24
diff --git a/‎build_examples/r.js/require.config.js
+6 b/‎build_examples/r.js/require.config.js
+6
@@ -20,3 +20,5 @@ bower_components/
 
 *.iml
 .idea/
+
+build_examples/r.js/bundle.js
@@ -1,3 +1,5 @@
+##### 3.0.0-beta.1 - 17 April 2015
+
 ##### 2.4.0 - 15 April 2015
 
 ###### Backwards compatible API changes
 
@@ -72,7 +72,7 @@ module.exports = function (grunt) {
           files: [
             'bower_components/angular-1.3.2/angular.js',
             'bower_components/angular-mocks-1.3.2/angular-mocks.js',
-            'bower_components/js-data/dist/js-data.js',
+            'node_modules/js-data/dist/js-data.js',
             'dist/js-data-angular.min.js',
             'karma.start.js',
             'test/**/*.js'
@@ -87,24 +87,26 @@ module.exports = function (grunt) {
     },
     webpack: {
       dist: {
+        debug: true,
         entry: './src/index.js',
         output: {
           filename: './dist/js-data-angular.js',
-          libraryTarget: 'umd',
+          libraryTarget: 'umd2',
           library: 'jsDataAngularModuleName'
         },
         externals: {
           'js-data': {
-            amd: 'js-data',
+            amd: 'JSData',
             commonjs: 'js-data',
             commonjs2: 'js-data',
             root: 'JSData'
           },
+          'axios': 'axios',
           'angular': 'angular'
         },
         module: {
           loaders: [
-            { test: /(.+)\.js$/, exclude: /node_modules/, loader: 'babel-loader?blacklist=useStrict' }
+            { test: /(.+)\.js$/, loader: 'babel-loader?blacklist=useStrict' }
           ],
           preLoaders: [
             {
 
@@ -25,10 +25,12 @@
     "angular-mocks-1.1.5": "angular-mocks-unstable#1.1.5",
     "angular-mocks-1.2.16": "angular-mocks#1.2.16",
     "angular-mocks-1.2.25": "angular-mocks#1.2.25",
-    "angular-mocks-1.3.2": "angular-mocks#1.3.2"
+    "angular-mocks-1.3.2": "angular-mocks#1.3.2",
+    "requirejs": "~2.1.17"
   },
   "dependencies": {
-    "js-data": ">=1.5.7",
+    "js-data": "2.0.0-beta.3",
+    "js-data-http": "2.0.0-beta.3",
     "angular": ">=1.1.0"
   },
   "resolutions": {
 
@@ -0,0 +1,3 @@
+`r.js -o require.config.js` will produce `bundle.js`
+
+In `index.html` switch `script/main` between `main` (load scripts dynamically) and `bundle` (load bundled scripts)
@@ -0,0 +1,9 @@
+define('app', [
+  'angular',
+  'js-data-angular'
+], function (angular, jsDataModuleName) {
+  return angular.module('app', [jsDataModuleName])
+    .run(function (DS, DSVersion, $rootScope) {
+      $rootScope.test = 'It works! Using js-data ' + DSVersion.full;
+    });
+});
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>My App</title>
+  <!-- load scripts dynamically -->
+  <!--<script data-main="main" src="../../bower_components/requirejs/require.js"></script>-->
+
+  <!-- load bundled scripts -->
+  <script data-main="bundle" src="../../bower_components/requirejs/require.js"></script>
+</head>
+<body ng-cloak>
+<h1>{{ test }}</h1>
+</body>
+</html>
@@ -0,0 +1,24 @@
+require.config({
+  paths: {
+    angular: '../../bower_components/angular/angular',
+    'js-data-angular': '../../dist/js-data-angular',
+    'JSData': '../../bower_components/js-data/dist/js-data'
+  },
+  shim: {
+    'angular': {
+      exports: 'angular'
+    }
+  }
+});
+
+require([
+    'angular',
+    'app',
+    'JSData'
+  ], function (angular, app) {
+    angular.element(document.getElementsByTagName('html')[0]).ready(function () {
+      // bootstrap the app manually
+      angular.bootstrap(document, ['app']);
+    });
+  }
+);
@@ -0,0 +1,6 @@
+({
+  name: 'main',
+  mainConfigFile: 'main.js',
+  out: 'bundle.js',
+  optimize: 'none'
+})
-Original file line number
+Diff line change
 *.iml
 .idea/
++
 +build_examples/r.js/bundle.js
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+##### 3.0.0-beta.1 - 17 April 2015`
	`2`	`+`
`1`	`3`	`##### 2.4.0 - 15 April 2015`
`2`	`4`
`3`	`5`	`###### Backwards compatible API changes`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+`r.js -o require.config.js` will produce `bundle.js`
	`2`	`+`
	`3`	+In `index.html` switch `script/main` between `main` (load scripts dynamically) and `bundle` (load bundled scripts)