@s-ui/bundler 9.39.0-typescript.6 → 9.39.0-typescript.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@s-ui/bundler",
-  "version": "9.39.0-typescript.6",
+  "version": "9.39.0-typescript.8",
   "description": "Config-free bundler for ES6 React apps.",
   "bin": {
     "sui-bundler": "./bin/sui-bundler.js"
@@ -48,7 +48,7 @@
     "stream-http": "3.2.0",
     "strip-ansi": "6.0.1",
     "style-loader": "3.3.1",
-    "swc-loader": "^0.2.1",
+    "swc-loader": "0.2.1",
     "url": "0.11.0",
     "webpack": "5.82.1",
     "webpack-dev-server": "4.10.0",

package/shared/module-rules-babel.js

@@ -3,23 +3,32 @@ const fs = require('fs-extra')
 const path = require('path')
 const {config} = require('./index.js')
 
-const tsConfigPath = path.join(process.cwd(), 'tsconfig.json')
-let isTypeScriptEnabled = false
+const EXCLUDED_FOLDERS_REGEXP = new RegExp(
+  `node_modules(?!${path.sep}@s-ui(${path.sep}studio)(${path.sep}workbench)?${path.sep}src)`
+)
 
-try {
-  if (fs.existsSync(tsConfigPath)) {
-    isTypeScriptEnabled = true
+const getTSConfig = () => {
+  // Get TS config from the package dir.
+  const tsConfigPath = path.join(process.cwd(), 'tsconfig.json')
+  let tsConfig
+
+  try {
+    if (fs.existsSync(tsConfigPath)) {
+      tsConfig = JSON.parse(fs.readFileSync(tsConfigPath, {encoding: 'utf8'}))
+    }
+  } catch (err) {
+    console.error(err)
   }
-} catch (err) {
-  console.error(err)
+
+  return tsConfig
 }
 
-const EXCLUDED_FOLDERS_REGEXP = new RegExp(
-  `node_modules(?!${path.sep}@s-ui(${path.sep}studio)(${path.sep}workbench)?${path.sep}src)`
-)
+module.exports = ({isServer = false, supportLegacyBrowsers = true} = {}) => {
+  const tsConfig = getTSConfig()
+  // If TS config exists in root dir, set TypeScript as enabled.
+  const isTypeScriptEnabled = Boolean(tsConfig)
 
-module.exports = ({isServer = false, supportLegacyBrowsers = true} = {}) =>
-  isTypeScriptEnabled
+  return isTypeScriptEnabled
     ? {
         test: /\.(js|ts)x?$/,
         exclude: EXCLUDED_FOLDERS_REGEXP,
@@ -91,3 +100,4 @@ module.exports = ({isServer = false, supportLegacyBrowsers = true} = {}) =>
           }
         ]
       }
+}

package/webpack.config.prod.js

@@ -54,7 +54,7 @@ const webpackConfig = {
   context: path.resolve(CWD, 'src'),
   resolve: {
     alias: {...aliasFromConfig},
-    extensions: ['.js', '.json'],
+    extensions: ['.js', '.json', 'ts', 'tsx'],
     modules: ['node_modules', path.resolve(CWD)],
     fallback: {
       assert: false,