Skip to content

Commit 45d3434

Browse files
committed
Update seajs to 2.0.0
1 parent 702a032 commit 45d3434

File tree

8 files changed

+42
-29
lines changed

8 files changed

+42
-29
lines changed

static/seajs/plugin-combo.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/seajs/plugin-flush.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/seajs/plugin-shim.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/seajs/plugin-style.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/seajs/plugin-warning.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/seajs/sea-debug.js

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* SeaJS v2.0.0pre | seajs.org/LICENSE.md
2+
* SeaJS v2.0.0 | seajs.org/LICENSE.md
33
*/
44
(function(global, undefined) {
55

@@ -11,7 +11,7 @@ if (_seajs && _seajs.version) {
1111

1212
var seajs = global.seajs = {
1313
// The current version of SeaJS being used
14-
version: "2.0.0pre"
14+
version: "2.0.0"
1515
}
1616

1717

@@ -224,7 +224,7 @@ function parseMap(uri) {
224224
}
225225

226226

227-
var ABSOLUTE_RE = /(?:^|:)\/\/./
227+
var ABSOLUTE_RE = /:\//
228228
var RELATIVE_RE = /^\./
229229
var ROOT_RE = /^\//
230230

@@ -529,7 +529,7 @@ function use(uris, callback) {
529529
var exports = []
530530

531531
for (var i = 0; i < uris.length; i++) {
532-
exports[i] = exec(cachedModules[uris[i]])
532+
exports[i] = getExports(cachedModules[uris[i]])
533533
}
534534

535535
if (callback) {
@@ -729,7 +729,7 @@ function exec(mod) {
729729
}
730730

731731
function require(id) {
732-
return exec(cachedModules[resolveInThisContext(id)])
732+
return getExports(cachedModules[resolveInThisContext(id)])
733733
}
734734

735735
require.resolve = resolveInThisContext
@@ -778,6 +778,14 @@ function getUnloadedUris(uris) {
778778
return ret
779779
}
780780

781+
function getExports(mod) {
782+
var exports = exec(mod)
783+
if (exports === null && (!mod || !IS_CSS_RE.test(mod.uri))) {
784+
emit("error", mod)
785+
}
786+
return exports
787+
}
788+
781789
var circularStack = []
782790

783791
function isCircularWaiting(mod) {
@@ -858,9 +866,13 @@ seajs.use = function(ids, callback) {
858866
return seajs
859867
}
860868

869+
Module.load = use
861870
seajs.resolve = id2Uri
862871
global.define = define
863-
Module.load = use
872+
873+
seajs.require = function(id) {
874+
return (cachedModules[id2Uri(id)] || {}).exports
875+
}
864876

865877

866878
/**

static/seajs/sea.js

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/seajs/sea.js.map

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)