Skip to content

fix: update svelte-hmr to solve dom reordering issue #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 9, 2021
Merged

fix: update svelte-hmr to solve dom reordering issue #82

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
326488c
test: add testcase for dom order to kit suite
dominikg Jul 8, 2021
bbe9ff4
fix: update svelte-hmr to 0.14.5-0 to fix dom reordering
dominikg Jul 8, 2021
ae4b8bc
chore: remove svelte-hmr devDependency
dominikg Jul 8, 2021
a8ff81e
Merge branch 'main' into fix/svelte-hmr
dominikg Jul 8, 2021
c3dc109
Merge branch 'main' into fix/svelte-hmr
dominikg Jul 9, 2021
52f3fd1
chore: update deps
dominikg Jul 9, 2021
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
1 change: 0 additions & 1 deletion packages/e2e-tests/autoprefixer-browerslist/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"postcss": "^8.3.5",
"postcss-load-config": "^3.1.0",
"svelte": "^3.38.3",
"svelte-hmr": "^0.14.4",
"svelte-preprocess": "^4.7.3",
"vite": "^2.4.0"
}
Expand Down
1 change: 0 additions & 1 deletion packages/e2e-tests/configfile-custom/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.38.3",
"svelte-hmr": "^0.14.4",
"vite": "^2.4.0"
}
}
1 change: 0 additions & 1 deletion packages/e2e-tests/configfile-esm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.38.3",
"svelte-hmr": "^0.14.4",
"svelte-preprocess": "^4.7.3",
"vite": "^2.4.0"
},
Expand Down
1 change: 0 additions & 1 deletion packages/e2e-tests/custom-extensions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.38.3",
"svelte-hmr": "^0.14.4",
"vite": "^2.4.0"
}
}
1 change: 0 additions & 1 deletion packages/e2e-tests/hmr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.38.3",
"svelte-hmr": "^0.14.4",
"vite": "^2.4.0",
"node-fetch": "^2.6.1"
}
Expand Down
18 changes: 17 additions & 1 deletion packages/e2e-tests/kit-node/__tests__/kit.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,24 @@ describe('kit-node', () => {
await expect(await getText(`#hmr-test2`)).toBe('bar');
});

describe('Counter.svelte', () => {
describe('child component update', () => {
const updateChild = editFileAndWaitForHmrComplete.bind(null, 'src/lib/Child.svelte');
const updateCounter = editFileAndWaitForHmrComplete.bind(null, 'src/lib/Counter.svelte');
it('should preserve dom order', async () => {
expect(await getText('#before-child')).toBe('before-child');
expect(await getText('#test-child')).toBe('test-child');
expect(await getText('#after-child')).toBe('after-child');
expect(await getEl('#before-child + #test-child')).not.toBe(null);
expect(await getEl('#test-child + #after-child')).not.toBe(null);
await updateChild((content) =>
content.replace('<!-- HMR-TEMPLATE-INJECT -->', '-foo<!-- HMR-TEMPLATE-INJECT -->')
);
expect(await getText('#before-child')).toBe('before-child');
expect(await getText('#test-child')).toBe('test-child-foo');
expect(await getText('#after-child')).toBe('after-child');
expect(await getEl('#before-child + #test-child')).not.toBe(null);
expect(await getEl('#test-child + #after-child')).not.toBe(null);
});
it('should render additional html', async () => {
// add div 1
expect(await getEl('#hmr-test3')).toBe(null);
Expand Down
5 changes: 5 additions & 0 deletions packages/e2e-tests/kit-node/src/lib/Child.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<script>
export let testId;
</script>

<div id={testId}>{testId}<!-- HMR-TEMPLATE-INJECT --></div>
6 changes: 6 additions & 0 deletions packages/e2e-tests/kit-node/src/routes/index.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
import { onMount } from 'svelte';
// eslint-disable-next-line node/no-missing-import
import Counter from '$lib/Counter.svelte';
// eslint-disable-next-line node/no-missing-import
import Child from '$lib/Child.svelte';

onMount(async () => {
const isSSR = (await import('../client-only-module.js')).default;
Expand All @@ -15,6 +17,10 @@
<Counter />

<p>Visit <a href="https://svelte.dev">svelte.dev</a> to learn how to build Svelte apps.</p>

<div id="before-child">before-child</div>
<Child testId="test-child" />
<div id="after-child">after-child</div>
</main>

<!-- HMR-TEMPLATE-INJECT -->
Expand Down
1 change: 0 additions & 1 deletion packages/e2e-tests/package-json-svelte-field/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.38.3",
"svelte-hmr": "^0.14.4",
"vite": "^2.4.0"
}
}
1 change: 0 additions & 1 deletion packages/e2e-tests/svelte-preprocess/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.38.3",
"svelte-hmr": "^0.14.4",
"svelte-preprocess": "^4.7.3",
"typescript": "^4.3.5",
"vite": "^2.4.0"
Expand Down
1 change: 0 additions & 1 deletion packages/e2e-tests/vite-ssr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"express": "^4.17.1",
"serve-static": "^1.14.1",
"svelte": "^3.38.3",
"svelte-hmr": "^0.14.4",
"vite": "^2.4.0"
}
}
1 change: 0 additions & 1 deletion packages/playground/big/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.38.3",
"svelte-hmr": "^0.14.4",
"vite": "^2.4.0"
}
}
1 change: 0 additions & 1 deletion packages/playground/preprocess-with-vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"sass": "^1.35.1",
"stylus": "^0.54.8",
"svelte": "^3.38.3",
"svelte-hmr": "^0.14.4",
"vite": "^2.4.0"
}
}
1 change: 0 additions & 1 deletion packages/playground/windicss/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.38.3",
"svelte-hmr": "^0.14.4",
"vite": "^2.4.0",
"vite-plugin-windicss": "^1.2.3"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/vite-plugin-svelte/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"debug": "^4.3.2",
"magic-string": "^0.25.7",
"require-relative": "^0.8.7",
"svelte-hmr": "^0.14.4"
"svelte-hmr": "^0.14.5-0"
},
"peerDependencies": {
"svelte": "^3.34.0",
Expand Down
31 changes: 5 additions & 26 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.