Fix resolution of relative external files outside target directory (#5099)

lukastaegert · web-flow · commit bc0fe1b17efc · 2023-08-22T06:31:40.000+02:00
Fix relative external resolution
diff --git a/src/utils/relativeId.ts b/src/utils/relativeId.ts
@@ -26,6 +26,10 @@ export function getImportPath(
 	stripJsExtension: boolean,
 	ensureFileName: boolean
 ): string {
+	while (targetPath.startsWith('../')) {
+		targetPath = targetPath.slice(3);
+		importerId = '_/' + importerId;
+	}
 	let relativePath = normalize(relative(dirname(importerId), targetPath));
 	if (stripJsExtension && relativePath.endsWith('.js')) {
 		relativePath = relativePath.slice(0, -3);
diff --git a/test/chunking-form/samples/relative-external-outside-output/_config.js b/test/chunking-form/samples/relative-external-outside-output/_config.js
@@ -0,0 +1,9 @@
+module.exports = defineTest({
+	description: 'allows relative external dependencies outside of output dir',
+	options: {
+		input: { main: 'main.js', 'nested/main': 'nested/main.js' },
+		external(id) {
+			return id.startsWith('../');
+		}
+	}
+});
diff --git a/test/chunking-form/samples/relative-external-outside-output/_expected/amd/main.js b/test/chunking-form/samples/relative-external-outside-output/_expected/amd/main.js
@@ -0,0 +1,5 @@
+define(['../first', '../../second'], (function (first_js, second_js) { 'use strict';
+
+	console.log(first_js.first, second_js.second);
+
+}));
diff --git a/test/chunking-form/samples/relative-external-outside-output/_expected/amd/nested/main.js b/test/chunking-form/samples/relative-external-outside-output/_expected/amd/nested/main.js
@@ -0,0 +1,5 @@
+define(['../../first', '../../../second'], (function (first_js, second_js) { 'use strict';
+
+	console.log(first_js.first, second_js.second);
+
+}));
diff --git a/test/chunking-form/samples/relative-external-outside-output/_expected/cjs/main.js b/test/chunking-form/samples/relative-external-outside-output/_expected/cjs/main.js
@@ -0,0 +1,6 @@
+'use strict';
+
+var first_js = require('../first.js');
+var second_js = require('../../second.js');
+
+console.log(first_js.first, second_js.second);
diff --git a/test/chunking-form/samples/relative-external-outside-output/_expected/cjs/nested/main.js b/test/chunking-form/samples/relative-external-outside-output/_expected/cjs/nested/main.js
@@ -0,0 +1,6 @@
+'use strict';
+
+var first_js = require('../../first.js');
+var second_js = require('../../../second.js');
+
+console.log(first_js.first, second_js.second);
diff --git a/test/chunking-form/samples/relative-external-outside-output/_expected/es/main.js b/test/chunking-form/samples/relative-external-outside-output/_expected/es/main.js
@@ -0,0 +1,4 @@
+import { first } from '../first.js';
+import { second } from '../../second.js';
+
+console.log(first, second);
diff --git a/test/chunking-form/samples/relative-external-outside-output/_expected/es/nested/main.js b/test/chunking-form/samples/relative-external-outside-output/_expected/es/nested/main.js
@@ -0,0 +1,4 @@
+import { first } from '../../first.js';
+import { second } from '../../../second.js';
+
+console.log(first, second);
diff --git a/test/chunking-form/samples/relative-external-outside-output/_expected/system/main.js b/test/chunking-form/samples/relative-external-outside-output/_expected/system/main.js
@@ -0,0 +1,16 @@
+System.register(['../first.js', '../../second.js'], (function () {
+	'use strict';
+	var first, second;
+	return {
+		setters: [function (module) {
+			first = module.first;
+		}, function (module) {
+			second = module.second;
+		}],
+		execute: (function () {
+
+			console.log(first, second);
+
+		})
+	};
+}));
diff --git a/test/chunking-form/samples/relative-external-outside-output/_expected/system/nested/main.js b/test/chunking-form/samples/relative-external-outside-output/_expected/system/nested/main.js
@@ -0,0 +1,16 @@
+System.register(['../../first.js', '../../../second.js'], (function () {
+	'use strict';
+	var first, second;
+	return {
+		setters: [function (module) {
+			first = module.first;
+		}, function (module) {
+			second = module.second;
+		}],
+		execute: (function () {
+
+			console.log(first, second);
+
+		})
+	};
+}));
diff --git a/test/chunking-form/samples/relative-external-outside-output/main.js b/test/chunking-form/samples/relative-external-outside-output/main.js
@@ -0,0 +1,3 @@
+import { first } from '../first.js';
+import { second } from '../../second.js';
+console.log(first, second);
diff --git a/test/chunking-form/samples/relative-external-outside-output/nested/main.js b/test/chunking-form/samples/relative-external-outside-output/nested/main.js
@@ -0,0 +1,3 @@
+import { first } from '../../first.js';
+import { second } from '../../../second.js';
+console.log(first, second);

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +define(['../first', '../../second'], (function (first_js, second_js) { 'use strict';
++
 +	console.log(first_js.first, second_js.second);
++
 +}));