Merge master

cujojs · Nov 10, 2013 · 66bf4e1 · 66bf4e1
2 parents 950556a + 42b9cbb
commit 66bf4e1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+### 0.10.2
+
+* Experimental support for relative module ids in wire specs in all supported environments.
+* Fix version mismatch in `bower.json`
+
 ### 0.10.1
 
 * Fixes for using wire factory within a nested component. ([#123](https://github.com/cujojs/wire/issues/123), [#128](https://github.com/cujojs/wire/issues/128), thanks [@halfninety](https://github.com/halfninety))

diff --git a/docs/concepts.md b/docs/concepts.md
@@ -89,7 +89,7 @@ define({
 	helloWired: {
 
 		create: {
-			module: 'app/HelloWire',
+			module: 'app/HelloWired',
 			args: { $ref: 'dom:first!.hello' }
 		},
 
@@ -146,7 +146,7 @@ define({
 	helloWired: {
 
 		create: {
-			module: 'app/HelloWire',
+			module: 'app/HelloWired',
 			args: { $ref: 'dom:first!.hello' }
 		},
 

diff --git a/test/node/version-test.js b/test/node/version-test.js
@@ -10,12 +10,12 @@
 	bowerJson = require('../../bower');
 	packageJson = require('../../package');
 
-	buster.testCase('rest/version', {
+	buster.testCase('wire/version', {
 		'should have the same name for package.json and component.json': function () {
 			assert.same(bowerJson.name, packageJson.name);
 		},
 		'should have the same version for package.json and component.json': function () {
 			assert.same(bowerJson.version, packageJson.version);
 		}
 	});
-}(require('buster')));
+}(require('buster')));