Merge branch 'master' of github.com:sveltejs/svelte into tanhauhau/dy…

…namic-event-handler
sveltejs · Nov 6, 2019 · 9a77794 · 9a77794
2 parents 62ce544 + deb5b68
commit 9a77794
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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+)/);