Merge branch 'gh-pages' of github.com:seajs/seajs into gh-pages

dist/plugin-warning.js

@@ -0,0 +1,17 @@
+/**
+ * Display warning messages in console according to your rules.
+ */
+define('seajs/plugin-warning', [], function() {
+
+  var pluginSDK = seajs.pluginSDK
+  var util = pluginSDK.util
+  var config = pluginSDK.config
+
+
+
+
+})
+
+// Runs it immediately
+seajs.use('seajs/plugin-warning');
+

dist/sea-debug.js

@@ -1153,7 +1153,7 @@ seajs._config = {
     return util.filter(module.dependencies, function(dep) {
       circularCheckStack = [uri]
 
-      var isCircular = isCircularWaiting(cachedModules[dep], uri)
+      var isCircular = isCircularWaiting(cachedModules[dep])
       if (isCircular) {
         circularCheckStack.push(uri)
         printCircularLog(circularCheckStack)
@@ -1163,7 +1163,7 @@ seajs._config = {
     })
   }
 
-  function isCircularWaiting(module, uri) {
+  function isCircularWaiting(module) {
     if (!module || module.status !== STATUS.SAVED) {
       return false
     }
@@ -1172,26 +1172,30 @@ seajs._config = {
     var deps = module.dependencies
 
     if (deps.length) {
-      if (util.indexOf(deps, uri) > -1) {
+      if (isOverlap(deps, circularCheckStack)) {
         return true
       }
 
       for (var i = 0; i < deps.length; i++) {
-        if (isCircularWaiting(cachedModules[deps[i]], uri)) {
+        if (isCircularWaiting(cachedModules[deps[i]])) {
           return true
         }
       }
-
-      return false
     }
 
+    circularCheckStack.pop()
     return false
   }
 
   function printCircularLog(stack, type) {
     util.log('Found circular dependencies:', stack.join(' --> '), type)
   }
 
+  function isOverlap(arrA, arrB) {
+    var arrC = arrA.concat(arrB)
+    return arrC.length > util.unique(arrC).length
+  }
+
   function preload(callback) {
     var preloadMods = config.preload.slice()
     config.preload = []

docs/index.html

@@ -271,7 +271,7 @@ <h3>打包部署</h3>
 $ cd hello-seajs/assets
 $ spm build 
 ...
-BUILD SUCCESSFULLY!
+BUILD SUCCESS!
 $
 </pre>
 

src/module.js

@@ -430,7 +430,7 @@
     return util.filter(module.dependencies, function(dep) {
       circularCheckStack = [uri]
 
-      var isCircular = isCircularWaiting(cachedModules[dep], uri)
+      var isCircular = isCircularWaiting(cachedModules[dep])
       if (isCircular) {
         circularCheckStack.push(uri)
         printCircularLog(circularCheckStack)
@@ -440,7 +440,7 @@
     })
   }
 
-  function isCircularWaiting(module, uri) {
+  function isCircularWaiting(module) {
     if (!module || module.status !== STATUS.SAVED) {
       return false
     }
@@ -449,26 +449,30 @@
     var deps = module.dependencies
 
     if (deps.length) {
-      if (util.indexOf(deps, uri) > -1) {
+      if (isOverlap(deps, circularCheckStack)) {
         return true
       }
 
       for (var i = 0; i < deps.length; i++) {
-        if (isCircularWaiting(cachedModules[deps[i]], uri)) {
+        if (isCircularWaiting(cachedModules[deps[i]])) {
           return true
         }
       }
-
-      return false
     }
 
+    circularCheckStack.pop()
     return false
   }
 
   function printCircularLog(stack, type) {
     util.log('Found circular dependencies:', stack.join(' --> '), type)
   }
 
+  function isOverlap(arrA, arrB) {
+    var arrC = arrA.concat(arrB)
+    return arrC.length > util.unique(arrC).length
+  }
+
   function preload(callback) {
     var preloadMods = config.preload.slice()
     config.preload = []

src/plugins/plugin-warning.js

@@ -0,0 +1,17 @@
+/**
+ * Display warning messages in console according to your rules.
+ */
+define('seajs/plugin-warning', [], function() {
+
+  var pluginSDK = seajs.pluginSDK
+  var util = pluginSDK.util
+  var config = pluginSDK.config
+
+
+
+
+})
+
+// Runs it immediately
+seajs.use('seajs/plugin-warning');
+

test/config.js

@@ -43,6 +43,7 @@
     ,'issues/anywhere'
     ,'issues/auto-transport'
     ,'issues/charset'
+    ,'issues/circular-deps'
     ,'issues/circular-detect'
     ,'issues/circular-in-package'
     ,'issues/circular-log'
@@ -88,6 +89,7 @@
     ,'issues/plugin-json'
     ,'issues/plugin-less'
     ,'issues/plugin-text'
+    ,'issues/plugin-warning'
     ,'issues/preload'
     ,'issues/preload-as-deps'
     ,'issues/preload-use'

test/issues/circular-deps/dist/main-debug.js

@@ -0,0 +1,27 @@
+define("circular-deps/a-debug", ["./b-debug", "./c-debug"], function(require, exports) {
+  require('./b-debug')
+
+  exports.name = 'a'
+})
+
+define("circular-deps/b-debug", ["./c-debug"], function(require, exports) {
+  require('./c-debug')
+
+  exports.name = 'b'
+})
+
+define("circular-deps/c-debug", ["./b-debug"], function(require, exports) {
+  require('./b-debug')
+
+  exports.name = 'c'
+})
+
+define("circular-deps/main-debug", ["./a-debug", "./b-debug", "./c-debug", "test-debug"], function(require) {
+
+  var test = require('test-debug')
+  var a = require('./a-debug')
+
+  test.assert(a.name === 'a', a.name)
+  test.done()
+
+})

test/issues/circular-deps/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "circular-deps",
+  "root": "",
+  "output": {
+    "main": "."
+  }
+}

test/issues/circular-deps/src/a.js

@@ -0,0 +1,5 @@
+define(function(require, exports) {
+  require('./b.js')
+
+  exports.name = 'a'
+})

test/issues/circular-deps/src/b.js

@@ -0,0 +1,5 @@
+define(function(require, exports) {
+  require('./c.js')
+
+  exports.name = 'b'
+})

test/issues/circular-deps/src/c.js

@@ -0,0 +1,5 @@
+define(function(require, exports) {
+  require('./b.js')
+
+  exports.name = 'c'
+})

test/issues/circular-deps/src/main.js

@@ -0,0 +1,9 @@
+define(function(require) {
+
+  var test = require('test')
+  var a = require('./a.js')
+
+  test.assert(a.name === 'a', a.name)
+  test.done()
+
+})

test/issues/circular-deps/test.html

@@ -0,0 +1,35 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+<title>Issue Test</title>
+</head>
+<body>
+<p><a href="https://github.com/seajs/seajs/issues/402">#402</a></p>
+<div id="out"></div>
+
+<script src="../../../dist/sea.js"></script>
+<script>
+
+  seajs.config({
+    debug: true,
+    alias: {
+      'circular-deps': './dist',
+      test: '../../../test'
+    }
+  })
+
+  seajs.use('./dist/main')
+
+
+  function printResults(txt, style) {
+    var d = document.createElement('div');
+    d.innerHTML = txt;
+    d.className = style;
+    document.getElementById('out').appendChild(d);
+  }
+
+</script>
+</body>
+</html>

test/issues/circular-in-package/test.html

@@ -9,10 +9,10 @@
 <p><a href="https://github.com/seajs/seajs/issues/393">#393</a></p>
 <div id="out"></div>
 
-<script src="../../../dist/sea-debug.js"></script>
+<script src="../../../dist/sea.js"></script>
 <script>
 
-  seajs.config({ base: '.' }).use('main')
+  seajs.config({ base: '.', debug: true }).use('main')
 
 
   function printResults(txt, style) {

test/issues/circular-log/main.js

@@ -4,6 +4,8 @@ define(function(require) {
 
   test.assert(require('./a').name === 'a', 'should print out circular log info')
   test.assert(require('./x').name === 'x', 'should print out circular log info')
+  test.assert(require('./s').name === 's', 'should print out circular log info')
+
   test.done()
 
 })

test/issues/circular-log/s.js

@@ -0,0 +1,4 @@
+define('s', ['ss'], { name: 's' })
+define('ss', ['s1', 's2'], { name: 'ss' })
+define('s1', [], { name: 's1' })
+define('s2', ['ss'], { name: 's2' })

test/issues/circular-log/test.html

@@ -9,9 +9,13 @@
 <p><a href="https://github.com/seajs/seajs/issues/385">#385</a></p>
 <div id="out"></div>
 
-<script src="../../../dist/sea-debug.js"></script>
+<script src="../../../dist/sea.js"></script>
 <script>
 
+  seajs.config({
+    debug: true
+  })
+
   seajs.use('./main')
 
 

test/issues/plugin-warning/main.js

@@ -0,0 +1,13 @@
+define(function(require) {
+
+  var test = require('../../test')
+  var xx100 = require('./xx/1.0.0/xx.js')
+  var xx120 = require('./xx/1.2.0/xx.js')
+
+  test.assert(xx100.name === 'xx', xx100.name)
+  test.assert(xx120.name === 'xx', xx120.name)
+  test.assert(xx100.version === '1.0.0', xx100.name)
+  test.assert(xx120.version === '1.2.0', xx120.name)
+
+  test.done()
+})

test/issues/plugin-warning/test.html

@@ -0,0 +1,27 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+<title>Issue Test</title>
+</head>
+<body>
+<p><a href="https://github.com/seajs/seajs/issues/352">#352</a></p>
+<div id="out"></div>
+
+<script src="../../../dist/sea.js"></script>
+<script>
+
+  seajs.use('./main')
+
+
+  function printResults(txt, style) {
+    var d = document.createElement('div');
+    d.innerHTML = txt;
+    d.className = style;
+    document.getElementById('out').appendChild(d);
+  }
+
+</script>
+</body>
+</html>

test/issues/plugin-warning/xx/1.0.0/xx.js

@@ -0,0 +1 @@
+define({ name: 'xx', version: '1.0.0' })

test/issues/plugin-warning/xx/1.2.0/xx.js

@@ -0,0 +1 @@
+define({ name: 'xx', version: '1.2.0' })