diff --git a/package.json b/package.json
index a061cdf742..8754c25031 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
     "@types/node": "^8.10.53",
     "@typescript-eslint/eslint-plugin": "^1.13.0",
     "@typescript-eslint/parser": "^2.1.0",
+    "@rollup/plugin-replace": "^2.2.1",
     "acorn": "^7.1.0",
     "agadoo": "^1.1.0",
     "c8": "^5.0.1",
@@ -81,7 +82,6 @@
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-node-resolve": "^5.2.0",
-    "rollup-plugin-replace": "^2.2.0",
     "rollup-plugin-sucrase": "^2.1.0",
     "rollup-plugin-typescript": "^1.0.1",
     "rollup-plugin-virtual": "^1.0.1",
diff --git a/rollup.config.js b/rollup.config.js
index 4444494a5f..c55cbf2426 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,5 +1,5 @@
 import fs from 'fs';
-import replace from 'rollup-plugin-replace';
+import replace from '@rollup/plugin-replace';
 import resolve from 'rollup-plugin-node-resolve';
 import commonjs from 'rollup-plugin-commonjs';
 import json from 'rollup-plugin-json';
diff --git a/site/content/examples/05-bindings/10-bind-this/App.svelte b/site/content/examples/05-bindings/10-bind-this/App.svelte
index 9a8fabc265..8e4b3c5bef 100644
--- a/site/content/examples/05-bindings/10-bind-this/App.svelte
+++ b/site/content/examples/05-bindings/10-bind-this/App.svelte
@@ -43,8 +43,8 @@
 		width: 100%;
 		height: 100%;
 		background-color: #666;
-		-webkit-mask: url(logo-mask.svg) 50% 50% no-repeat;
-		mask: url(logo-mask.svg) 50% 50% no-repeat;
+		-webkit-mask: url(svelte-logo-mask.svg) 50% 50% no-repeat;
+		mask: url(svelte-logo-mask.svg) 50% 50% no-repeat;
 	}
 </style>
 
diff --git a/site/content/tutorial/06-bindings/12-bind-this/app-a/App.svelte b/site/content/tutorial/06-bindings/12-bind-this/app-a/App.svelte
index c85cab9225..d40c45ef6c 100644
--- a/site/content/tutorial/06-bindings/12-bind-this/app-a/App.svelte
+++ b/site/content/tutorial/06-bindings/12-bind-this/app-a/App.svelte
@@ -43,8 +43,8 @@
 		width: 100%;
 		height: 100%;
 		background-color: #666;
-		-webkit-mask: url(logo-mask.svg) 50% 50% no-repeat;
-		mask: url(logo-mask.svg) 50% 50% no-repeat;
+		-webkit-mask: url(svelte-logo-mask.svg) 50% 50% no-repeat;
+		mask: url(svelte-logo-mask.svg) 50% 50% no-repeat;
 	}
 </style>
 
diff --git a/site/content/tutorial/06-bindings/12-bind-this/app-b/App.svelte b/site/content/tutorial/06-bindings/12-bind-this/app-b/App.svelte
index 9a8fabc265..8e4b3c5bef 100644
--- a/site/content/tutorial/06-bindings/12-bind-this/app-b/App.svelte
+++ b/site/content/tutorial/06-bindings/12-bind-this/app-b/App.svelte
@@ -43,8 +43,8 @@
 		width: 100%;
 		height: 100%;
 		background-color: #666;
-		-webkit-mask: url(logo-mask.svg) 50% 50% no-repeat;
-		mask: url(logo-mask.svg) 50% 50% no-repeat;
+		-webkit-mask: url(svelte-logo-mask.svg) 50% 50% no-repeat;
+		mask: url(svelte-logo-mask.svg) 50% 50% no-repeat;
 	}
 </style>
 
diff --git a/site/static/logo-mask.svg b/site/static/logo-mask.svg
deleted file mode 100644
index d7919a61ab..0000000000
--- a/site/static/logo-mask.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 103 124">
-	<path style="fill:black" d='M96.33,20.61C85.38,4.93,63.74.28,48.09,10.25L20.61,27.77A31.46,31.46,0,0,0,6.37,48.88,33.22,33.22,0,0,0,9.64,70.2,31.52,31.52,0,0,0,4.93,82a33.61,33.61,0,0,0,5.73,25.41c11,15.68,32.6,20.33,48.25,10.36l27.48-17.52a31.48,31.48,0,0,0,14.24-21.11A33.22,33.22,0,0,0,97.36,57.8,31.52,31.52,0,0,0,102.07,46a33.57,33.57,0,0,0-5.74-25.41
-
-	M45.41,108.86A21.81,21.81,0,0,1,22,100.18,20.2,20.2,0,0,1,18.53,84.9a19,19,0,0,1,.65-2.57l.52-1.58,1.41,1a35.32,35.32,0,0,0,10.75,5.37l1,.31-.1,1a6.2,6.2,0,0,0,1.11,4.08A6.57,6.57,0,0,0,41,95.19a6,6,0,0,0,1.68-.74L70.11,76.94a5.76,5.76,0,0,0,2.59-3.83,6.09,6.09,0,0,0-1-4.6,6.58,6.58,0,0,0-7.06-2.62,6.21,6.21,0,0,0-1.69.74L52.43,73.31a19.88,19.88,0,0,1-5.58,2.45,21.82,21.82,0,0,1-23.43-8.68A20.2,20.2,0,0,1,20,51.8a19,19,0,0,1,8.56-12.7L56,21.59a19.88,19.88,0,0,1,5.58-2.45A21.81,21.81,0,0,1,85,27.82,20.2,20.2,0,0,1,88.47,43.1a19,19,0,0,1-.65,2.57l-.52,1.58-1.41-1a35.32,35.32,0,0,0-10.75-5.37l-1-.31.1-1a6.2,6.2,0,0,0-1.11-4.08,6.57,6.57,0,0,0-7.06-2.62,6,6,0,0,0-1.68.74L36.89,51.06a5.71,5.71,0,0,0-2.58,3.83,6,6,0,0,0,1,4.6,6.58,6.58,0,0,0,7.06,2.62,6.21,6.21,0,0,0,1.69-.74l10.48-6.68a19.88,19.88,0,0,1,5.58-2.45,21.82,21.82,0,0,1,23.43,8.68A20.2,20.2,0,0,1,87,76.2a19,19,0,0,1-8.56,12.7L51,106.41a19.88,19.88,0,0,1-5.58,2.45' />
-</svg>
\ No newline at end of file
diff --git a/src/compiler/compile/utils/get_name_from_filename.ts b/src/compiler/compile/utils/get_name_from_filename.ts
index 04479ce6bd..d1e0e167ce 100644
--- a/src/compiler/compile/utils/get_name_from_filename.ts
+++ b/src/compiler/compile/utils/get_name_from_filename.ts
@@ -1,7 +1,7 @@
 export default function get_name_from_filename(filename: string) {
 	if (!filename) return null;
-	// eslint-disable-next-line no-useless-escape
-	const parts = encodeURI(filename).split(/[\/\\]/);
+
+	const parts = filename.split(/[/\\]/).map(encodeURI);
 
 	if (parts.length > 1) {
 		const index_match = parts[parts.length - 1].match(/^index(\.\w+)/);