fix Mismatched anonymous define() module

nuysoft · Apr 13, 2015 · 49f56d2 · 49f56d2
1 parent 291c389
commit 49f56d2
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,5 +7,6 @@ build
 *.TODO
 PLAN.md
 xhr.js
+bak
 MockHttpRequest.js
 coverage
diff --git a/dist/mock-min.js b/dist/mock-min.js
diff --git a/dist/mock.js b/dist/mock.js
@@ -1,4 +1,4 @@
-/*! mockjs 05-03-2015 15:35:16 */
+/*! mockjs 13-04-2015 14:26:58 */
 /*! src/mock-prefix.js */
 /*!
     Mock - 模拟请求 & 模拟数据
@@ -1056,7 +1056,10 @@
     if (typeof module === "object" && module.exports) {
         module.exports = Mock;
     } else if (typeof define === "function" && define.amd) {
-        define(function() {
+        define("mock", [], function() {
+            return Mock;
+        });
+        define("mockjs", [], function() {
             return Mock;
         });
     } else if (typeof define === "function" && define.cmd) {

diff --git a/mock-min.map b/mock-min.map
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "mockjs",
   "title": "Mock.js",
   "description": "模拟请求 & 模拟数据",
-  "version": "0.1.6",
+  "version": "0.1.9",
   "homepage": "http://mockjs.com/",
   "keywords": [
     "mock",

diff --git a/src/expose.js b/src/expose.js
@@ -17,7 +17,10 @@ if (typeof module === 'object' && module.exports) {
 
 } else if (typeof define === "function" && define.amd) {
     // AMD modules
-    define(function() {
+    define('mock', [], function() {
+        return Mock
+    })
+    define('mockjs', [], function() {
         return Mock
     })
 

diff --git a/src/mock-prefix.js b/src/mock-prefix.js
@@ -5,6 +5,6 @@
 */
 (function(undefined) {
 	var Mock = {
-		version: '0.1.8',
+		version: '0.1.9',
 		_mocked: {}
 	}