Merge pull request #2051 from thgh/v2

Fix "this._recompute is not a function"
6 years ago · 7f7e1bec8b
parent c0fb21dee9 ae4adf0040
commit 7f7e1bec8b
7 changed files with 26 additions and 5 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "svelte",
-  "version": "2.15.1",
+  "version": "2.16.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/src/compile/render-dom/index.ts
+++ b/src/compile/render-dom/index.ts
@ -289,8 +289,6 @@ export default function dom(
 					target.insertBefore(this, anchor);
 				}
 			});
-
-			customElements.define("${component.tag}", ${name});
 		`);
 	} else {
 		builder.addBlock(deindent`
@ -328,6 +326,10 @@ export default function dom(
 		${immutable && `${name}.prototype._differs = @_differsImmutable;`}
 	`);

+	if (component.customElement) {
+		builder.addBlock(`customElements.define("${component.tag}", ${name});`);
+	}
+
 	let result = builder.toString();

 	return component.generate(result, options, {
--- a/test/cli/samples/custom-element/expected/Main.js
+++ b/test/cli/samples/custom-element/expected/Main.js
@ -67,10 +67,10 @@ assign(Main.prototype, {
 	}
 });

-customElements.define("my-element", Main);
-
 Main.prototype._recompute = noop;

+customElements.define("my-element", Main);
+
 function createElement(name) {
 	return document.createElement(name);
 }
--- a/test/custom-elements/index.js
+++ b/test/custom-elements/index.js
@ -7,6 +7,7 @@ import { addLineNumbers, loadConfig, loadSvelte } from "../helpers.js";

 const page = `
 <body>
+	<custom-element name="world"></custom-element>
 	<main></main>
 	<script src='/bundle.js'></script>
 </body>
--- a/test/custom-elements/samples/initial-props/main.html
+++ b/test/custom-elements/samples/initial-props/main.html
@ -0,0 +1,8 @@
+<p>Hello {name}</p>
+
+<script>
+  export default {
+    tag: 'custom-element',
+    props: ['name']
+  };
+</script>
--- a/test/custom-elements/samples/initial-props/test.js
+++ b/test/custom-elements/samples/initial-props/test.js
@ -0,0 +1,8 @@
+import * as assert from 'assert';
+import './main.html';
+
+export default function (target) {
+  const el = target.ownerDocument.body.querySelector('custom-element');
+  const p = el.shadowRoot.querySelector('p');
+  assert.equal(p.textContent, 'Hello world');
+}
--- a/test/js/samples/css-shadow-dom-keyframes/expected.js
+++ b/test/js/samples/css-shadow-dom-keyframes/expected.js
@ -59,5 +59,7 @@ assign(SvelteComponent.prototype, {
 	}
 });

+
+
 customElements.define("custom-element", SvelteComponent);
 export default SvelteComponent;