Merge remote-tracking branch 'origin/master' into feat/option-to-disable-locals-generation

Author: raphael-leger

src/utils.js

@@ -50,23 +50,24 @@ const filenameToTypingsFilename = filename => {
 const generateGenericExportInterface = (cssModuleKeys, pascalCaseFileName, disableLocalsExport) => {
   const interfaceName = `I${pascalCaseFileName}`;
   const moduleName = `${pascalCaseFileName}Module`;
+  const namespaceName = `${pascalCaseFileName}Namespace`;
 
   const localsExportType = disableLocalsExport ? `` : ` & {
   /** WARNING: Only available when \`css-loader\` is used without \`style-loader\` or \`mini-css-extract-plugin\` */
-  locals: ${moduleName}.${interfaceName};
+  locals: ${namespaceName}.${interfaceName};
 }`;
 
   const interfaceProperties = cssModuleToTypescriptInterfaceProperties(
     cssModuleKeys,
     "    "
   );
-  return `declare namespace ${moduleName} {
+  return `declare namespace ${namespaceName} {
   export interface I${pascalCaseFileName} {
 ${interfaceProperties}
   }
 }
 
-declare const ${moduleName}: ${moduleName}.${interfaceName}${localsExportType};
+declare const ${moduleName}: ${namespaceName}.${interfaceName}${localsExportType};
 
 export = ${moduleName};`;
 };

test/__snapshots__/index.test.js.snap

@@ -1,43 +1,43 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`default options 1`] = `
-"declare namespace ExampleCssModule {
+"declare namespace ExampleCssNamespace {
   export interface IExampleCss {
     \\"bar-baz\\": string;
     composed: string;
     foo: string;
   }
 }
 
-declare const ExampleCssModule: ExampleCssModule.IExampleCss & {
+declare const ExampleCssModule: ExampleCssNamespace.IExampleCss & {
   /** WARNING: Only available when \`css-loader\` is used without \`style-loader\` or \`mini-css-extract-plugin\` */
-  locals: ExampleCssModule.IExampleCss;
+  locals: ExampleCssNamespace.IExampleCss;
 };
 
 export = ExampleCssModule;
 "
 `;
 
 exports[`localsConvention asIs 1`] = `
-"declare namespace ExampleCssModule {
+"declare namespace ExampleCssNamespace {
   export interface IExampleCss {
     \\"bar-baz\\": string;
     composed: string;
     foo: string;
   }
 }
 
-declare const ExampleCssModule: ExampleCssModule.IExampleCss & {
+declare const ExampleCssModule: ExampleCssNamespace.IExampleCss & {
   /** WARNING: Only available when \`css-loader\` is used without \`style-loader\` or \`mini-css-extract-plugin\` */
-  locals: ExampleCssModule.IExampleCss;
+  locals: ExampleCssNamespace.IExampleCss;
 };
 
 export = ExampleCssModule;
 "
 `;
 
 exports[`localsConvention camelCase 1`] = `
-"declare namespace ExampleCssModule {
+"declare namespace ExampleCssNamespace {
   export interface IExampleCss {
     \\"bar-baz\\": string;
     barBaz: string;
@@ -46,9 +46,9 @@ exports[`localsConvention camelCase 1`] = `
   }
 }
 
-declare const ExampleCssModule: ExampleCssModule.IExampleCss & {
+declare const ExampleCssModule: ExampleCssNamespace.IExampleCss & {
   /** WARNING: Only available when \`css-loader\` is used without \`style-loader\` or \`mini-css-extract-plugin\` */
-  locals: ExampleCssModule.IExampleCss;
+  locals: ExampleCssNamespace.IExampleCss;
 };
 
 export = ExampleCssModule;
@@ -57,85 +57,85 @@ export = ExampleCssModule;
 
 exports[`with banner 1`] = `
 "// autogenerated by typings-for-css-modules-loader
-declare namespace ExampleCssModule {
+declare namespace ExampleCssNamespace {
   export interface IExampleCss {
     \\"bar-baz\\": string;
     composed: string;
     foo: string;
   }
 }
 
-declare const ExampleCssModule: ExampleCssModule.IExampleCss & {
+declare const ExampleCssModule: ExampleCssNamespace.IExampleCss & {
   /** WARNING: Only available when \`css-loader\` is used without \`style-loader\` or \`mini-css-extract-plugin\` */
-  locals: ExampleCssModule.IExampleCss;
+  locals: ExampleCssNamespace.IExampleCss;
 };
 
 export = ExampleCssModule;
 "
 `;
 
 exports[`with locals export disabled 1`] = `
-"declare namespace ExampleCssModule {
+"declare namespace ExampleCssNamespace {
   export interface IExampleCss {
     \\"bar-baz\\": string;
     composed: string;
     foo: string;
   }
 }
 
-declare const ExampleCssModule: ExampleCssModule.IExampleCss;
+declare const ExampleCssModule: ExampleCssNamespace.IExampleCss;
 
 export = ExampleCssModule;
 "
 `;
 
 exports[`with no formatter 1`] = `
-"declare namespace ExampleCssModule {
+"declare namespace ExampleCssNamespace {
   export interface IExampleCss {
     'bar-baz': string;
     'composed': string;
     'foo': string;
   }
 }
 
-declare const ExampleCssModule: ExampleCssModule.IExampleCss & {
+declare const ExampleCssModule: ExampleCssNamespace.IExampleCss & {
   /** WARNING: Only available when \`css-loader\` is used without \`style-loader\` or \`mini-css-extract-plugin\` */
-  locals: ExampleCssModule.IExampleCss;
+  locals: ExampleCssNamespace.IExampleCss;
 };
 
 export = ExampleCssModule;"
 `;
 
 exports[`with prettier 1`] = `
-"declare namespace ExampleCssModule {
+"declare namespace ExampleCssNamespace {
   export interface IExampleCss {
     \\"bar-baz\\": string;
     composed: string;
     foo: string;
   }
 }
 
-declare const ExampleCssModule: ExampleCssModule.IExampleCss & {
+declare const ExampleCssModule: ExampleCssNamespace.IExampleCss & {
   /** WARNING: Only available when \`css-loader\` is used without \`style-loader\` or \`mini-css-extract-plugin\` */
-  locals: ExampleCssModule.IExampleCss;
+  locals: ExampleCssNamespace.IExampleCss;
 };
 
 export = ExampleCssModule;
 "
 `;
 
 exports[`with sourcemap 1`] = `
-"declare namespace ExampleCssModule {
+"declare namespace ExampleCssNamespace {
   export interface IExampleCss {
     \\"bar-baz\\": string;
     composed: string;
     foo: string;
   }
 }
 
-declare const ExampleCssModule: ExampleCssModule.IExampleCss & {
+declare const ExampleCssModule: ExampleCssNamespace.IExampleCss & {
   /** WARNING: Only available when \`css-loader\` is used without \`style-loader\` or \`mini-css-extract-plugin\` */
-  locals: ExampleCssModule.IExampleCss;
+  locals: ExampleCssNamespace.IExampleCss;
 };
 
 export = ExampleCssModule;