|
|
Improve how we handle packages/ HTML imports. This improves resolution of URLs containing
"package/" under the web/ directory. Resolution under 'lib' is the same, but it and gives better suggestions if the path looks wrong. This summarizes what changed:
- source file: lib/b.html
import to "packages/c/d.html" was error, now is error + suggestion
import to "../packages/c/d.html" was error, now is error + suggestion
import to "../../packages/c/d.html" was resolved, now is resolved too
- source file: lib/a/b.html
import to "packages/c/d.html" was error, now is error + suggestion
import to "../packages/c/d.html" was error, now is error + suggestion
import to "../../packages/c/d.html" was error, now is error + suggestion
import to "../../../packages/c/d.html" was resolved, now is resolved too
- source file: web/b.html
import to "packages/c/d.html" was and continues to be resolved
import to "../packages/c/d.html" was error, now is resolved
- source file: web/a/b.html
import to "packages/c/d.html" was error, now is resolved
import to "../packages/c/d.html" was and continues to be resolved
import to "../../packages/c/d.html" was and continues to be resolved
Note: polymer-build and development mode are slightly different: polymer-build
detects and issues an error for bad paths inside lib/. These are not detected by
our package-resolution in loader.dart, but as long as users are not creating
symlinks by hand, Dartium should detect if the paths are wrong.
When we switch to start using pub-serve by default, we should be able to go back
to the web-ui style of using "package:" urls directly in HTML.
R=jmesserly@google.com, kustermann@google.com
Committed: https://code.google.com/p/dart/source/detail?r=32170
Total comments: 4
Total comments: 9
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+169 lines, -199 lines) |
Patch |
 |
M |
pkg/pkg.status
|
View
|
1
|
4 chunks |
+16 lines, -2 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/lib/e.html
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/lib/f.html
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
D |
pkg/polymer/example/canonicalization/test/canonicalization_deploy_test.dart
|
View
|
|
1 chunk |
+0 lines, -39 lines |
0 comments
|
Download
|
 |
D |
pkg/polymer/example/canonicalization/test/canonicalization_deploy_test.html
|
View
|
|
1 chunk |
+0 lines, -18 lines |
0 comments
|
Download
|
 |
D |
pkg/polymer/example/canonicalization/test/canonicalization_test.dart
|
View
|
|
1 chunk |
+0 lines, -35 lines |
0 comments
|
Download
|
 |
D |
pkg/polymer/example/canonicalization/test/canonicalization_test.html
|
View
|
|
1 chunk |
+0 lines, -18 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/deploy2_test.dart
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/deploy2_test.html
|
View
|
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/deploy3_test.dart
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/deploy3_test.html
|
View
|
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/deploy_test.dart
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/deploy_test.html
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/dev2_test.dart
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/dev2_test.html
|
View
|
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/dev3_test.dart
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/dev3_test.html
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/dev_test.dart
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/dev_test.html
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/dir/deploy2_test.dart
|
View
|
|
1 chunk |
+4 lines, -4 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/dir/deploy2_test.html
|
View
|
|
1 chunk |
+3 lines, -3 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/dir/deploy_test.dart
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/dir/deploy_test.html
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/dir/dev2_test.dart
|
View
|
|
1 chunk |
+4 lines, -4 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/dir/dev2_test.html
|
View
|
|
1 chunk |
+3 lines, -3 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/dir/dev_test.dart
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization/test/dir/dev_test.html
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization2/lib/a.dart
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization2/lib/a.html
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization2/lib/b.dart
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization2/lib/b.html
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization2/lib/c.dart
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization2/lib/d.dart
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization2/lib/g.html
|
View
|
|
1 chunk |
+5 lines, -1 line |
0 comments
|
Download
|
 |
A |
pkg/polymer/example/canonicalization2/pubspec.yaml
|
View
|
1
|
1 chunk |
+6 lines, -0 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization2/test/bad_lib_import2_negative_test.dart
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization2/test/bad_lib_import2_negative_test.html
|
View
|
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization2/test/bad_lib_import_negative_test.dart
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization2/test/bad_lib_import_negative_test.html
|
View
|
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization3/lib/a.dart
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization3/lib/a.html
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization3/lib/b.dart
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization3/lib/b.html
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization3/lib/c.dart
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization3/lib/d.dart
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization3/lib/g.html
|
View
|
|
1 chunk |
+5 lines, -1 line |
0 comments
|
Download
|
 |
A |
pkg/polymer/example/canonicalization3/pubspec.yaml
|
View
|
1
|
1 chunk |
+6 lines, -0 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization3/test/bad_lib_import2_negative_test.dart
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization3/test/bad_lib_import2_negative_test.html
|
View
|
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization3/test/bad_lib_import_negative_test.dart
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
A + |
pkg/polymer/example/canonicalization3/test/bad_lib_import_negative_test.html
|
View
|
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
M |
pkg/polymer/lib/src/build/common.dart
|
View
|
|
2 chunks |
+40 lines, -18 lines |
0 comments
|
Download
|
 |
M |
pkg/polymer/lib/src/build/import_inliner.dart
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
pkg/polymer/lib/src/loader.dart
|
View
|
|
2 chunks |
+20 lines, -8 lines |
0 comments
|
Download
|
 |
M |
pkg/polymer/pubspec.yaml
|
View
|
1
2
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
tools/testing/dart/test_controller.js
|
View
|
1
2
3
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
 |
M |
tools/testing/dart/test_suite.dart
|
View
|
1
|
3 chunks |
+26 lines, -23 lines |
0 comments
|
Download
|
Total messages: 9 (0 generated)
|