Ensure that JSON files are included in build module resolution (#905) (…

…#1101)

* Fix #905
Ensure that json files are resolved if resolveJsonModule flag is set in tsconfig

* Add test

* PR Comments

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v7.0.3
+* [Ensure that JSON files are included in build module resolution](/~https://github.com/TypeStrong/ts-loader/pull/1101) - thanks @berickson1
+
 ## v7.0.2
 * [Make content hash consistent across machines](/~https://github.com/TypeStrong/ts-loader/pull/1085) - thanks @elyalvarado
 

package.json

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

src/instances.ts

@@ -351,6 +351,13 @@ export function initializeInstance(
 }
 
 function getScriptRegexp(instance: TSInstance) {
+  // If resolveJsonModules is set, we should accept json files
+  if (instance.configParseResult.options.resolveJsonModule) {
+    // if allowJs is set then we should accept js(x) files
+    return instance.configParseResult.options.allowJs === true
+      ? /\.tsx?$|\.json$|\.jsx?$/i
+      : /\.tsx?$|\.json$/i;
+  }
   // if allowJs is set then we should accept js(x) files
   return instance.configParseResult.options.allowJs === true
     ? /\.tsx?$|\.jsx?$/i

test/comparison-tests/resolveJsonModule/app.ts

@@ -0,0 +1,3 @@
+import * as file from "./file.json";
+
+console.log(file.foo);

test/comparison-tests/resolveJsonModule/expectedOutput-3.8/output.txt

@@ -0,0 +1,10 @@
+      Asset      Size  Chunks             Chunk Names
+  bundle.js     1 KiB       0  [emitted]  main
+../app.d.ts  11 bytes          [emitted]  
+Entrypoint main = bundle.js
+[0] ./app.ts 99 bytes {0} [built]
+[1] ./file.json 18 bytes {0} [built]
+
+WARNING in configuration
+The 'mode' option has not been set, webpack will fallback to 'production' for this value. Set 'mode' option to 'development' or 'production' to enable defaults for each environment.
+You can also set it to 'none' to disable any default behavior. Learn more: https://webpack.js.org/concepts/mode/

test/comparison-tests/resolveJsonModule/expectedOutput-transpile-3.8/output.txt

@@ -0,0 +1,9 @@
+    Asset      Size  Chunks             Chunk Names
+bundle.js  1.03 KiB       0  [emitted]  main
+Entrypoint main = bundle.js
+[0] ./app.ts 135 bytes {0} [built]
+[1] ./file.json 18 bytes {0} [built]
+
+WARNING in configuration
+The 'mode' option has not been set, webpack will fallback to 'production' for this value. Set 'mode' option to 'development' or 'production' to enable defaults for each environment.
+You can also set it to 'none' to disable any default behavior. Learn more: https://webpack.js.org/concepts/mode/

test/comparison-tests/resolveJsonModule/file.json

@@ -0,0 +1,3 @@
+{
+  "foo": "bar"
+}

test/comparison-tests/resolveJsonModule/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "resolveJsonModule": true,
+    "composite": true
+  },
+  "include": ["app.ts", "file.json"]
+}

test/comparison-tests/resolveJsonModule/webpack.config.js

@@ -0,0 +1,12 @@
+module.exports = {
+  entry: './app.ts',
+  output: {
+    filename: 'bundle.js'
+  },
+  resolve: {
+    extensions: ['.ts', '.json']
+  },
+  module: {
+    rules: [{ test: /\.tsx?$/, loader: 'ts-loader' }]
+  }
+};