diff --git a/src/utils/hash.ts b/src/utils/hash.ts
index 8bc550a5c0..c68476a5bb 100644
--- a/src/utils/hash.ts
+++ b/src/utils/hash.ts
@@ -1,8 +1,8 @@
// https://github.com/darkskyapp/string-hash/blob/master/index.js
-export default function hash(str: string): number {
+export default function hash(str: string): string {
let hash = 5381;
let i = str.length;
while (i--) hash = ((hash << 5) - hash) ^ str.charCodeAt(i);
- return hash >>> 0;
+ return (hash >>> 0).toString(36);
}
diff --git a/test/css/index.js b/test/css/index.js
index b2e989d571..83b26ed498 100644
--- a/test/css/index.js
+++ b/test/css/index.js
@@ -95,7 +95,7 @@ describe('css', () => {
css: read(`test/css/samples/${dir}/expected.css`)
};
- assert.equal(dom.css.replace(/svelte-\d+/g, 'svelte-xyz'), expected.css);
+ assert.equal(dom.css.replace(/svelte(-ref)?-[a-z0-9]+/g, (m, $1) => $1 ? m : 'svelte-xyz'), expected.css);
// verify that the right elements have scoping selectors
if (expected.html !== null) {
@@ -114,7 +114,7 @@ describe('css', () => {
fs.writeFileSync(`test/css/samples/${dir}/_actual.html`, html);
assert.equal(
- normalizeHtml(window, html.replace(/svelte-\d+/g, 'svelte-xyz')),
+ normalizeHtml(window, html.replace(/svelte(-ref)?-[a-z0-9]+/g, (m, $1) => $1 ? m : 'svelte-xyz')),
normalizeHtml(window, expected.html)
);
@@ -133,7 +133,7 @@ describe('css', () => {
assert.equal(
normalizeHtml(
window,
- component.render(config.data).html.replace(/svelte-\d+/g, 'svelte-xyz')
+ component.render(config.data).html.replace(/svelte(-ref)?-[a-z0-9]+/g, (m, $1) => $1 ? m : 'svelte-xyz')
),
normalizeHtml(window, expected.html)
);
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 c9f89ea6ed..5d602e5a0a 100644
--- a/test/js/samples/collapses-text-around-comments/expected-bundle.js
+++ b/test/js/samples/collapses-text-around-comments/expected-bundle.js
@@ -196,8 +196,8 @@ function data() {
}
function add_css() {
var style = createElement("style");
- style.id = 'svelte-2794052100-style';
- style.textContent = "p.svelte-2794052100,.svelte-2794052100 p{color:red}";
+ style.id = 'svelte-1a7i8ec-style';
+ style.textContent = "p.svelte-1a7i8ec,.svelte-1a7i8ec p{color:red}";
appendNode(style, document.head);
}
@@ -212,7 +212,7 @@ function create_main_fragment(component, state) {
},
h: function hydrate() {
- p.className = "svelte-2794052100";
+ p.className = "svelte-1a7i8ec";
},
m: function mount(target, anchor) {
@@ -238,7 +238,7 @@ function SvelteComponent(options) {
init(this, options);
this._state = assign(data(), options.data);
- if (!document.getElementById("svelte-2794052100-style")) add_css();
+ if (!document.getElementById("svelte-1a7i8ec-style")) add_css();
this._fragment = create_main_fragment(this, this._state);
diff --git a/test/js/samples/collapses-text-around-comments/expected.js b/test/js/samples/collapses-text-around-comments/expected.js
index e6cdcea44c..7bab86334e 100644
--- a/test/js/samples/collapses-text-around-comments/expected.js
+++ b/test/js/samples/collapses-text-around-comments/expected.js
@@ -7,8 +7,8 @@ function data() {
function add_css() {
var style = createElement("style");
- style.id = 'svelte-2794052100-style';
- style.textContent = "p.svelte-2794052100,.svelte-2794052100 p{color:red}";
+ style.id = 'svelte-1a7i8ec-style';
+ style.textContent = "p.svelte-1a7i8ec,.svelte-1a7i8ec p{color:red}";
appendNode(style, document.head);
}
@@ -23,7 +23,7 @@ function create_main_fragment(component, state) {
},
h: function hydrate() {
- p.className = "svelte-2794052100";
+ p.className = "svelte-1a7i8ec";
},
m: function mount(target, anchor) {
@@ -49,7 +49,7 @@ function SvelteComponent(options) {
init(this, options);
this._state = assign(data(), options.data);
- if (!document.getElementById("svelte-2794052100-style")) add_css();
+ if (!document.getElementById("svelte-1a7i8ec-style")) add_css();
this._fragment = create_main_fragment(this, this._state);
diff --git a/test/js/samples/css-media-query/expected-bundle.js b/test/js/samples/css-media-query/expected-bundle.js
index 5ee916cc30..248b282067 100644
--- a/test/js/samples/css-media-query/expected-bundle.js
+++ b/test/js/samples/css-media-query/expected-bundle.js
@@ -189,8 +189,8 @@ var proto = {
function add_css() {
var style = createElement("style");
- style.id = 'svelte-3905933315-style';
- style.textContent = "@media(min-width: 1px){div.svelte-3905933315,.svelte-3905933315 div{color:red}}";
+ style.id = 'svelte-1slhpfn-style';
+ style.textContent = "@media(min-width: 1px){div.svelte-1slhpfn,.svelte-1slhpfn div{color:red}}";
appendNode(style, document.head);
}
@@ -204,7 +204,7 @@ function create_main_fragment(component, state) {
},
h: function hydrate() {
- div.className = "svelte-3905933315";
+ div.className = "svelte-1slhpfn";
},
m: function mount(target, anchor) {
@@ -225,7 +225,7 @@ function SvelteComponent(options) {
init(this, options);
this._state = assign({}, options.data);
- if (!document.getElementById("svelte-3905933315-style")) add_css();
+ if (!document.getElementById("svelte-1slhpfn-style")) add_css();
this._fragment = create_main_fragment(this, this._state);
diff --git a/test/js/samples/css-media-query/expected.js b/test/js/samples/css-media-query/expected.js
index 525fae2266..b5c91f76a9 100644
--- a/test/js/samples/css-media-query/expected.js
+++ b/test/js/samples/css-media-query/expected.js
@@ -3,8 +3,8 @@ import { appendNode, assign, createElement, detachNode, init, insertNode, noop,
function add_css() {
var style = createElement("style");
- style.id = 'svelte-3905933315-style';
- style.textContent = "@media(min-width: 1px){div.svelte-3905933315,.svelte-3905933315 div{color:red}}";
+ style.id = 'svelte-1slhpfn-style';
+ style.textContent = "@media(min-width: 1px){div.svelte-1slhpfn,.svelte-1slhpfn div{color:red}}";
appendNode(style, document.head);
}
@@ -18,7 +18,7 @@ function create_main_fragment(component, state) {
},
h: function hydrate() {
- div.className = "svelte-3905933315";
+ div.className = "svelte-1slhpfn";
},
m: function mount(target, anchor) {
@@ -39,7 +39,7 @@ function SvelteComponent(options) {
init(this, options);
this._state = assign({}, options.data);
- if (!document.getElementById("svelte-3905933315-style")) add_css();
+ if (!document.getElementById("svelte-1slhpfn-style")) add_css();
this._fragment = create_main_fragment(this, this._state);
diff --git a/test/server-side-rendering/samples/styles-nested/_actual.css b/test/server-side-rendering/samples/styles-nested/_actual.css
index 3098a0db49..737a93edff 100644
--- a/test/server-side-rendering/samples/styles-nested/_actual.css
+++ b/test/server-side-rendering/samples/styles-nested/_actual.css
@@ -1,2 +1,2 @@
-div.svelte-724714405,.svelte-724714405 div{color:red}
-div.svelte-300476157,.svelte-300476157 div{color:green}
\ No newline at end of file
+div.svelte-bzh57p,.svelte-bzh57p div{color:red}
+div.svelte-4yw8vx,.svelte-4yw8vx div{color:green}
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/styles-nested/_actual.html b/test/server-side-rendering/samples/styles-nested/_actual.html
index d87b1743e7..2227662e25 100644
--- a/test/server-side-rendering/samples/styles-nested/_actual.html
+++ b/test/server-side-rendering/samples/styles-nested/_actual.html
@@ -1,8 +1,8 @@
-red
-green: foo
+red
+green: foo
-green: bar
+green: bar
diff --git a/test/server-side-rendering/samples/styles-nested/_expected.css b/test/server-side-rendering/samples/styles-nested/_expected.css
index 3098a0db49..737a93edff 100644
--- a/test/server-side-rendering/samples/styles-nested/_expected.css
+++ b/test/server-side-rendering/samples/styles-nested/_expected.css
@@ -1,2 +1,2 @@
-div.svelte-724714405,.svelte-724714405 div{color:red}
-div.svelte-300476157,.svelte-300476157 div{color:green}
\ No newline at end of file
+div.svelte-bzh57p,.svelte-bzh57p div{color:red}
+div.svelte-4yw8vx,.svelte-4yw8vx div{color:green}
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/styles-nested/_expected.html b/test/server-side-rendering/samples/styles-nested/_expected.html
index d87b1743e7..2227662e25 100644
--- a/test/server-side-rendering/samples/styles-nested/_expected.html
+++ b/test/server-side-rendering/samples/styles-nested/_expected.html
@@ -1,8 +1,8 @@
-red
-green: foo
+red
+green: foo
-green: bar
+green: bar
diff --git a/test/server-side-rendering/samples/styles/_actual.css b/test/server-side-rendering/samples/styles/_actual.css
index f57e4a0568..f54b1b3d50 100644
--- a/test/server-side-rendering/samples/styles/_actual.css
+++ b/test/server-side-rendering/samples/styles/_actual.css
@@ -1 +1 @@
-div.svelte-724714405,.svelte-724714405 div{color:red}
\ No newline at end of file
+div.svelte-bzh57p,.svelte-bzh57p div{color:red}
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/styles/_actual.html b/test/server-side-rendering/samples/styles/_actual.html
index ea3eca6de6..4c164bd844 100644
--- a/test/server-side-rendering/samples/styles/_actual.html
+++ b/test/server-side-rendering/samples/styles/_actual.html
@@ -1 +1 @@
-red
\ No newline at end of file
+red
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/styles/_expected.css b/test/server-side-rendering/samples/styles/_expected.css
index f57e4a0568..f54b1b3d50 100644
--- a/test/server-side-rendering/samples/styles/_expected.css
+++ b/test/server-side-rendering/samples/styles/_expected.css
@@ -1 +1 @@
-div.svelte-724714405,.svelte-724714405 div{color:red}
\ No newline at end of file
+div.svelte-bzh57p,.svelte-bzh57p div{color:red}
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/styles/_expected.html b/test/server-side-rendering/samples/styles/_expected.html
index ea3eca6de6..4c164bd844 100644
--- a/test/server-side-rendering/samples/styles/_expected.html
+++ b/test/server-side-rendering/samples/styles/_expected.html
@@ -1 +1 @@
-red
\ No newline at end of file
+red
\ No newline at end of file
diff --git a/test/sourcemaps/samples/css-cascade-false/output.css b/test/sourcemaps/samples/css-cascade-false/output.css
index 976fe0b43d..f12b3f22b9 100644
--- a/test/sourcemaps/samples/css-cascade-false/output.css
+++ b/test/sourcemaps/samples/css-cascade-false/output.css
@@ -1,2 +1,2 @@
-.foo.svelte-1719932608{color:red}
+.foo.svelte-sg04hs{color:red}
/*# sourceMappingURL=output.css.map */
\ No newline at end of file
diff --git a/test/sourcemaps/samples/css-cascade-false/output.css.map b/test/sourcemaps/samples/css-cascade-false/output.css.map
index 19575fe72a..23b5df6be3 100644
--- a/test/sourcemaps/samples/css-cascade-false/output.css.map
+++ b/test/sourcemaps/samples/css-cascade-false/output.css.map
@@ -8,5 +8,5 @@
"red
\n\n"
],
"names": [],
- "mappings": "AAGC,IAAI,kBAAC,CAAC,AACL,KAAK,CAAE,GAAG,AACX,CAAC"
+ "mappings": "AAGC,IAAI,cAAC,CAAC,AACL,KAAK,CAAE,GAAG,AACX,CAAC"
}
\ No newline at end of file
diff --git a/test/sourcemaps/samples/css/output.css b/test/sourcemaps/samples/css/output.css
index e511c424ea..7ac11b6e42 100644
--- a/test/sourcemaps/samples/css/output.css
+++ b/test/sourcemaps/samples/css/output.css
@@ -1,2 +1,2 @@
-.svelte-1719932608.foo,.svelte-1719932608 .foo{color:red}
+.svelte-sg04hs.foo,.svelte-sg04hs .foo{color:red}
/*# sourceMappingURL=output.css.map */
\ No newline at end of file
diff --git a/test/sourcemaps/samples/css/output.css.map b/test/sourcemaps/samples/css/output.css.map
index 19df3abda0..bc5a58446a 100644
--- a/test/sourcemaps/samples/css/output.css.map
+++ b/test/sourcemaps/samples/css/output.css.map
@@ -8,5 +8,5 @@
"red
\n\n"
],
"names": [],
- "mappings": "AAGC,8CAAK,CAAC,AACL,KAAK,CAAE,GAAG,AACX,CAAC"
+ "mappings": "AAGC,sCAAK,CAAC,AACL,KAAK,CAAE,GAAG,AACX,CAAC"
}
\ No newline at end of file