diff --git a/src/utils.ts b/src/utils.ts index 16d8b86..3bfcb9b 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -254,9 +254,7 @@ export function createAliases( return []; } return extensions.reduce((aliases: Alias[], extension) => { - const replacement = extension.path.endsWith("/") - ? extension.path - : extension.path + "/"; + const replacement = extension.path.replace(/\/+$/g, ""); if (config === "@" || config === true) { aliases.push({ find: "@" + extension.extensionKey, replacement }); } diff --git a/tests/integration/project/packages/test_extension/Resources/Private/Main.entry.ts b/tests/integration/project/packages/test_extension/Resources/Private/Main.entry.ts index ba65d87..b7cbc1d 100644 --- a/tests/integration/project/packages/test_extension/Resources/Private/Main.entry.ts +++ b/tests/integration/project/packages/test_extension/Resources/Private/Main.entry.ts @@ -1,2 +1,2 @@ -import "./Css/Main.css"; -import "./JavaScript/Main.ts"; +import "EXT:test_extension/Resources/Private/Css/Main.css"; +import "EXT:test_extension/Resources/Private/JavaScript/Main.ts"; diff --git a/tests/unit/addAliases.test.ts b/tests/unit/addAliases.test.ts index db33083..9f2f782 100644 --- a/tests/unit/addAliases.test.ts +++ b/tests/unit/addAliases.test.ts @@ -9,17 +9,17 @@ describe("addAliases", () => { { type: "typo3-cms-extension", extensionKey: "test_extension", - path: "/path/to/dummy/extension1", + path: "/path/to/dummy/extension1/", }, ]), ).toEqual([ { find: "@test_extension", - replacement: "/path/to/dummy/extension1/", + replacement: "/path/to/dummy/extension1", }, { find: "EXT:test_extension", - replacement: "/path/to/dummy/extension1/", + replacement: "/path/to/dummy/extension1", }, ]); }); @@ -41,11 +41,11 @@ describe("addAliases", () => { { find: "@existing_find", replacement: "/path/to/replace/with/" }, { find: "@test_extension", - replacement: "/path/to/dummy/extension1/", + replacement: "/path/to/dummy/extension1", }, { find: "EXT:test_extension", - replacement: "/path/to/dummy/extension1/", + replacement: "/path/to/dummy/extension1", }, ]); }); @@ -78,7 +78,7 @@ describe("addAliases", () => { { type: "typo3-cms-extension", extensionKey: "test_extension", - path: "/path/to/dummy/extension1", + path: "/path/to/dummy/extension1/", }, ], ), @@ -86,11 +86,11 @@ describe("addAliases", () => { { find: "@existing_find", replacement: "/path/to/replace/with/" }, { find: "@test_extension", - replacement: "/path/to/dummy/extension1/", + replacement: "/path/to/dummy/extension1", }, { find: "EXT:test_extension", - replacement: "/path/to/dummy/extension1/", + replacement: "/path/to/dummy/extension1", }, ]); }); @@ -100,17 +100,17 @@ describe("addAliases", () => { { type: "typo3-cms-extension", extensionKey: "test_extension", - path: "/path/to/dummy/extension1/", + path: "/path/to/dummy/extension1//", }, ]), ).toEqual([ { find: "@test_extension", - replacement: "/path/to/dummy/extension1/", + replacement: "/path/to/dummy/extension1", }, { find: "EXT:test_extension", - replacement: "/path/to/dummy/extension1/", + replacement: "/path/to/dummy/extension1", }, ]); }); @@ -122,7 +122,7 @@ describe("addAliases", () => { { type: "typo3-cms-extension", extensionKey: "test_extension", - path: "/path/to/dummy/extension1", + path: "/path/to/dummy/extension1/", }, ], false, @@ -137,7 +137,7 @@ describe("addAliases", () => { { type: "typo3-cms-extension", extensionKey: "test_extension", - path: "/path/to/dummy/extension1", + path: "/path/to/dummy/extension1/", }, ], "@", @@ -145,7 +145,7 @@ describe("addAliases", () => { ).toEqual([ { find: "@test_extension", - replacement: "/path/to/dummy/extension1/", + replacement: "/path/to/dummy/extension1", }, ]); }); @@ -157,7 +157,7 @@ describe("addAliases", () => { { type: "typo3-cms-extension", extensionKey: "test_extension", - path: "/path/to/dummy/extension1", + path: "/path/to/dummy/extension1/", }, ], "EXT", @@ -165,7 +165,7 @@ describe("addAliases", () => { ).toEqual([ { find: "EXT:test_extension", - replacement: "/path/to/dummy/extension1/", + replacement: "/path/to/dummy/extension1", }, ]); });