Some code cleanup.

iclanton · iclanton · commit 30bf85d0b47c · 2020-02-01T00:32:30.000-08:00
diff --git a/webpack/localization-plugin/src/LocFilePreprocessor.ts b/webpack/localization-plugin/src/LocFilePreprocessor.ts
@@ -58,11 +58,7 @@ export class LocFilePreprocessor {
     FileSystem.ensureEmptyFolder(this._options.generatedTsFolder);
 
     const filesToIgnore: Set<string> = new Set<string>((this._options.filesToIgnore!).map((fileToIgnore) => {
-      if (path.isAbsolute(fileToIgnore)) {
-        return fileToIgnore;
-      } else {
-        return path.resolve(this._options.srcFolder, fileToIgnore);
-      }
+      return path.resolve(this._options.srcFolder, fileToIgnore);
     }));
 
     const locJsonFilePaths: string[] = glob.sync(
@@ -113,7 +109,7 @@ export class LocFilePreprocessor {
     for (const stringName in locFileData) { // eslint-disable-line guard-for-in
       const { comment } = locFileData[stringName];
 
-      if (comment.trim()) {
+      if (comment && comment.trim() !== '') {
         outputLines.push(...[
           '/**',
           ` * ${comment.replace(/\*\//g, '*\\/')}`,
diff --git a/webpack/localization-plugin/src/interfaces.ts b/webpack/localization-plugin/src/interfaces.ts
@@ -34,7 +34,7 @@ export interface ILocFile {
 
 export interface ILocalizedString {
   value: string;
-  comment: string;
+  comment?: string;
 }
 
 /**
diff --git a/webpack/localization-plugin/src/utilities/ResxReader.ts b/webpack/localization-plugin/src/utilities/ResxReader.ts
@@ -195,7 +195,7 @@ export class ResxReader {
 
       return {
         value,
-        comment: comment ||  ''
+        comment
       };
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ export interface ILocFile {`
`34`	`34`
`35`	`35`	`export interface ILocalizedString {`
`36`	`36`	`value: string;`
`37`		`- comment: string;`
	`37`	`+ comment?: string;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ export class ResxReader {`
`195`	`195`
`196`	`196`	`return {`
`197`	`197`	`value,`
`198`		`- comment: comment \|\| ''`
	`198`	`+ comment`
`199`	`199`	`};`
`200`	`200`	`}`
`201`	`201`	`}`