1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
diff --git a/bin/vulcanize b/bin/vulcanize
index 956b2bc..ad8b29d 100755
--- a/bin/vulcanize
+++ b/bin/vulcanize
@@ -35,6 +35,7 @@ var help = [
' --redirect <uri>|<path>: Takes an argument in the form of URI|PATH where url is a URI composed of a protocol, hostname, and path and PATH is a local filesystem path to replace the matched URI part with. Multiple redirects may be specified; the earliest ones have the highest priority.',
' --no-implicit-strip: DANGEROUS! Avoid stripping imports of the transitive dependencies of imports specified with `--exclude`. May result in duplicate javascript inlining.',
' --out-html <path>: If specified, output will be written to <path> instead of stdout.',
+ ' --out-request-list <path>: Writes a list of request URLs required to vulcanize <html file> to <path> on success.',
'Examples:',
' The command',
'',
@@ -82,7 +83,8 @@ var args = nopt(
'no-implicit-strip': Boolean,
'inline-scripts': Boolean,
'inline-css': Boolean,
- 'out-html': String
+ 'out-html': String,
+ 'out-request-list': String
},
{
'h': ['--help'],
@@ -126,15 +128,23 @@ args.implicitStrip = !args['no-implicit-strip'];
args.inlineScripts = args['inline-scripts'];
args.inlineCss = args['inline-css'];
-(new vulcan(args)).process(target, function(err, content) {
+var vulcanize = new vulcan(args);
+vulcanize.process(target, function(err, content) {
if (err) {
process.stderr.write(require('util').inspect(err));
process.exit(1);
}
+
+ if (args['out-request-list']) {
+ var urls = Object.keys(vulcanize.loader.requests).filter(function(request) {
+ // Filter out excluded URLs.
+ return !vulcanize.isExcludedHref(request);
+ });
+ fs.writeFileSync(args['out-request-list'], urls.join('\n') + '\n');
+ }
+
if (args['out-html']) {
- var fd = fs.openSync(args['out-html'], 'w');
- fs.writeSync(fd, content + "\n");
- fs.closeSync(fd);
+ fs.writeFileSync(args['out-html'], content + '\n');
} else {
process.stdout.write(content);
}
diff --git a/lib/constants.js b/lib/constants.js
index 21e1380..b6a353a 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -13,6 +13,6 @@ module.exports = {
ABS_URL: /(^\/)|(^#)|(^[\w-\d]*:)/,
URL: /url\([^)]*\)/g,
URL_ATTR: ['href', 'src', 'action', 'style', 'assetpath'],
- URL_TEMPLATE: '{{.*}}|\\[\\[.*\\]\\]',
+ URL_TEMPLATE: '{{.*}}|\\[\\[.*\\]\\]|\\$i18n[^{]*{[^}]*}',
OLD_POLYMER: 'This version of vulcanize is not compatible with Polymer < 0.8. Please use vulcanize 0.7.x.'
};
diff --git a/lib/vulcan.js b/lib/vulcan.js
index 5aff456..2540dc1 100644
--- a/lib/vulcan.js
+++ b/lib/vulcan.js
@@ -414,19 +414,21 @@ Vulcan.prototype = {
},
getImplicitExcludes: function getImplicitExcludes(excludes) {
- // Build a loader that doesn't have to stop at our excludes, since we need them.
+ // Build a loader that doesn't have to stop at our HTML excludes, since we
+ // need them. JS excludes should still be excluded.
var loader = buildLoader({
abspath: this.abspath,
fsResolver: this.fsResolver,
- redirects: this.redirects
+ redirects: this.redirects,
+ excludes: excludes.filter(function(e) { return e.match(/.js$/i); })
});
var analyzer = new hyd.Analyzer(true, loader);
var analyzedExcludes = [];
excludes.forEach(function(exclude) {
- if (exclude.match(/.js$/)) {
+ if (exclude.match(/.js$/i)) {
return;
}
- if (exclude.match(/.css$/)) {
+ if (exclude.match(/.css$/i)) {
return;
}
if (exclude.slice(-1) === '/') {
|
