diff --git a/src/utils/renderNamePattern.ts b/src/utils/renderNamePattern.ts index 6734f202fc8..13690decc71 100644 --- a/src/utils/renderNamePattern.ts +++ b/src/utils/renderNamePattern.ts @@ -31,12 +31,13 @@ export function renderNamePattern( } export function makeUnique(name: string, existingNames: Record) { - if (name in existingNames === false) return name; + const existingNamesLowercase = new Set(Object.keys(existingNames).map(key => key.toLowerCase())); + if (!existingNamesLowercase.has(name.toLocaleLowerCase())) return name; const ext = extname(name); name = name.substr(0, name.length - ext.length); let uniqueName, uniqueIndex = 1; - while (existingNames[(uniqueName = name + ++uniqueIndex + ext)]); + while (existingNamesLowercase.has((uniqueName = name + ++uniqueIndex + ext).toLowerCase())); return uniqueName; } diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_config.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_config.js new file mode 100644 index 00000000000..85f8e574fd6 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_config.js @@ -0,0 +1,21 @@ +module.exports = { + description: 'Preserve modules id case sensitive', + options: { + input: 'main.js', + preserveModules: true, + plugins: [ + { + resolveId(id) { + if (id.toLowerCase().includes('one')) { + return id; + } + }, + load(id) { + if (id.toLowerCase().includes('one')) { + return `export default '${id.replace('\0', '')}'`; + } + } + } + ] + } +}; diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/amd/_virtual/_One1.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/amd/_virtual/_One1.js new file mode 100644 index 00000000000..0383829b24e --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/amd/_virtual/_One1.js @@ -0,0 +1,7 @@ +define(function () { 'use strict'; + + var c = 'One1.js'; + + return c; + +}); diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/amd/_virtual/_One2.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/amd/_virtual/_One2.js new file mode 100644 index 00000000000..1febaba2ef7 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/amd/_virtual/_One2.js @@ -0,0 +1,7 @@ +define(function () { 'use strict'; + + var b = 'One.js'; + + return b; + +}); diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/amd/_virtual/_one.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/amd/_virtual/_one.js new file mode 100644 index 00000000000..469b63f9f86 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/amd/_virtual/_one.js @@ -0,0 +1,7 @@ +define(function () { 'use strict'; + + var a = 'one.js'; + + return a; + +}); diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/amd/main.js new file mode 100644 index 00000000000..803eecb1652 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/amd/main.js @@ -0,0 +1,5 @@ +define(['./_virtual/_one', './_virtual/_One2', './_virtual/_One1'], function (_one, _One, _One1) { 'use strict'; + + window.APP = { a: _one, b: _One, c: _One1 }; + +}); diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/cjs/_virtual/_One1.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/cjs/_virtual/_One1.js new file mode 100644 index 00000000000..2e2081c7b39 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/cjs/_virtual/_One1.js @@ -0,0 +1,5 @@ +'use strict'; + +var c = 'One1.js'; + +module.exports = c; diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/cjs/_virtual/_One2.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/cjs/_virtual/_One2.js new file mode 100644 index 00000000000..94e5e6eebdb --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/cjs/_virtual/_One2.js @@ -0,0 +1,5 @@ +'use strict'; + +var b = 'One.js'; + +module.exports = b; diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/cjs/_virtual/_one.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/cjs/_virtual/_one.js new file mode 100644 index 00000000000..04b4a696e73 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/cjs/_virtual/_one.js @@ -0,0 +1,5 @@ +'use strict'; + +var a = 'one.js'; + +module.exports = a; diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/cjs/main.js new file mode 100644 index 00000000000..d113352518b --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/cjs/main.js @@ -0,0 +1,7 @@ +'use strict'; + +var _one = require('./_virtual/_one.js'); +var _One = require('./_virtual/_One2.js'); +var _One1 = require('./_virtual/_One1.js'); + +window.APP = { a: _one, b: _One, c: _One1 }; diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One1.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One1.js new file mode 100644 index 00000000000..3ea816df737 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One1.js @@ -0,0 +1,3 @@ +var c = 'One1.js'; + +export default c; diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One2.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One2.js new file mode 100644 index 00000000000..d889775b3d6 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One2.js @@ -0,0 +1,3 @@ +var b = 'One.js'; + +export default b; diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_one.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_one.js new file mode 100644 index 00000000000..615c3de0ca9 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_one.js @@ -0,0 +1,3 @@ +var a = 'one.js'; + +export default a; diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/main.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/main.js new file mode 100644 index 00000000000..e7a751f410a --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/main.js @@ -0,0 +1,5 @@ +import a from './_virtual/_one.js'; +import b from './_virtual/_One2.js'; +import c from './_virtual/_One1.js'; + +window.APP = { a, b, c }; diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/_virtual/_One1.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/_virtual/_One1.js new file mode 100644 index 00000000000..eb4e015bab5 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/_virtual/_One1.js @@ -0,0 +1,10 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + var c = exports('default', 'One1.js'); + + } + }; +}); diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/_virtual/_One2.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/_virtual/_One2.js new file mode 100644 index 00000000000..04b90908308 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/_virtual/_One2.js @@ -0,0 +1,10 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + var b = exports('default', 'One.js'); + + } + }; +}); diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/_virtual/_one.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/_virtual/_one.js new file mode 100644 index 00000000000..f6c4ac9f9fd --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/_virtual/_one.js @@ -0,0 +1,10 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + var a = exports('default', 'one.js'); + + } + }; +}); diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/main.js new file mode 100644 index 00000000000..17303445bb0 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/main.js @@ -0,0 +1,18 @@ +System.register(['./_virtual/_one.js', './_virtual/_One2.js', './_virtual/_One1.js'], function () { + 'use strict'; + var a, b, c; + return { + setters: [function (module) { + a = module.default; + }, function (module) { + b = module.default; + }, function (module) { + c = module.default; + }], + execute: function () { + + window.APP = { a, b, c }; + + } + }; +}); diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/main.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/main.js new file mode 100644 index 00000000000..49a5f34ffef --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/main.js @@ -0,0 +1,5 @@ +import a from '\0one.js'; +import b from '\0One.js'; +import c from '\0One1.js'; + +window.APP = { a, b, c };