Merge pull request sveltejs#107 from sveltejs/fix-filename-bug

handle files with .svelte in the middle of their filename

Author: Rich-Harris

index.js

@@ -271,7 +271,7 @@ module.exports = function svelte(options = {}) {
 				});
 
 				if ((css || options.emitCss) && compiled.css.code) {
-					let fname = id.replace(extension, '.css');
+					let fname = id.replace(new RegExp(`\\${extension}$`), '.css');
 
 					if (options.emitCss) {
 						const source_map_comment = `/*# sourceMappingURL=${compiled.css.map.toUrl()} */`;

test/filename-test/expected/bundle.css

@@ -0,0 +1,43 @@
+(function (internal) {
+	'use strict';
+
+	/* test/filename-test/src/foo.svelte.dev/index.svelte generated by Svelte v3.0.0-beta.5 */
+
+	function create_fragment(ctx) {
+		var h1;
+
+		return {
+			c() {
+				h1 = internal.createElement("h1");
+				h1.textContent = "Hello world!";
+				h1.className = "svelte-bt9zrl";
+			},
+
+			m(target, anchor) {
+				internal.insert(target, h1, anchor);
+			},
+
+			p: internal.noop,
+			i: internal.noop,
+			o: internal.noop,
+
+			d(detach) {
+				if (detach) {
+					internal.detachNode(h1);
+				}
+			}
+		};
+	}
+
+	class Foo extends internal.SvelteComponent {
+		constructor(options) {
+			super();
+			internal.init(this, options, null, create_fragment, internal.safe_not_equal);
+		}
+	}
+
+	new Foo({
+		target: document.body
+	});
+
+}(internal));

test/filename-test/expected/bundle.css.map

@@ -0,0 +1,7 @@
+<h1>Hello world!</h1>
+
+<style>
+	h1 {
+		color: red;
+	}
+</style>

test/filename-test/expected/bundle.js

@@ -0,0 +1,5 @@
+import App from './index.svelte';
+
+new App({
+	target: document.body
+});

test/filename-test/src/foo.svelte.dev/index.svelte

@@ -73,12 +73,14 @@ describe('rollup-plugin-svelte', () => {
 						css.write('test/sourcemap-test/dist/bundle.css');
 					}
 				})
-			]
+			],
+			external: ['svelte/internal']
 		});
 
 		await bundle.write({
 			format: 'iife',
-			file: 'test/sourcemap-test/dist/bundle.js'
+			file: 'test/sourcemap-test/dist/bundle.js',
+			globals: { 'svelte/internal': 'svelte' }
 		});
 
 		const smc = await new SourceMapConsumer(css.map);
@@ -279,17 +281,60 @@ describe('rollup-plugin-svelte', () => {
 						css.write('test/deterministic-css/dist/bundle.css');
 					}
 				})
-			]
+			],
+			external: ['svelte/internal']
 		});
 
 		await bundle.write({
 			format: 'iife',
-			file: 'test/deterministic-css/dist/bundle.js'
+			file: 'test/deterministic-css/dist/bundle.js',
+			globals: { 'svelte/internal': 'svelte' }
 		});
 
 		assert.equal(
 			fs.readFileSync('test/deterministic-css/dist/bundle.css', 'utf-8'),
 			fs.readFileSync('test/deterministic-css/expected/bundle.css', 'utf-8')
 		);
 	});
+
+	it('handles filenames that happen to contain .svelte', async () => {
+		sander.rimrafSync('test/filename-test/dist');
+		sander.mkdirSync('test/filename-test/dist');
+
+		try {
+			const bundle = await rollup.rollup({
+				input: 'test/filename-test/src/foo.svelte.dev/main.js',
+				plugins: [
+					{
+						resolveId: async (id) => {
+							if (/A\.svelte/.test(id)) {
+								await new Promise(f => setTimeout(f, 50));
+							}
+						}
+					},
+					plugin({
+						css: value => {
+							css = value;
+							css.write('test/filename-test/dist/bundle.css');
+						}
+					})
+				],
+				external: ['svelte/internal']
+			});
+
+			await bundle.write({
+				format: 'iife',
+				file: 'test/filename-test/dist/bundle.js',
+				globals: { 'svelte/internal': 'svelte' }
+			});
+		} catch (err) {
+			console.log(err);
+			throw err;
+		}
+
+		assert.equal(
+			fs.readFileSync('test/filename-test/dist/bundle.css', 'utf-8'),
+			fs.readFileSync('test/filename-test/expected/bundle.css', 'utf-8')
+		);
+	});
 });