Skip to content

Commit 4ee73f8

Browse files
committed
refactor(tools): remove extraneous prefix in convert aliases
1 parent d7dd035 commit 4ee73f8

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

tools/pfe-tools/dev-server/config.ts

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,12 @@ function kebabCase(string: string) {
9494
.toLowerCase();
9595
}
9696

97-
function convertAliases(aliases: Record<string, string>, tagPrefix: string) {
97+
function convertAliases(aliases: Record<string, string>) {
9898
const keyedAliases = {} as Record<string, string>;
9999
for (const key in aliases) {
100100
if ({}.hasOwnProperty.call(aliases, key)) {
101101
const newKey = kebabCase(aliases[key]);
102-
const preFixedKey = `${tagPrefix}-${newKey}`;
103-
keyedAliases[preFixedKey] = key;
102+
keyedAliases[newKey] = key;
104103
}
105104
}
106105
return keyedAliases;
@@ -117,7 +116,7 @@ function pfeDevServerPlugin(options: PfeDevServerInternalConfig): Plugin {
117116
const { elementsDir, tagPrefix, aliases } = options;
118117
const { componentSubpath } = options.site;
119118

120-
const keyedAliases = convertAliases(aliases, tagPrefix);
119+
const keyedAliases = convertAliases(aliases);
121120

122121
const prefixTag = (tag: string) => {
123122
if (!tag.startsWith(tagPrefix)) {
@@ -140,17 +139,15 @@ function pfeDevServerPlugin(options: PfeDevServerInternalConfig): Plugin {
140139
.get(`/${componentSubpath}/:element/:fileName.js`, async ctx => {
141140
const { element, fileName } = ctx.params;
142141

143-
let prefixedElement = prefixTag(element);
144-
prefixedElement = keyedAliases[prefixedElement] ?? prefixedElement;
142+
const prefixedElement = keyedAliases[element] ?? prefixTag(element);
145143

146144
ctx.redirect(`/${elementsDir}/${prefixedElement}/${fileName}.ts`);
147145
})
148146
// Redirect `elements/jazz-hands/*.js` to `elements/pf-jazz-hands/*.ts`
149147
.get(`/${elementsDir}/:element/:fileName.js`, async ctx => {
150148
const { element, fileName } = ctx.params;
151149

152-
let prefixedElement = prefixTag(element);
153-
prefixedElement = keyedAliases[prefixedElement] ?? prefixedElement;
150+
const prefixedElement = keyedAliases[element] ?? prefixTag(element);
154151

155152
ctx.redirect(`/${elementsDir}/${prefixedElement}/${fileName}.ts`);
156153
})
@@ -159,8 +156,7 @@ function pfeDevServerPlugin(options: PfeDevServerInternalConfig): Plugin {
159156
.get(`/${componentSubpath}/:element/demo/:demoSubDir?/:fileName.:ext`, async (ctx, next) => {
160157
const { element, fileName, ext } = ctx.params;
161158

162-
let prefixedElement = prefixTag(element);
163-
prefixedElement = keyedAliases[prefixedElement] ?? prefixedElement;
159+
const prefixedElement = keyedAliases[element] ?? prefixTag(element);
164160

165161
if (fileName.includes('-lightdom') && ext === 'css') {
166162
ctx.redirect(`/${elementsDir}/${prefixedElement}/${fileName}.${ext}`);

0 commit comments

Comments
 (0)