Merge branch 'master' into fix/hot-loader

preactjs · May 21, 2019 · 4e76ead · 4e76ead
2 parents ebe5417 + c4155e3
commit 4e76ead
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/debug/src/debug.js b/debug/src/debug.js
@@ -140,6 +140,12 @@ export function initDebug() {
 	};
 
 	options.vnode = (vnode) => {
+		let source;
+		if (vnode.props && vnode.props.__source) {
+			source = vnode.props.__source;
+			delete vnode.props.__source;
+		}
+		vnode.__source = source;
 		Object.defineProperties(vnode, deprecatedAttributes);
 		if (oldVnode) oldVnode(vnode);
 	};

diff --git a/debug/test/browser/debug.test.js b/debug/test/browser/debug.test.js
@@ -82,6 +82,20 @@ describe('debug', () => {
 		expect(fn).to.throw(/createElement/);
 	});
 
+	it('should add __source to the vnode in debug mode.', () => {
+		const vnode = h('div', {
+			__source: {
+				fileName: 'div.jsx',
+				lineNumber: 3
+			}
+		});
+		expect(vnode.__source).to.deep.equal({
+			fileName: 'div.jsx',
+			lineNumber: 3
+		});
+		expect(vnode.props.__source).to.be.undefined;
+	});
+
 	it('should throw an error when using a hook outside a render', () => {
 		class App extends Component {
 			componentWillMount() {