Fix multi define a same module

soda-x · Jul 6, 2012 · 4ce3cf7 · 4ce3cf7
1 parent 24a1e63
commit 4ce3cf7
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 27 deletions.
diff --git a/dist/sea-debug.js b/dist/sea-debug.js
@@ -929,9 +929,12 @@ seajs._config = {
     if (resolvedUri) {
       // If the first module in a package is not the cachedModules[derivedUri]
       // self, it should assign it to the correct module when found.
-      if (resolvedUri === derivedUri &&
-          (cachedModules[derivedUri] || {}).status === STATUS.SAVED) {
-        cachedModules[derivedUri] = null
+      if (resolvedUri === derivedUri) {
+        var refModule = cachedModules[derivedUri]
+        if (refModule && refModule.packageUri &&
+            refModule.status === STATUS.SAVED) {
+          cachedModules[derivedUri] = null
+        }
       }
 
       var module = save(resolvedUri, meta)
@@ -941,6 +944,7 @@ seajs._config = {
         // cachedModules[derivedUri] may be undefined in combo case.
         if ((cachedModules[derivedUri] || {}).status === STATUS.FETCHING) {
           cachedModules[derivedUri] = module
+          module.packageUri = derivedUri
         }
       }
       else {
@@ -1066,6 +1070,7 @@ seajs._config = {
           // See: test/issues/un-correspondence
           if (firstModuleInPackage && module.status === STATUS.FETCHED) {
             cachedModules[uri] = firstModuleInPackage
+            firstModuleInPackage.packageUri = uri
           }
           firstModuleInPackage = null
 

diff --git a/dist/sea.js b/dist/sea.js
diff --git a/src/module.js b/src/module.js
@@ -215,9 +215,12 @@
     if (resolvedUri) {
       // If the first module in a package is not the cachedModules[derivedUri]
       // self, it should assign it to the correct module when found.
-      if (resolvedUri === derivedUri &&
-          (cachedModules[derivedUri] || {}).status === STATUS.SAVED) {
-        cachedModules[derivedUri] = null
+      if (resolvedUri === derivedUri) {
+        var refModule = cachedModules[derivedUri]
+        if (refModule && refModule.packageUri &&
+            refModule.status === STATUS.SAVED) {
+          cachedModules[derivedUri] = null
+        }
       }
 
       var module = save(resolvedUri, meta)
@@ -227,6 +230,7 @@
         // cachedModules[derivedUri] may be undefined in combo case.
         if ((cachedModules[derivedUri] || {}).status === STATUS.FETCHING) {
           cachedModules[derivedUri] = module
+          module.packageUri = derivedUri
         }
       }
       else {
@@ -352,6 +356,7 @@
           // See: test/issues/un-correspondence
           if (firstModuleInPackage && module.status === STATUS.FETCHED) {
             cachedModules[uri] = firstModuleInPackage
+            firstModuleInPackage.packageUri = uri
           }
           firstModuleInPackage = null
 

diff --git a/test/issues/define-override/test.html b/test/issues/define-override/test.html
@@ -24,7 +24,7 @@
 <script>
 
   seajs.config({
-    base: './'
+    base: '.'
   });
 
   seajs.use('main');

diff --git a/test/modules/require-async/program.js b/test/modules/require-async/program.js
@@ -1,7 +1,10 @@
 define(function(require) {
 
   var test = require('../../test')
-  var path = 'http://seajs.org/test/modules/require-async/'
+
+  var path = typeof global !== 'undefined' ? // node environment
+      'http://seajs.org/test/modules/require-async/' :
+      './'
 
   require.async(['./a', path + 'b.js', path + 'c.js'], function(a, b, c) {
 

diff --git a/test/runtime/order-no-matter/main.js b/test/runtime/order-no-matter/main.js
@@ -1,3 +1,3 @@
 define("increment",["math"],function(a,b){var c=a("./math").add;b.increment=function(a){return c(a,1)}});
 define("math",[],function(a,b){b.add=function(){var a=0,b=0,c=arguments.length;while(b<c)a+=arguments[b++];return a}});
-define("main",["../../test","increment"],function(a){var b=a("../../test"),c=a("./increment").increment;debugger;b.assert(c(1)===2,"The result of inc(1) is 2."),b.done()});
+define("main",["../../test","increment"],function(a){var b=a("../../test"),c=a("./increment").increment;b.assert(c(1)===2,"The result of inc(1) is 2."),b.done()});
diff --git a/test/vendor.js b/test/vendor.js
@@ -4,7 +4,9 @@
   var MODULES_PATH = 'https://a.alipayobjects.com/static/arale/'
   //var MODULES_PATH = 'http://modules.seajs.org/'
 
-  if (location.href.indexOf('/~lifesinger/') > 0) {
+  var isLocal = location.href.indexOf('/~lifesinger/') > 0
+
+  if (isLocal) {
     MODULES_PATH = 'http://' + location.host + '/~lifesinger/seajs/spm/modules/'
   }
 
@@ -29,6 +31,9 @@
   })
 
 
-  define({ isMobile: isMobile })
+  define({
+    isMobile: isMobile,
+    isLocal: isLocal
+  })
 
 })()