Skip to content

Commit 6f41b73

Browse files
committed
Merge branch 'dev' of https://github.com/gfranko/amdclean into dev
* 'dev' of https://github.com/gfranko/amdclean: fix messy whitespace, oops use entire module path when normalizing module names
2 parents 6ace740 + 943f46d commit 6f41b73

File tree

1 file changed

+2
-21
lines changed

1 file changed

+2
-21
lines changed

src/amdclean.js

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -161,27 +161,8 @@
161161
if(name === '{}') {
162162
return name;
163163
}
164-
var moduleName = name,
165-
folderName,
166-
fileName,
167-
lastIndex = name.lastIndexOf('/'),
168-
containsRelativePath = name.lastIndexOf('/') !== -1,
169-
fullName;
170-
if(containsRelativePath) {
171-
moduleName = moduleName.substring(0, lastIndex);
172-
folderName = moduleName.substring((moduleName.lastIndexOf('/') + 1), moduleName.length).replace(/[^A-Za-z0-9_$]/g, '');
173-
fileName = name.substring((lastIndex + 1), name.length).replace(/[^A-Za-z0-9_$]/g, '');
174-
if(folderName && fileName) {
175-
fullName = folderName + '_' + fileName;
176-
} else if(!folderName && fileName) {
177-
fullName = fileName;
178-
} else {
179-
throw new Error(publicAPI.errorMsgs.malformedModuleName(name));
180-
}
181-
} else {
182-
fullName = name;
183-
}
184-
return publicAPI.prefixReservedWords(fullName.replace(/[^A-Za-z0-9_$]/g, ''));
164+
var normalized = name.replace(/\./g,'').replace(/[^A-Za-z0-9_$]/g,'_').replace(/^_+/,'');
165+
return publicAPI.prefixReservedWords(normalized);
185166
},
186167
// returnExpressionIdentifier
187168
// --------------------------

0 commit comments

Comments
 (0)