Merge pull request #16 from JakeSidSmith/fix-include

Fix include
JakeSidSmith · Jan 18, 2021 · 4263981 · 4263981
2 parents e0ea110 + e058ebc
commit 4263981
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jakesidsmith/tsb",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Dead simple TypeScript bundler, watcher, dev server, transpiler, and polyfiller",
   "publishConfig": {
     "access": "public"

diff --git a/src/constants.ts b/src/constants.ts
@@ -10,6 +10,7 @@ export const EXTENSIONS = ['.ts', '.tsx', '.js', '.jsx', '.cjs', '.mjs'];
 export const MATCHES_EXTENSION = new RegExp(
   `\\.(${EXTENSIONS.map((ext) => ext.substr(1)).join('|')})$`
 );
+export const MATCHES_GLOB = /\/[*/]+\/?$/;
 
 export const VALID_JSX_OPTIONS: readonly JSX[] = [
   'preserve',

diff --git a/src/webpack-config.ts b/src/webpack-config.ts
@@ -3,7 +3,12 @@ import { EnvironmentPlugin } from 'webpack';
 import { TsconfigPathsPlugin } from 'tsconfig-paths-webpack-plugin';
 import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
 import { Command, Mode, WebpackConfigs } from './types';
-import { CONFIG_FILE_NAME, EXTENSIONS, MATCHES_EXTENSION } from './constants';
+import {
+  CONFIG_FILE_NAME,
+  EXTENSIONS,
+  MATCHES_EXTENSION,
+  MATCHES_GLOB,
+} from './constants';
 import { getTsconfig, resolveTsconfigPath } from './tsconfig';
 import { getTsbConfig } from './config';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
@@ -93,6 +98,14 @@ export const createWebpackConfig = (
     logger.log(`Cleared ${fullOutDir}`);
   }
 
+  const tsconfigInclude = (tsconfig.include ?? []).map((comp) =>
+    comp.replace(MATCHES_GLOB, '')
+  );
+
+  const additionalInclude = additionalFilesToParse.map((comp) =>
+    path.resolve(fullConfigDir, comp)
+  );
+
   return {
     base: {
       mode,
@@ -115,11 +128,7 @@ export const createWebpackConfig = (
         rules: [
           {
             test: MATCHES_EXTENSION,
-            include: [...(tsconfig.include ?? [])].concat(
-              [...additionalFilesToParse].map((comp) =>
-                path.resolve(fullConfigDir, comp)
-              )
-            ),
+            include: [...tsconfigInclude, ...additionalInclude],
             use: [
               {
                 loader: 'babel-loader',

diff --git a/test-files/tsconfig.json b/test-files/tsconfig.json
@@ -10,5 +10,5 @@
     "jsx": "react",
     "module": "CommonJS"
   },
-  "include": ["src", "tsb.config.ts"]
+  "include": ["src/**/*", "tsb.config.ts"]
 }
diff --git a/tsconfig.dist.json b/tsconfig.dist.json
@@ -8,5 +8,5 @@
     "outDir": "dist",
     "module": "CommonJS"
   },
-  "include": ["src"]
+  "include": ["src/**/*"]
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -14,5 +14,5 @@
     "moduleResolution": "Node",
     "module": "ESNext"
   },
-  "include": ["src", "tests"]
+  "include": ["src/**/*", "tests/**/*"]
 }