Skip to content
This repository was archived by the owner on Dec 16, 2021. It is now read-only.

use loopGuardTimeout #58

Merged
merged 2 commits into from
Nov 13, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/CodeMirror.svelte
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
let _CodeMirror;
if (is_browser) {
codemirror_promise = import(/* webpackChunkName: "codemirror" */ './codemirror.js');
codemirror_promise = import('./codemirror.js');
codemirror_promise.then(mod => {
_CodeMirror = mod.default;
@@ -14,11 +14,10 @@
</script>

<script>
import { onMount, beforeUpdate, createEventDispatcher, getContext } from 'svelte';
import { onMount, createEventDispatcher } from 'svelte';
import Message from './Message.svelte';
const dispatch = createEventDispatcher();
const { navigate } = getContext('REPL');
export let readonly = false;
export let errorLoc = null;
2 changes: 1 addition & 1 deletion src/Input/ComponentSelector.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import { getContext, createEventDispatcher } from 'svelte';
import { getContext } from 'svelte';
export let handle_select;
2 changes: 1 addition & 1 deletion src/Input/ModuleEditor.svelte
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
import CodeMirror from '../CodeMirror.svelte';
import Message from '../Message.svelte';
const { bundle, selected, handle_change, navigate, register_module_editor } = getContext('REPL');
const { bundle, selected, handle_change, register_module_editor } = getContext('REPL');
export let errorLoc;
6 changes: 2 additions & 4 deletions src/Output/Viewer.svelte
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<script>
import { onMount, createEventDispatcher, getContext } from 'svelte';
import { onMount, getContext } from 'svelte';
import getLocationFromStack from './getLocationFromStack.js';
import ReplProxy from './ReplProxy.js';
import Message from '../Message.svelte';
import srcdoc from './srcdoc/index.js';
import { decode } from 'sourcemap-codec';
const dispatch = createEventDispatcher();
const { bundle, navigate } = getContext('REPL');
const { bundle } = getContext('REPL');
export let error; // TODO should this be exposed as a prop?
9 changes: 1 addition & 8 deletions src/Repl.svelte
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<script>
import { onMount, setContext, createEventDispatcher } from 'svelte';
import { setContext, createEventDispatcher } from 'svelte';
import { writable } from 'svelte/store';
import SplitPane from './SplitPane.svelte';
import CodeMirror from './CodeMirror.svelte';
import ComponentSelector from './Input/ComponentSelector.svelte';
import ModuleEditor from './Input/ModuleEditor.svelte';
import Output from './Output/index.svelte';
@@ -21,12 +20,6 @@
export let injectedCSS = '';
export function toJSON() {
// TODO there's a bug here — Svelte hoists this function because
// it wrongly things that $components is global. Needs to
// factor in $ variables when determining hoistability
svelteUrl; // workaround
return {
imports: $bundle.imports,
components: $components
21 changes: 14 additions & 7 deletions src/workers/bundler/index.js
Original file line number Diff line number Diff line change
@@ -38,10 +38,6 @@ self.addEventListener('message', event => {
}
});

const common_options = {
dev: true,
};

let cached = {
dom: {},
ssr: {}
@@ -80,9 +76,17 @@ async function follow_redirects(url) {
return res.url;
}

function compare_to_version(major, minor, patch) {
const v = svelte.VERSION.match(/^(\d+)\.(\d+)\.(\d+)/);
return (v[1] - major) || (v[2] - minor) || (v[3] - patch);
}

function is_legacy_package_structure() {
const [, major, minor, patch] = svelte.VERSION.match(/^(\d+)\.(\d+)\.(\d+)/);
return ((major - 3) || (minor - 4) || (patch - 4)) <= 0;
return compare_to_version(3, 4, 4) <= 0;
}

function has_loopGuardTimeout_feature() {
return compare_to_version(3, 14, 0) >= 0;
}

async function get_bundle(uid, mode, cache, lookup) {
@@ -180,9 +184,12 @@ async function get_bundle(uid, mode, cache, lookup) {
: svelte.compile(code, Object.assign({
generate: mode,
format: 'esm',
dev: true,
name,
filename: name + '.svelte'
}, common_options));
}, has_loopGuardTimeout_feature() && {
loopGuardTimeout: 100
}));

new_cache[id] = { code, result };