Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow [format] pattern for ID generation #2387

Merged
merged 2 commits into from
Aug 11, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Chunk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1009,6 +1009,8 @@ export default class Chunk {
const outName = makeUnique(
renderNamePattern(pattern, patternName, type => {
switch (type) {
case 'format':
return options.format === 'es' ? 'esm' : options.format;
case 'hash':
return this.computeFullHash(addons, options);
case 'name':
Expand Down
10 changes: 10 additions & 0 deletions test/chunking-form/samples/filenames-patterns/_config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module.exports = {
description: 'filenames custom pattern',
options: {
input: ['main1.js', 'main2.js'],
output: {
entryFileNames: 'entry-[name]-[hash]-[format].js',
chunkFileNames: 'chunk-[name]-[hash]-[format].js',
},
},
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
define(['exports'], function (exports) { 'use strict';

var dep = { x: 42 };

function log (x) {
if (dep) {
console.log(x);
}
}

exports.dep = dep;
exports.log = log;

});
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
define(['./chunk-main2-bff49b9a-amd.js'], function (main2) { 'use strict';

main2.log(main2.dep);

});
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
define(['./chunk-main2-bff49b9a-amd.js'], function (main2) { 'use strict';



return main2.log;

});
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
'use strict';

var dep = { x: 42 };

function log (x) {
if (dep) {
console.log(x);
}
}

exports.dep = dep;
exports.log = log;
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use strict';

var main2 = require('./chunk-main2-4b102ef6-cjs.js');

main2.log(main2.dep);
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
'use strict';

var main2 = require('./chunk-main2-4b102ef6-cjs.js');



module.exports = main2.log;
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
var dep = { x: 42 };

function log (x) {
if (dep) {
console.log(x);
}
}

export { dep as a, log as b };
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { a as dep, b as log } from './chunk-main2-e628225d-esm.js';

log(dep);
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { b as default } from './chunk-main2-e628225d-esm.js';
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
System.register([], function (exports, module) {
'use strict';
return {
execute: function () {

exports('b', log);

var dep = exports('a', { x: 42 });

function log (x) {
if (dep) {
console.log(x);
}
}

}
};
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
System.register(['./chunk-main2-4b538eea-system.js'], function (exports, module) {
'use strict';
var dep, log;
return {
setters: [function (module) {
dep = module.a;
log = module.b;
}],
execute: function () {

log(dep);

}
};
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
System.register(['./chunk-main2-4b538eea-system.js'], function (exports, module) {
'use strict';
return {
setters: [function (module) {
exports('default', module.b);
}],
execute: function () {



}
};
});
1 change: 1 addition & 0 deletions test/chunking-form/samples/filenames-patterns/dep.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export default { x: 42 }
4 changes: 4 additions & 0 deletions test/chunking-form/samples/filenames-patterns/main1.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import dep from './dep.js';
import log from './main2.js';

log(dep);
7 changes: 7 additions & 0 deletions test/chunking-form/samples/filenames-patterns/main2.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import dep from './dep.js';

export default function log (x) {
if (dep) {
console.log(x);
}
}