8000 Some small doc updates, support err.moduleTree for better debugging o… · xcoderzach/requirejs@8278869 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8278869

Browse files
jrburkejrburke
committed
Some small doc updates, support err.moduleTree for better debugging of errors in optimizer builds.
1 parent b0c988c commit 8278869

File tree

3 files changed

+32
-12
lines changed

3 files changed

+32
-12
lines changed

‎dist/README.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,30 +32,32 @@ When doing a release, do the following:
3232
* Try a local install.
3333
* npm publish (in the requirejs-npm/requirejs directory)
3434

35-
* Tag the tree:
35+
* Tag the requirejs and r.js trees:
3636
* git tag -am "Release 0.0.0" 0.0.0
3737
* git push --tags
3838

39-
Now pull down the tagged version to do a distribution:
39+
Now pull down the tagged version to do a distribution, do this in git/ directory:
4040

41+
* rm -rf ./requirejs-dist ./requirejs-build
4142
* git clone git://github.com/jrburke/requirejs.git requirejs-dist
4243
* cd requirejs-dist
4344
* git checkout 0.0.0
4445
* cd dist
4546

4647
Run the distribution tasks.
4748

48-
To generate the web site:
49-
50-
* node dist-site.js
51-
5249
To generate a build
5350

5451
* ./dist-build.sh 0.0.0
5552

56-
Be sure the links for the CoffeeScript and jQuery Sample project work.
53+
To generate the web site:
54+
55+
* node dist-site.js
56+
* cd dist-site
57+
* zip -r docs.zip ./*
58+
* mv docs.zip ../../../requirejs-build/
5759

58-
UPDATE THE NPM PACKAGE
60+
Be sure the links for the CoffeeScript and jQuery Sample project work.
5961

6062
When done, reset versions to:
6163

‎require.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** vim: et:ts=4:sw=4:sts=4
2-
* @license RequireJS 0.26.0 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
2+
* @license RequireJS 0.26.0+ Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
33
* Available via the MIT or new BSD license.
44
* see: http://github.com/jrburke/requirejs for details
55
*/
@@ -11,7 +11,7 @@
1111
var requirejs, require, define;
1212
(function () {
1313
//Change this version number for each release.
14-
var version = "0.26.0",
14+
var version = "0.26.0+",
1515
commentRegExp = /(\/\*([\s\S]*?)\*\/|\/\/(.*)$)/mg,
1616
cjsRequireRegExp = /require\(\s*["']([^'"\s]+)["']\s*\)/g,
1717
currDirRegExp = /^\.\//,
@@ -527,7 +527,7 @@ var requirejs, require, define;
527527
}
528528

529529
function execManager(manager) {
530-
var i, ret, waitingCallbacks, err, errFile,
530+
var i, ret, waitingCallbacks, err, errFile, errModuleTree,
531531
cb = manager.callback,
532532
fullName = manage 10000 r.fullName,
533533
args = [],
@@ -591,12 +591,14 @@ var requirejs, require, define;
591591
if (err) {
592592
errFile = (fullName ? makeModuleMap(fullName).url : '') ||
593593
err.fileName || err.sourceURL;
594+
errModuleTree = err.moduleTree;
594595
err = makeError('defineerror', 'Error evaluating ' +
595596
'module "' + fullName + '" at location "' +
596597
errFile + '":\n' +
597598
err + '\nfileName:' + errFile +
598599
'\nlineNumber: ' + (err.lineNumber || err.line), err);
599600
err.moduleName = fullName;
601+
err.moduleTree = errModuleTree;
600602
return req.onError(err);
601603
}
602604

@@ -1185,7 +1187,6 @@ var requirejs, require, define;
11851187
//Allow tracing some require calls to allow the fetching
11861188
//of the priority config.
11871189
context.requireWait = false;
1188-
11891190
//But first, call resume to register any defined modules that may
11901191
//be in a data-main built file before the priority config
11911192
//call. Also grab any waiting define calls for this context.

‎tasks.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,23 @@ Release Notes
44
Next release
55
--------------
66

7+
- Support require({priority: ['config']}) and have it affect paths for
8+
paused resources. Trouble is makeModuleMap burns in the URL with the old
9+
config, before the priority config loads, and the name resolution in
10+
normalize uses package map information to resolve some names. ARGH PACKAGES!
11+
It would also be good to avoid having to rename plugin resources after
12+
a resource finishes loading. Maybe for both of those reasons, work out
13+
a different algorithm in the loader.
14+
HMM: is priority config even needed? Isn't a nested require enough?
15+
Well, it is a bit different, but map out why.
16+
17+
- Blog post on config options using a pkg tool.
18+
19+
- integrate properly with cpm
20+
21+
- Make ordered execution the default behavior?
22+
- debugging in IE is hurt?
23+
724
- A way to support local file/other kinds of caches?
825
http://groups.google.com/group/requirejs/browse_thread/thread/77092307ac6b9acb
926
http://www.html5rocks.com/en/tutorials/file/filesystem/#toc-filesystemurls

0 commit comments

Comments
 (0)
0