msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

Merge pull request #1552 from PaulMaly/1538-store-inheriting

Browse Source 
Fix for #1538
pull/1556/head
Rich Harris 7 years ago committed by GitHub
parent 9cd5dd9fbc 52ece0b5f0
commit 4bd0022363
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
58 changed files with 77 additions and 62 deletions
Show Stats Download Patch File Download Diff File

2
src/compile/nodes/Component.ts
Unescape View File

@ -123,7 +123,7 @@ export default class Component extends Node {
const name = this.var;
const componentInitProperties = [`root: #component.root`];
const componentInitProperties = [`root: #component.root`, `store: #component.store`];
if (this.children.length > 0) {
const slots = Array.from(this._slots).map(name => `${quoteNameIfNecessary(name)}: @createFragment()`);

2
src/shared/index.js
Unescape View File

@ -64,7 +64,7 @@ export function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
export function on(eventName, handler) {

2
test/cli/samples/basic/expected/Main.js
Unescape View File

@ -69,7 +69,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function assign(tar, src) {

2
test/cli/samples/custom-element/expected/Main.js
Unescape View File

@ -90,7 +90,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function assign(tar, src) {

2
test/cli/samples/dev/expected/Main.js
Unescape View File

@ -93,7 +93,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function assign(tar, src) {

7
test/cli/samples/dir-sourcemap/expected/Main.js
Unescape View File

@ -1,4 +1,4 @@
/* src/Main.html generated by Svelte vx.y.z */
/* src/Main.html generated by Svelte v2.7.2 */
import Widget from './Widget.html';
@ -6,7 +6,8 @@ import Widget from './Widget.html';
function create_main_fragment(component, ctx) {
var widget = new Widget({
root: component.root
root: component.root,
store: component.store
});
return {
@ -72,7 +73,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function assign(tar, src) {

2
test/cli/samples/dir-sourcemap/expected/Main.js.map
Unescape View File

@ -1 +1 @@
{"version":3,"file":"Main.js","sources":["../src/Main.html"],"sourcesContent":["<Widget/>\n\n<script>\n\timport Widget from './Widget.html';\n\n\texport default {\n\t\tcomponents: {\n\t\t\tWidget\n\t\t}\n\t};\n</script>"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
{"version":3,"file":"Main.js","sources":["../src/Main.html"],"sourcesContent":["<Widget/>\n\n<script>\n\timport Widget from './Widget.html';\n\n\texport default {\n\t\tcomponents: {\n\t\t\tWidget\n\t\t}\n\t};\n</script>"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

4
test/cli/samples/dir-sourcemap/expected/Widget.js
Unescape View File

@ -1,4 +1,4 @@
/* src/Widget.html generated by Svelte vx.y.z */
/* src/Widget.html generated by Svelte v2.7.2 */
function create_main_fragment(component, ctx) {
var p;
@ -69,7 +69,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function assign(tar, src) {

5
test/cli/samples/dir-subdir/expected/Main.js
Unescape View File

@ -6,7 +6,8 @@ import Widget from './widget/Widget.html';
function create_main_fragment(component, ctx) {
var widget = new Widget({
root: component.root
root: component.root,
store: component.store
});
return {
@ -72,7 +73,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function assign(tar, src) {

2
test/cli/samples/dir-subdir/expected/widget/Widget.js
Unescape View File

@ -69,7 +69,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function assign(tar, src) {

5
test/cli/samples/dir/expected/Main.js
Unescape View File

@ -6,7 +6,8 @@ import Widget from './Widget.html';
function create_main_fragment(component, ctx) {
var widget = new Widget({
root: component.root
root: component.root,
store: component.store
});
return {
@ -72,7 +73,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function assign(tar, src) {

2
test/cli/samples/dir/expected/Widget.js
Unescape View File

@ -69,7 +69,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function assign(tar, src) {

2
test/cli/samples/globals/expected/Main.js
Unescape View File

@ -90,7 +90,7 @@ var Main = (function(answer) { "use strict";
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function assign(tar, src) {

2
test/cli/samples/sourcemap-inline/expected/Main.js
Unescape View File

@ -69,7 +69,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function assign(tar, src) {

2
test/cli/samples/sourcemap/expected/Main.js
Unescape View File

@ -69,7 +69,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function assign(tar, src) {

2
test/cli/samples/store/expected/Main.js
Unescape View File

@ -85,7 +85,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function assign(tar, src) {

2
test/js/samples/action/expected-bundle.js
Unescape View File

@ -61,7 +61,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/bind-width-height/expected-bundle.js
Unescape View File

@ -93,7 +93,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/collapses-text-around-comments/expected-bundle.js
Unescape View File

@ -69,7 +69,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

3
test/js/samples/component-static-array/expected-bundle.js
Unescape View File

@ -49,7 +49,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {
@ -124,6 +124,7 @@ function create_main_fragment(component, ctx) {
var nested_initial_data = { foo: [1, 2, 3] };
var nested = new Nested({
root: component.root,
store: component.store,
data: nested_initial_data
});

1
test/js/samples/component-static-array/expected.js
Unescape View File

@ -8,6 +8,7 @@ function create_main_fragment(component, ctx) {
var nested_initial_data = { foo: [1, 2, 3] };
var nested = new Nested({
root: component.root,
store: component.store,
data: nested_initial_data
});

3
test/js/samples/component-static-immutable/expected-bundle.js
Unescape View File

@ -53,7 +53,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {
@ -128,6 +128,7 @@ function create_main_fragment(component, ctx) {
var nested_initial_data = { foo: "bar" };
var nested = new Nested({
root: component.root,
store: component.store,
data: nested_initial_data
});

1
test/js/samples/component-static-immutable/expected.js
Unescape View File

@ -8,6 +8,7 @@ function create_main_fragment(component, ctx) {
var nested_initial_data = { foo: "bar" };
var nested = new Nested({
root: component.root,
store: component.store,
data: nested_initial_data
});

3
test/js/samples/component-static-immutable2/expected-bundle.js
Unescape View File

@ -53,7 +53,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {
@ -128,6 +128,7 @@ function create_main_fragment(component, ctx) {
var nested_initial_data = { foo: "bar" };
var nested = new Nested({
root: component.root,
store: component.store,
data: nested_initial_data
});

1
test/js/samples/component-static-immutable2/expected.js
Unescape View File

@ -8,6 +8,7 @@ function create_main_fragment(component, ctx) {
var nested_initial_data = { foo: "bar" };
var nested = new Nested({
root: component.root,
store: component.store,
data: nested_initial_data
});

3
test/js/samples/component-static/expected-bundle.js
Unescape View File

@ -49,7 +49,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {
@ -124,6 +124,7 @@ function create_main_fragment(component, ctx) {
var nested_initial_data = { foo: "bar" };
var nested = new Nested({
root: component.root,
store: component.store,
data: nested_initial_data
});

1
test/js/samples/component-static/expected.js
Unescape View File

@ -8,6 +8,7 @@ function create_main_fragment(component, ctx) {
var nested_initial_data = { foo: "bar" };
var nested = new Nested({
root: component.root,
store: component.store,
data: nested_initial_data
});

2
test/js/samples/computed-collapsed-if/expected-bundle.js
Unescape View File

@ -49,7 +49,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/css-media-query/expected-bundle.js
Unescape View File

@ -65,7 +65,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/css-shadow-dom-keyframes/expected-bundle.js
Unescape View File

@ -61,7 +61,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/deconflict-builtins/expected-bundle.js
Unescape View File

@ -79,7 +79,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/deconflict-globals/expected-bundle.js
Unescape View File

@ -54,7 +54,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/dev-warning-missing-data-computed/expected-bundle.js
Unescape View File

@ -82,7 +82,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/do-use-dataset/expected-bundle.js
Unescape View File

@ -65,7 +65,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js
Unescape View File

@ -69,7 +69,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/dont-use-dataset-in-svg/expected-bundle.js
Unescape View File

@ -69,7 +69,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/each-block-changed-check/expected-bundle.js
Unescape View File

@ -81,7 +81,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/each-block-keyed-animated/expected-bundle.js
Unescape View File

@ -391,7 +391,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/each-block-keyed/expected-bundle.js
Unescape View File

@ -164,7 +164,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/event-handlers-custom/expected-bundle.js
Unescape View File

@ -61,7 +61,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/head-no-whitespace/expected-bundle.js
Unescape View File

@ -61,7 +61,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/if-block-no-update/expected-bundle.js
Unescape View File

@ -65,7 +65,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/if-block-simple/expected-bundle.js
Unescape View File

@ -65,7 +65,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/inline-style-optimized-multiple/expected-bundle.js
Unescape View File

@ -65,7 +65,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/inline-style-optimized-url/expected-bundle.js
Unescape View File

@ -65,7 +65,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/inline-style-optimized/expected-bundle.js
Unescape View File

@ -65,7 +65,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/inline-style-unoptimized/expected-bundle.js
Unescape View File

@ -65,7 +65,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/input-range/expected-bundle.js
Unescape View File

@ -77,7 +77,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/input-without-blowback-guard/expected-bundle.js
Unescape View File

@ -73,7 +73,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/legacy-input-type/expected-bundle.js
Unescape View File

@ -67,7 +67,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/media-bindings/expected-bundle.js
Unescape View File

@ -77,7 +77,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

8
test/js/samples/non-imported-component/expected-bundle.js
Unescape View File

@ -63,7 +63,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {
@ -137,11 +137,13 @@ function create_main_fragment(component, ctx) {
var text;
var imported = new Imported({
root: component.root
root: component.root,
store: component.store
});
var nonimported = new NonImported({
root: component.root
root: component.root,
store: component.store
});
return {

6
test/js/samples/non-imported-component/expected.js
Unescape View File

@ -8,11 +8,13 @@ function create_main_fragment(component, ctx) {
var text;
var imported = new Imported({
root: component.root
root: component.root,
store: component.store
});
var nonimported = new NonImported({
root: component.root
root: component.root,
store: component.store
});
return {

2
test/js/samples/setup-method/expected-bundle.js
Unescape View File

@ -49,7 +49,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/svg-title/expected-bundle.js
Unescape View File

@ -69,7 +69,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/title/expected-bundle.js
Unescape View File

@ -49,7 +49,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/use-elements-as-anchors/expected-bundle.js
Unescape View File

@ -73,7 +73,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

2
test/js/samples/window-binding-scroll/expected-bundle.js
Unescape View File

@ -69,7 +69,7 @@ function init(component, options) {
component.options = options;
component.root = options.root || component;
component.store = component.root.store || options.store;
component.store = options.store || component.root.store;
}
function on(eventName, handler) {

Write Preview
Loading…
Cancel
Save