diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts index 35bb2e9859..1f48424c95 100644 --- a/src/generators/Generator.ts +++ b/src/generators/Generator.ts @@ -626,10 +626,6 @@ export default class Generator { addDeclaration('store', templateProperties.store.value); } - if (templateProperties.immutable) { - addDeclaration('immutable', templateProperties.immutable.value); - } - if (templateProperties.tag) { this.tag = templateProperties.tag.value.value; } diff --git a/src/generators/dom/index.ts b/src/generators/dom/index.ts index 5f91cb5123..3cd8d1d0bd 100644 --- a/src/generators/dom/index.ts +++ b/src/generators/dom/index.ts @@ -174,7 +174,7 @@ export default function dom( ? `@proto` : deindent` { - ${['destroy', 'get', 'fire', 'observe', 'on', 'set', 'teardown', '_set', '_mount', '_unmount'] + ${['destroy', 'get', 'fire', 'observe', 'on', 'set', 'teardown', '_set', '_mount', '_unmount', '_differs'] .map(n => `${n}: @${n === 'teardown' ? 'destroy' : n}`) .join(',\n')} }`; @@ -208,10 +208,6 @@ export default function dom( ${options.dev && !generator.customElement && `if (!options || (!options.target && !options.root)) throw new Error("'target' is a required option");`} @init(this, options); - ${options.immutable && deindent` - if (options.immutable !== undefined ? options.immutable : ${templateProperties.immutable && '%immutable' || 'this.root.options.immutable'}) { - this._differs = @differsImmutable; - }`} ${templateProperties.store && `this.store = %store();`} ${generator.usesRefs && `this.refs = {};`} this._state = @assign(${initialState.join(', ')}); @@ -364,6 +360,8 @@ export default function dom( `); } + const immutable = templateProperties.immutable ? templateProperties.immutable.value.value : options.immutable; + builder.addBlock(deindent` ${options.dev && deindent` ${name}.prototype._checkReadOnly = function _checkReadOnly(newState) { @@ -383,6 +381,8 @@ export default function dom( ${templateProperties.setup && `%setup(${name});`} ${templateProperties.preload && `${name}.preload = %preload;`} + + ${immutable && `${name}.prototype._differs = @_differsImmutable;`} `); const usedHelpers = new Set(); diff --git a/src/shared/index.js b/src/shared/index.js index 8996ee378a..cf953e4bf1 100644 --- a/src/shared/index.js +++ b/src/shared/index.js @@ -25,11 +25,11 @@ export function destroyDev(detach) { }; } -export function differs(a, b) { +export function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } -export function differsImmutable(a, b) { +export function _differsImmutable(a, b) { return a != a ? b == b : a !== b; } @@ -72,7 +72,6 @@ export function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -216,7 +215,8 @@ export var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; export var protoDev = { @@ -230,5 +230,6 @@ export var protoDev = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; diff --git a/store.js b/store.js index 853d36a52a..63a99cca05 100644 --- a/store.js +++ b/store.js @@ -1,8 +1,8 @@ import { assign, blankObject, - differs, - differsImmutable, + _differs, + _differsImmutable, dispatchObservers, get, observe @@ -17,7 +17,7 @@ function Store(state, options) { this._sortedComputedProperties = []; this._state = assign({}, state); - this._differs = options && options.immutable ? differsImmutable : differs; + this._differs = options && options.immutable ? _differsImmutable : _differs; } assign(Store.prototype, { diff --git a/test/js/samples/collapses-text-around-comments/expected-bundle.js b/test/js/samples/collapses-text-around-comments/expected-bundle.js index 72b12b5ef4..decaa3ca37 100644 --- a/test/js/samples/collapses-text-around-comments/expected-bundle.js +++ b/test/js/samples/collapses-text-around-comments/expected-bundle.js @@ -51,7 +51,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -94,7 +94,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -190,7 +189,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/component-static-immutable/expected-bundle.js b/test/js/samples/component-static-immutable/expected-bundle.js index 500322d902..18ca967e92 100644 --- a/test/js/samples/component-static-immutable/expected-bundle.js +++ b/test/js/samples/component-static-immutable/expected-bundle.js @@ -27,11 +27,11 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } -function differsImmutable(a, b) { +function _differsImmutable(a, b) { return a != a ? b == b : a !== b; } @@ -74,7 +74,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -170,14 +169,13 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ var Nested = window.Nested; -var immutable = true; - function create_main_fragment(state, component) { var nested = new Nested({ @@ -208,9 +206,6 @@ function create_main_fragment(state, component) { function SvelteComponent(options) { init(this, options); - if (options.immutable !== undefined ? options.immutable : immutable) { - this._differs = differsImmutable; - } this._state = assign({}, options.data); if (!options.root) { @@ -235,4 +230,6 @@ function SvelteComponent(options) { assign(SvelteComponent.prototype, proto); +SvelteComponent.prototype._differs = _differsImmutable; + export default SvelteComponent; diff --git a/test/js/samples/component-static-immutable/expected.js b/test/js/samples/component-static-immutable/expected.js index 811d5c50c4..028dc9e64c 100644 --- a/test/js/samples/component-static-immutable/expected.js +++ b/test/js/samples/component-static-immutable/expected.js @@ -1,10 +1,8 @@ /* generated by Svelte vX.Y.Z */ -import { assign, callAll, differsImmutable, init, noop, proto } from "svelte/shared.js"; +import { _differsImmutable, assign, callAll, init, noop, proto } from "svelte/shared.js"; var Nested = window.Nested; -var immutable = true; - function create_main_fragment(state, component) { var nested = new Nested({ @@ -35,9 +33,6 @@ function create_main_fragment(state, component) { function SvelteComponent(options) { init(this, options); - if (options.immutable !== undefined ? options.immutable : immutable) { - this._differs = differsImmutable; - } this._state = assign({}, options.data); if (!options.root) { @@ -61,4 +56,6 @@ function SvelteComponent(options) { } assign(SvelteComponent.prototype, proto); + +SvelteComponent.prototype._differs = _differsImmutable; export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/component-static-immutable2/expected-bundle.js b/test/js/samples/component-static-immutable2/expected-bundle.js index abab18060b..18ca967e92 100644 --- a/test/js/samples/component-static-immutable2/expected-bundle.js +++ b/test/js/samples/component-static-immutable2/expected-bundle.js @@ -27,11 +27,11 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } -function differsImmutable(a, b) { +function _differsImmutable(a, b) { return a != a ? b == b : a !== b; } @@ -74,7 +74,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -170,7 +169,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ @@ -206,9 +206,6 @@ function create_main_fragment(state, component) { function SvelteComponent(options) { init(this, options); - if (options.immutable !== undefined ? options.immutable : this.root.options.immutable) { - this._differs = differsImmutable; - } this._state = assign({}, options.data); if (!options.root) { @@ -233,4 +230,6 @@ function SvelteComponent(options) { assign(SvelteComponent.prototype, proto); +SvelteComponent.prototype._differs = _differsImmutable; + export default SvelteComponent; diff --git a/test/js/samples/component-static-immutable2/expected.js b/test/js/samples/component-static-immutable2/expected.js index 96dcb16874..028dc9e64c 100644 --- a/test/js/samples/component-static-immutable2/expected.js +++ b/test/js/samples/component-static-immutable2/expected.js @@ -1,5 +1,5 @@ /* generated by Svelte vX.Y.Z */ -import { assign, callAll, differsImmutable, init, noop, proto } from "svelte/shared.js"; +import { _differsImmutable, assign, callAll, init, noop, proto } from "svelte/shared.js"; var Nested = window.Nested; @@ -33,9 +33,6 @@ function create_main_fragment(state, component) { function SvelteComponent(options) { init(this, options); - if (options.immutable !== undefined ? options.immutable : this.root.options.immutable) { - this._differs = differsImmutable; - } this._state = assign({}, options.data); if (!options.root) { @@ -59,4 +56,6 @@ function SvelteComponent(options) { } assign(SvelteComponent.prototype, proto); + +SvelteComponent.prototype._differs = _differsImmutable; export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/component-static/expected-bundle.js b/test/js/samples/component-static/expected-bundle.js index b89784944c..d5e2f579d0 100644 --- a/test/js/samples/component-static/expected-bundle.js +++ b/test/js/samples/component-static/expected-bundle.js @@ -27,7 +27,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -70,7 +70,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -166,7 +165,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/computed-collapsed-if/expected-bundle.js b/test/js/samples/computed-collapsed-if/expected-bundle.js index b88fbb5e47..227debe9fc 100644 --- a/test/js/samples/computed-collapsed-if/expected-bundle.js +++ b/test/js/samples/computed-collapsed-if/expected-bundle.js @@ -27,7 +27,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -70,7 +70,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -166,7 +165,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/css-media-query/expected-bundle.js b/test/js/samples/css-media-query/expected-bundle.js index 606b5dc9e8..2512dd683d 100644 --- a/test/js/samples/css-media-query/expected-bundle.js +++ b/test/js/samples/css-media-query/expected-bundle.js @@ -47,7 +47,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -90,7 +90,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -186,7 +185,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js b/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js index 0cc67aa9bc..025b2a06b7 100644 --- a/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js +++ b/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js @@ -39,7 +39,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -82,7 +82,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -178,7 +177,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/deconflict-globals/expected-bundle.js b/test/js/samples/deconflict-globals/expected-bundle.js index 1a1e25de5a..30eedf2673 100644 --- a/test/js/samples/deconflict-globals/expected-bundle.js +++ b/test/js/samples/deconflict-globals/expected-bundle.js @@ -27,7 +27,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -70,7 +70,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -166,7 +165,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/do-use-dataset/expected-bundle.js b/test/js/samples/do-use-dataset/expected-bundle.js index e3532c976a..70493d183f 100644 --- a/test/js/samples/do-use-dataset/expected-bundle.js +++ b/test/js/samples/do-use-dataset/expected-bundle.js @@ -43,7 +43,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -86,7 +86,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -182,7 +181,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js b/test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js index df67cf01e8..2db589bed2 100644 --- a/test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js +++ b/test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js @@ -47,7 +47,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -90,7 +90,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -186,7 +185,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/dont-use-dataset-in-svg/expected-bundle.js b/test/js/samples/dont-use-dataset-in-svg/expected-bundle.js index 55fd993d32..ece99df798 100644 --- a/test/js/samples/dont-use-dataset-in-svg/expected-bundle.js +++ b/test/js/samples/dont-use-dataset-in-svg/expected-bundle.js @@ -47,7 +47,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -90,7 +90,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -186,7 +185,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/each-block-changed-check/expected-bundle.js b/test/js/samples/each-block-changed-check/expected-bundle.js index 524789a51a..12515c36d2 100644 --- a/test/js/samples/each-block-changed-check/expected-bundle.js +++ b/test/js/samples/each-block-changed-check/expected-bundle.js @@ -59,7 +59,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -102,7 +102,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -198,7 +197,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/event-handlers-custom/expected-bundle.js b/test/js/samples/event-handlers-custom/expected-bundle.js index 860d249ee0..d7fa7e6e95 100644 --- a/test/js/samples/event-handlers-custom/expected-bundle.js +++ b/test/js/samples/event-handlers-custom/expected-bundle.js @@ -39,7 +39,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -82,7 +82,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -178,7 +177,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/head-no-whitespace/expected-bundle.js b/test/js/samples/head-no-whitespace/expected-bundle.js index 96d3b06cc8..3f92f6f0e6 100644 --- a/test/js/samples/head-no-whitespace/expected-bundle.js +++ b/test/js/samples/head-no-whitespace/expected-bundle.js @@ -39,7 +39,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -82,7 +82,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -178,7 +177,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/if-block-no-update/expected-bundle.js b/test/js/samples/if-block-no-update/expected-bundle.js index 29e8a05a8b..1ed2b45d7d 100644 --- a/test/js/samples/if-block-no-update/expected-bundle.js +++ b/test/js/samples/if-block-no-update/expected-bundle.js @@ -43,7 +43,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -86,7 +86,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -182,7 +181,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/if-block-simple/expected-bundle.js b/test/js/samples/if-block-simple/expected-bundle.js index 80a2a1475c..3cd824f3fe 100644 --- a/test/js/samples/if-block-simple/expected-bundle.js +++ b/test/js/samples/if-block-simple/expected-bundle.js @@ -43,7 +43,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -86,7 +86,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -182,7 +181,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/inline-style-optimized-multiple/expected-bundle.js b/test/js/samples/inline-style-optimized-multiple/expected-bundle.js index 4348f9367e..f8aee9f033 100644 --- a/test/js/samples/inline-style-optimized-multiple/expected-bundle.js +++ b/test/js/samples/inline-style-optimized-multiple/expected-bundle.js @@ -43,7 +43,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -86,7 +86,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -182,7 +181,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/inline-style-optimized-url/expected-bundle.js b/test/js/samples/inline-style-optimized-url/expected-bundle.js index 017dc960fc..e0a3f24bb7 100644 --- a/test/js/samples/inline-style-optimized-url/expected-bundle.js +++ b/test/js/samples/inline-style-optimized-url/expected-bundle.js @@ -43,7 +43,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -86,7 +86,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -182,7 +181,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/inline-style-optimized/expected-bundle.js b/test/js/samples/inline-style-optimized/expected-bundle.js index fc1ba783cc..07aebfeae2 100644 --- a/test/js/samples/inline-style-optimized/expected-bundle.js +++ b/test/js/samples/inline-style-optimized/expected-bundle.js @@ -43,7 +43,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -86,7 +86,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -182,7 +181,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/inline-style-unoptimized/expected-bundle.js b/test/js/samples/inline-style-unoptimized/expected-bundle.js index 3958d3862b..c70b833708 100644 --- a/test/js/samples/inline-style-unoptimized/expected-bundle.js +++ b/test/js/samples/inline-style-unoptimized/expected-bundle.js @@ -43,7 +43,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -86,7 +86,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -182,7 +181,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/input-without-blowback-guard/expected-bundle.js b/test/js/samples/input-without-blowback-guard/expected-bundle.js index dbed2a12c0..bc3ccb5e8a 100644 --- a/test/js/samples/input-without-blowback-guard/expected-bundle.js +++ b/test/js/samples/input-without-blowback-guard/expected-bundle.js @@ -47,7 +47,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -90,7 +90,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -186,7 +185,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/legacy-input-type/expected-bundle.js b/test/js/samples/legacy-input-type/expected-bundle.js index 5b49b4995a..510d075af8 100644 --- a/test/js/samples/legacy-input-type/expected-bundle.js +++ b/test/js/samples/legacy-input-type/expected-bundle.js @@ -45,7 +45,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -88,7 +88,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -184,7 +183,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/legacy-quote-class/expected-bundle.js b/test/js/samples/legacy-quote-class/expected-bundle.js index db13a962c9..b675d5bbff 100644 --- a/test/js/samples/legacy-quote-class/expected-bundle.js +++ b/test/js/samples/legacy-quote-class/expected-bundle.js @@ -62,7 +62,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -105,7 +105,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -201,7 +200,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/media-bindings/expected-bundle.js b/test/js/samples/media-bindings/expected-bundle.js index 230454d955..7a491eb083 100644 --- a/test/js/samples/media-bindings/expected-bundle.js +++ b/test/js/samples/media-bindings/expected-bundle.js @@ -55,7 +55,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -98,7 +98,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -194,7 +193,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/non-imported-component/expected-bundle.js b/test/js/samples/non-imported-component/expected-bundle.js index b037ff3ad4..63c4bb2cc1 100644 --- a/test/js/samples/non-imported-component/expected-bundle.js +++ b/test/js/samples/non-imported-component/expected-bundle.js @@ -41,7 +41,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -84,7 +84,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -180,7 +179,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js index c0d41a7c76..7a9ead03a6 100644 --- a/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js +++ b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js @@ -27,7 +27,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -70,7 +70,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -166,7 +165,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/setup-method/expected-bundle.js b/test/js/samples/setup-method/expected-bundle.js index d1b04e43a5..9c075261d4 100644 --- a/test/js/samples/setup-method/expected-bundle.js +++ b/test/js/samples/setup-method/expected-bundle.js @@ -27,7 +27,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -70,7 +70,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -166,7 +165,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/svg-title/expected-bundle.js b/test/js/samples/svg-title/expected-bundle.js index 21f8467d3b..59cb85c738 100644 --- a/test/js/samples/svg-title/expected-bundle.js +++ b/test/js/samples/svg-title/expected-bundle.js @@ -47,7 +47,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -90,7 +90,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -186,7 +185,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/title/expected-bundle.js b/test/js/samples/title/expected-bundle.js index bebf5e4466..8379f100e0 100644 --- a/test/js/samples/title/expected-bundle.js +++ b/test/js/samples/title/expected-bundle.js @@ -27,7 +27,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -70,7 +70,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -166,7 +165,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/use-elements-as-anchors/expected-bundle.js b/test/js/samples/use-elements-as-anchors/expected-bundle.js index f7302d8bd7..f5cf94ef85 100644 --- a/test/js/samples/use-elements-as-anchors/expected-bundle.js +++ b/test/js/samples/use-elements-as-anchors/expected-bundle.js @@ -51,7 +51,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -94,7 +94,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -190,7 +189,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/js/samples/window-binding-scroll/expected-bundle.js b/test/js/samples/window-binding-scroll/expected-bundle.js index f522e5f96d..e3d8e74030 100644 --- a/test/js/samples/window-binding-scroll/expected-bundle.js +++ b/test/js/samples/window-binding-scroll/expected-bundle.js @@ -47,7 +47,7 @@ function destroy(detach) { this._fragment = this._state = null; } -function differs(a, b) { +function _differs(a, b) { return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function'); } @@ -90,7 +90,6 @@ function init(component, options) { component._observers = { pre: blankObject(), post: blankObject() }; component._handlers = blankObject(); component._bind = options._bind; - component._differs = differs; component.options = options; component.root = options.root || component; @@ -186,7 +185,8 @@ var proto = { _recompute: noop, _set: _set, _mount: _mount, - _unmount: _unmount + _unmount: _unmount, + _differs: _differs }; /* generated by Svelte vX.Y.Z */ diff --git a/test/runtime/index.js b/test/runtime/index.js index 8ec4c5194a..aaafaff21b 100644 --- a/test/runtime/index.js +++ b/test/runtime/index.js @@ -161,8 +161,7 @@ describe("runtime", () => { target, hydrate, data: config.data, - store: (config.store !== true && config.store), - immutable: config.immutable + store: (config.store !== true && config.store) }, config.options || {}); const component = new SvelteComponent(options);