umd

yyx990803 · yyx990803 · commit bb2e57b41865 · 2015-08-10T17:25:06.000-04:00
diff --git a/README.md b/README.md
@@ -11,18 +11,24 @@ npm install vue-async-data
 ### Usage
 
 ``` js
+// assuming CommonJS
 var Vue = require('vue')
-var asyncData = require('vue-async-data')
+var VueAsyncData = require('vue-async-data')
 
 // use globally
 // you can also just use `asyncData.mixin` where needed
-Vue.use(asyncData)
+Vue.use(VueAsyncData)
 ```
 
 Then, in your component options, provide an `asyncData` function:
 
 ``` js
 Vue.component('example', {
+  data: function {
+    return {
+      msg: 'not loaded yet...'
+    }
+  },
   asyncData: function (resolve, reject) {
     // load data and call resolve(data)
     // or call reject(reason) if something goes wrong
@@ -40,6 +46,7 @@ You can also return a promise that resolves to the data to be set:
 
 ``` js
 Vue.component('example', {
+  // ...
   asyncData: function () {
     return someServiceThatReturnsPromise.get(12345)
       .then(function (msg) {
@@ -55,6 +62,7 @@ Parallel fetching with `Promise.all` and ES6:
 
 ``` js
 Vue.component('example', {
+  // ...
   asyncData() {
     return Promise.all([
       serviceA.get(123),
diff --git a/example/example.build.js b/example/example.build.js
@@ -10138,7 +10138,7 @@
 
 /***/ },
 /* 68 */
-/***/ function(module, exports) {
+/***/ function(module, exports, __webpack_require__) {
 
 	var asyncData = {
 	  created: function () {
@@ -10174,13 +10174,21 @@
 	  }
 	}
 
-	module.exports = {
+	var api = {
 	  mixin: asyncData,
 	  install: function (Vue, options) {
 	    Vue.options = Vue.util.mergeOptions(Vue.options, asyncData)
 	  }
 	}
 
+	if(true) {
+	  module.exports = api
+	} else if(typeof define === 'function' && define.amd) {
+	  define(function () { return api })
+	} else if (typeof window !== 'undefined') {
+	  window.VueAsyncData = api
+	}
+
 
 /***/ }
 /******/ ]);
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "vue-async-data",
   "version": "1.0.0",
   "description": "async data loading plugin for Vue.js",
-  "main": "index.js",
+  "main": "vue-async-data.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-async-data.git"
diff --git a/vue-async-data.js b/vue-async-data.js
@@ -32,9 +32,17 @@ var asyncData = {
   }
 }
 
-module.exports = {
+var api = {
   mixin: asyncData,
   install: function (Vue, options) {
     Vue.options = Vue.util.mergeOptions(Vue.options, asyncData)
   }
 }
+
+if(typeof exports === 'object' && typeof module === 'object') {
+  module.exports = api
+} else if(typeof define === 'function' && define.amd) {
+  define(function () { return api })
+} else if (typeof window !== 'undefined') {
+  window.VueAsyncData = api
+}

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,17 @@ var asyncData = {`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`-module.exports = {`
	`35`	`+var api = {`
`36`	`36`	`mixin: asyncData,`
`37`	`37`	`install: function (Vue, options) {`
`38`	`38`	`Vue.options = Vue.util.mergeOptions(Vue.options, asyncData)`
`39`	`39`	`}`
`40`	`40`	`}`
	`41`	`+`
	`42`	`+if(typeof exports === 'object' && typeof module === 'object') {`
	`43`	`+ module.exports = api`
	`44`	`+} else if(typeof define === 'function' && define.amd) {`
	`45`	`+ define(function () { return api })`
	`46`	`+} else if (typeof window !== 'undefined') {`
	`47`	`+ window.VueAsyncData = api`
	`48`	`+}`