Fix getOptionsHash when two options has different props but same values. (#1170)

* Fix getOptionsHash when two options has different props but same values.

* Swap map for forEach

* fix `appendTsSuffixTo` use `RegExp | string` instead of `RegExp` for correct serialization in `thread-loader`

* Bump version v8.0.3

Co-authored-by: John Reilly <[email protected]>

Author: meowtec

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v8.0.3
+* [Fix the wrong instance caching when using `appendTsSuffixTo` and `appendTsxSuffixTo` together](https://github.com/TypeStrong/ts-loader/pull/1170) - thanks @meowtec
+
 ## v8.0.2
 
 * [Fix 2 issues with experimentalWatchApi](https://github.com/TypeStrong/ts-loader/pull/1159) - thanks @appzuka

README.md

@@ -498,14 +498,23 @@ of your code.
 #### appendTsSuffixTo
 | Type | Default Value |
 |------|--------------|
-| `RegExp[]` | `[]`|
+| `(RegExp | string)[]` | `[]`|
 
 #### appendTsxSuffixTo
 | Type | Default Value |
 |------|--------------|
-| `RegExp[]` | `[]`|
+| `(RegExp | string)[]` | `[]`|
 
 A list of regular expressions to be matched against filename. If filename matches one of the regular expressions, a `.ts` or `.tsx` suffix will be appended to that filename.
+If you're using [HappyPack](https://github.com/amireh/happypack) or [thread-loader](https://github.com/webpack-contrib/thread-loader) with `ts-loader`, you need use the `string` type for the regular expressions, not `RegExp` object.
+
+```js
+// change this:
+{ appendTsSuffixTo: [/\.vue$/] }
+// to:
+{ appendTsSuffixTo: ['\\.vue$'] }
+```
+
 
 This is useful for `*.vue` [file format](https://vuejs.org/v2/guide/single-file-components.html) for now. (Probably will benefit from the new single file format in the future.)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-loader",
-  "version": "8.0.2",
+  "version": "8.0.3",
   "description": "TypeScript loader for webpack",
   "main": "index.js",
   "types": "dist",

src/index.ts

@@ -160,9 +160,10 @@ function setModuleMeta(
  */
 function getOptionsHash(loaderOptions: LoaderOptions) {
   const hash = crypto.createHash('sha256');
-  Object.values(loaderOptions).map((v: any) => {
-    if (v) {
-      hash.update(v.toString());
+  Object.keys(loaderOptions).forEach(key => {
+    const value = loaderOptions[key];
+    if (value) {
+      hash.update(key + value.toString());
     }
   });
   return hash.digest('hex').substring(0, 16);

src/interfaces.ts

@@ -266,8 +266,8 @@ export interface LoaderOptions {
   onlyCompileBundledFiles: boolean;
   colors: boolean;
   compilerOptions: typescript.CompilerOptions;
-  appendTsSuffixTo: RegExp[];
-  appendTsxSuffixTo: RegExp[];
+  appendTsSuffixTo: (RegExp | string)[];
+  appendTsxSuffixTo: (RegExp | string)[];
   happyPackMode: boolean;
   getCustomTransformers:
     | string

src/utils.ts

@@ -137,7 +137,7 @@ export function makeError(
 }
 
 export function appendSuffixIfMatch(
-  patterns: RegExp[],
+  patterns: (RegExp | string)[],
   filePath: string,
   suffix: string
 ): string {
@@ -152,7 +152,7 @@ export function appendSuffixIfMatch(
 }
 
 export function appendSuffixesIfMatch(
-  suffixDict: { [suffix: string]: RegExp[] },
+  suffixDict: { [suffix: string]: (RegExp | string)[] },
   filePath: string
 ): string {
   let amendedPath = filePath;