Skip to content

Commit

Permalink
feat: Removing babel chunkname renaming (#75)
Browse files Browse the repository at this point in the history
This plugin will no longer rename chunks to replace slashes with dashes

BREAKING CHANGE: The plugin will no longer rename chunks to dashes
  • Loading branch information
ScriptedAlchemy authored Jan 30, 2019
1 parent 9b21a74 commit 6d9428c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 24 deletions.
12 changes: 6 additions & 6 deletions __tests__/__snapshots__/index.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
\`./base/\${page}/nested/{$another}folder\`)]).then(proms => proms[0]),
path: () => _path2.default.join(__dirname, \`./base/\${page}/nested/{$another}folder\`),
resolve: () => require.resolveWeak(\`./base/\${page}/nested/{$another}folder\`),
chunkName: () => \`base/\${page}-nested-{$another}folder\`
chunkName: () => \`base/\${page}/nested/{$another}folder\`
});
"
`;
Expand All @@ -154,7 +154,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
\`./base/\${page}/nested/folder\`)]).then(proms => proms[0]),
path: () => _path2.default.join(__dirname, \`./base/\${page}/nested/folder\`),
resolve: () => require.resolveWeak(\`./base/\${page}/nested/folder\`),
chunkName: () => \`base/\${page}-nested-folder\`
chunkName: () => \`base/\${page}/nested/folder\`
});
"
`;
Expand Down Expand Up @@ -668,11 +668,11 @@ const obj = {
component: () => (0, _universalImport2.default)({
id: \\"../components/nestedComponent\\",
load: () => Promise.all([import(
/* webpackChunkName: 'components-nestedComponent' */
/* webpackChunkName: 'components/nestedComponent' */
\`../components/nestedComponent\`)]).then(proms => proms[0]),
path: () => _path2.default.join(__dirname, \`../components/nestedComponent\`),
resolve: () => require.resolveWeak(\`../components/nestedComponent\`),
chunkName: () => \\"components-nestedComponent\\"
chunkName: () => \`components/nestedComponent\`
})
};
Expand All @@ -695,11 +695,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
(0, _universalImport2.default)({
id: \\"../components/nestedComponent\\",
load: () => Promise.all([import(
/* webpackChunkName: 'components-nestedComponent' */
/* webpackChunkName: 'components/nestedComponent' */
\`../components/nestedComponent\`)]).then(proms => proms[0]),
path: () => _path2.default.join(__dirname, \`../components/nestedComponent\`),
resolve: () => require.resolveWeak(\`../components/nestedComponent\`),
chunkName: () => \\"components-nestedComponent\\"
chunkName: () => \`components/nestedComponent\`
});
"
`;
Expand Down
20 changes: 2 additions & 18 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ function trimChunkNameBaseDir(baseDir) {
return baseDir.replace(/^[./]+|(\.js$)/g, '')
}

function prepareChunkNamePath(path) {
return path.replace(/\//g, '-')
}

function getImport(p, { source, nameHint }) {
return addDefault(p, source, { nameHint })
}
Expand All @@ -64,10 +60,8 @@ function createTrimmedChunkName(t, importArgNode) {
}

function prepareQuasi(quasi) {
const newPath = prepareChunkNamePath(quasi.value.cooked)

return Object.assign({}, quasi, {
value: { raw: newPath, cooked: newPath }
value: { raw: quasi.value.cooked, cooked: quasi.value.cooked }
})
}

Expand Down Expand Up @@ -200,14 +194,6 @@ function chunkNameOption(t, chunkNameTemplate, importArgNode) {
return t.objectProperty(t.identifier('chunkName'), chunkName)
}

function checkForNestedChunkName(node) {
const generatedChunkName = getMagicCommentChunkName(node)
const isNested =
generatedChunkName.indexOf('[request]') === -1 &&
generatedChunkName.indexOf('/') > -1
return isNested && prepareChunkNamePath(generatedChunkName)
}

module.exports = function universalImportPlugin({ types: t, template }) {
const chunkNameTemplate = template('() => MODULE')
const pathTemplate = template('() => PATH.join(__dirname, MODULE)')
Expand All @@ -226,9 +212,7 @@ module.exports = function universalImportPlugin({ types: t, template }) {
const importArgNode = getImportArgPath(p).node
t.existingChunkName = existingMagicCommentChunkName(importArgNode)
// no existing chunkname, no problem - we will reuse that for fixing nested chunk names
if (!t.existingChunkName) {
t.existingChunkName = checkForNestedChunkName(importArgNode)
}

const universalImport = getImport(p, IMPORT_UNIVERSAL_DEFAULT)

// if being used in an await statement, return load() promise
Expand Down

0 comments on commit 6d9428c

Please sign in to comment.