diff --git a/package.json b/package.json index 1002adb..383f3c7 100755 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "glob": "^7.1.6", "p-limit": "^2.2.2", "servor": "^3.1.0", - "snowpack": "^1.0.5", + "snowpack": "1.2.0", "terser": "^4.6.3" }, "devDependencies": { diff --git a/src/index.ts b/src/index.ts index 10854c5..ad6092f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -25,6 +25,7 @@ const BABEL_CONFIG = existsSync('./babel.config.js') { // Append .js to all src file imports optionalExtensions: true, + importMap: '../dist/web_modules/import-map.json', }, ], ], diff --git a/tests/snapshot-babel-override/babel.config.js b/tests/snapshot-babel-override/babel.config.js index 0ef468f..6b02cc1 100644 --- a/tests/snapshot-babel-override/babel.config.js +++ b/tests/snapshot-babel-override/babel.config.js @@ -1,12 +1,12 @@ module.exports = { plugins: [ - // You can override the babel config but you need to at least have this plugin defined. + // You can override the babel config but you must have this plugin defined. [ 'snowpack/assets/babel-plugin.js', { // Append .js to all src file imports optionalExtensions: true, - addVersion: true, + importMap: '../dist/web_modules/import-map.json', }, ], ], diff --git a/tests/snapshot-babel-override/dist/App.js b/tests/snapshot-babel-override/dist/App.js index de7877d..8222256 100644 --- a/tests/snapshot-babel-override/dist/App.js +++ b/tests/snapshot-babel-override/dist/App.js @@ -1,41 +1,41 @@ import { SvelteComponent as e, - create_component as n, - destroy_component as t, - init as o, - mount_component as r, + create_component as t, + destroy_component as r, + init as n, + mount_component as o, noop as s, safe_not_equal as m, - transition_in as u, - transition_out as d, -} from '/web_modules/svelte/internal.js?v=undefined'; -import { onMount as f } from '/web_modules/svelte/internal.js?v=undefined'; -import i from './components/Header.js'; -function l(e) { - let o; - const m = new i({}); + transition_in as c, + transition_out as f, +} from '/web_modules/svelte/internal.js?rev=e87f930cb7'; +import { onMount as l } from '/web_modules/svelte/internal.js?rev=e87f930cb7'; +import u from './components/Header.js'; +function i(e) { + let n; + const m = new u({}); return { c() { - n(m.$$.fragment); + t(m.$$.fragment); }, - m(e, n) { - r(m, e, n), (o = !0); + m(e, t) { + o(m, e, t), (n = !0); }, p: s, i(e) { - o || (u(m.$$.fragment, e), (o = !0)); + n || (c(m.$$.fragment, e), (n = !0)); }, o(e) { - d(m.$$.fragment, e), (o = !1); + f(m.$$.fragment, e), (n = !1); }, d(e) { - t(m, e); + r(m, e); }, }; } -function c(e) { +function a(e) { return ( - f(() => { + l(() => { console.log('mounted'); }), [] @@ -43,6 +43,6 @@ function c(e) { } export default class extends e { constructor(e) { - super(), o(this, e, c, l, m, {}); + super(), n(this, e, a, i, m, {}); } } diff --git a/tests/snapshot-babel-override/dist/components/Header.js b/tests/snapshot-babel-override/dist/components/Header.js index 6e61faf..a0426e8 100644 --- a/tests/snapshot-babel-override/dist/components/Header.js +++ b/tests/snapshot-babel-override/dist/components/Header.js @@ -1,45 +1,45 @@ import { SvelteComponent as e, append as t, - attr as n, - detach as s, + attr as s, + detach as n, element as l, init as r, insert as a, noop as o, - safe_not_equal as d, -} from '/web_modules/svelte/internal.js?v=undefined'; -function b(e) { - let r, d; + safe_not_equal as b, +} from '/web_modules/svelte/internal.js?rev=e87f930cb7'; +function d(e) { + let r, b; return { c() { (r = l('div')), - (d = l('h1')), - (d.textContent = `${v}`), - n(d, 'class', 'svelte-nwbabr'), - n(r, 'class', 'header svelte-nwbabr'); + (b = l('h1')), + (b.textContent = `${c}`), + s(b, 'class', 'svelte-nwbabr'), + s(r, 'class', 'header svelte-nwbabr'); }, - m(e, n) { - a(e, r, n), t(r, d); + m(e, s) { + a(e, r, s), t(r, b); }, p: o, i: o, o: o, d(e) { - e && s(r); + e && n(r); }, }; } -const v = 'svelvetttttttt'; +const c = 'svelvetttttttt'; export default class extends e { constructor(e) { - var n; + var s; super(), document.getElementById('svelte-nwbabr-style') || - (((n = l('style')).id = 'svelte-nwbabr-style'), - (n.textContent = + (((s = l('style')).id = 'svelte-nwbabr-style'), + (s.textContent = 'h1.svelte-nwbabr{color:#000;font-size:70px}.header.svelte-nwbabr{max-width:800px}'), - t(document.head, n)), - r(this, e, null, b, d, {}); + t(document.head, s)), + r(this, e, null, d, b, {}); } } diff --git a/tests/snapshot-babel-override/dist/web_modules/import-map.json b/tests/snapshot-babel-override/dist/web_modules/import-map.json index e14db25..6bd54d9 100644 --- a/tests/snapshot-babel-override/dist/web_modules/import-map.json +++ b/tests/snapshot-babel-override/dist/web_modules/import-map.json @@ -1,5 +1,5 @@ { "imports": { - "svelte/internal": "./svelte/internal.js" + "svelte/internal": "./svelte/internal.js?rev=e87f930cb7" } } diff --git a/tests/snapshot/dist/App.js b/tests/snapshot/dist/App.js index f06d187..8dedcfe 100644 --- a/tests/snapshot/dist/App.js +++ b/tests/snapshot/dist/App.js @@ -7,71 +7,71 @@ import { element as m, init as s, insert as i, - mount_component as a, - safe_not_equal as f, + mount_component as f, + safe_not_equal as a, set_data as l, - space as u, - text as $, - transition_in as c, + space as c, + text as u, + transition_in as $, transition_out as p, -} from '/web_modules/svelte/internal.js'; -import { onMount as d } from '/web_modules/svelte/internal.js'; -import g from './components/Header.js'; -import j from './components/Footer/index.js'; -import { getCurrentTime as v } from './utils/time.js'; -function w(e) { - let s, f, d, v, w, x; - const b = new g({}), - I = new j({}); +} from '/web_modules/svelte/internal.js?rev=e87f930cb7'; +import { onMount as d } from '/web_modules/svelte/internal.js?rev=e87f930cb7'; +import v from './components/Header.js'; +import g from './components/Footer/index.js'; +import { getCurrentTime as j } from './utils/time.js'; +function b(e) { + let s, a, d, j, b, w; + const x = new v({}), + I = new g({}); return { c() { - r(b.$$.fragment), - (s = u()), - (f = m('div')), - (d = $('Current time is ')), - (v = $(e[0])), - (w = u()), + r(x.$$.fragment), + (s = c()), + (a = m('div')), + (d = u('Current time is ')), + (j = u(e[0])), + (b = c()), r(I.$$.fragment); }, m(e, r) { - a(b, e, r), + f(x, e, r), i(e, s, r), - i(e, f, r), - t(f, d), - t(f, v), - i(e, w, r), - a(I, e, r), - (x = !0); + i(e, a, r), + t(a, d), + t(a, j), + i(e, b, r), + f(I, e, r), + (w = !0); }, p(e, [t]) { - (!x || 1 & t) && l(v, e[0]); + (!w || 1 & t) && l(j, e[0]); }, i(e) { - x || (c(b.$$.fragment, e), c(I.$$.fragment, e), (x = !0)); + w || ($(x.$$.fragment, e), $(I.$$.fragment, e), (w = !0)); }, o(e) { - p(b.$$.fragment, e), p(I.$$.fragment, e), (x = !1); + p(x.$$.fragment, e), p(I.$$.fragment, e), (w = !1); }, d(e) { - n(b, e), e && o(s), e && o(f), e && o(w), n(I, e); + n(x, e), e && o(s), e && o(a), e && o(b), n(I, e); }, }; } -function x(e, t, r) { +function w(e, t, r) { let n; return ( d(() => { const e = setInterval(() => { - r(0, (n = v())); + r(0, (n = j())); }, 1e3); return () => clearInterval(e); }), - r(0, (n = v())), + r(0, (n = j())), [n] ); } export default class extends e { constructor(e) { - super(), s(this, e, x, w, f, {}); + super(), s(this, e, w, b, a, {}); } } diff --git a/tests/snapshot/dist/components/Footer/Links.js b/tests/snapshot/dist/components/Footer/Links.js index 28dc03e..8c76f1b 100644 --- a/tests/snapshot/dist/components/Footer/Links.js +++ b/tests/snapshot/dist/components/Footer/Links.js @@ -1,31 +1,31 @@ import { SvelteComponent as e, - detach as t, - element as n, - init as r, + detach as r, + element as t, + init as n, insert as o, noop as s, safe_not_equal as l, -} from '/web_modules/svelte/internal.js'; +} from '/web_modules/svelte/internal.js?rev=e87f930cb7'; function u(e) { - let r; + let n; return { c() { - (r = n('nav')), (r.innerHTML = 'Home'); + (n = t('nav')), (n.innerHTML = 'Home'); }, - m(e, t) { - o(e, r, t); + m(e, r) { + o(e, n, r); }, p: s, i: s, o: s, d(e) { - e && t(r); + e && r(n); }, }; } export default class extends e { constructor(e) { - super(), r(this, e, null, u, l, {}); + super(), n(this, e, null, u, l, {}); } } diff --git a/tests/snapshot/dist/components/Footer/index.js b/tests/snapshot/dist/components/Footer/index.js index cdaeeeb..2d4b136 100644 --- a/tests/snapshot/dist/components/Footer/index.js +++ b/tests/snapshot/dist/components/Footer/index.js @@ -6,44 +6,44 @@ import { detach as o, element as r, init as l, - insert as i, - mount_component as m, - noop as a, - safe_not_equal as c, - space as f, + insert as c, + mount_component as f, + noop as i, + safe_not_equal as m, + space as a, transition_in as u, transition_out as p, -} from '/web_modules/svelte/internal.js'; +} from '/web_modules/svelte/internal.js?rev=e87f930cb7'; import $ from './Links.js'; function d(t) { - let l, c, d, w; - const x = new $({}); + let l, m, d, v; + const w = new $({}); return { c() { (l = r('footer')), - (c = r('p')), - (c.textContent = `${g}`), - (d = f()), - n(x.$$.fragment); + (m = r('p')), + (m.textContent = `${g}`), + (d = a()), + n(w.$$.fragment); }, m(t, n) { - i(t, l, n), e(l, c), e(l, d), m(x, l, null), (w = !0); + c(t, l, n), e(l, m), e(l, d), f(w, l, null), (v = !0); }, - p: a, + p: i, i(t) { - w || (u(x.$$.fragment, t), (w = !0)); + v || (u(w.$$.fragment, t), (v = !0)); }, o(t) { - p(x.$$.fragment, t), (w = !1); + p(w.$$.fragment, t), (v = !1); }, d(t) { - t && o(l), s(x); + t && o(l), s(w); }, }; } const g = 'this is svelte and snowpack'; export default class extends t { constructor(t) { - super(), l(this, t, null, d, c, {}); + super(), l(this, t, null, d, m, {}); } } diff --git a/tests/snapshot/dist/components/Header.js b/tests/snapshot/dist/components/Header.js index f3b3fd9..a0426e8 100644 --- a/tests/snapshot/dist/components/Header.js +++ b/tests/snapshot/dist/components/Header.js @@ -8,7 +8,7 @@ import { insert as a, noop as o, safe_not_equal as b, -} from '/web_modules/svelte/internal.js'; +} from '/web_modules/svelte/internal.js?rev=e87f930cb7'; function d(e) { let r, b; return { diff --git a/tests/snapshot/dist/web_modules/import-map.json b/tests/snapshot/dist/web_modules/import-map.json index e14db25..6bd54d9 100644 --- a/tests/snapshot/dist/web_modules/import-map.json +++ b/tests/snapshot/dist/web_modules/import-map.json @@ -1,5 +1,5 @@ { "imports": { - "svelte/internal": "./svelte/internal.js" + "svelte/internal": "./svelte/internal.js?rev=e87f930cb7" } }