@s-ui/bundler 9.39.0-typescript.112 → 9.39.0-typescript.116

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@s-ui/bundler",
-  "version": "9.39.0-typescript.112",
+  "version": "9.39.0-typescript.116",
   "description": "Config-free bundler for ES6 React apps.",
   "bin": {
     "sui-bundler": "./bin/sui-bundler.js"

package/scripts/postinstall.js

@@ -11,9 +11,9 @@ const tsConfigTemplate = `\
 {
   "extends": "@s-ui/bundler/tsconfig.json",
   "compilerOptions": {
-    "rootDir": "./src"
+    "rootDir": "./"
   },
-  "include": ["**/*"]
+  "include": ["src", "domain", "components"]
 }`
 
 const md5 = str => crypto.createHash('md5').update(str).digest('hex')

package/shared/module-rules-babel.js

@@ -2,6 +2,7 @@
 const fs = require('fs-extra')
 const path = require('path')
 const {config} = require('./index.js')
+const {getSWCConfig} = require('@s-ui/typescript-config')
 
 const EXCLUDED_FOLDERS_REGEXP = new RegExp(
   `node_modules(?!${path.sep}@s-ui(${path.sep}studio)(${path.sep}workbench)?${path.sep}src)`
@@ -35,43 +36,7 @@ module.exports = ({isServer = false, supportLegacyBrowsers = true} = {}) => {
         use: [
           {
             loader: require.resolve('swc-loader'),
-            options: {
-              minify: true,
-              jsc: {
-                parser: {
-                  syntax: 'typescript',
-                  tsx: true,
-                  dynamicImport: true,
-                  privateMethod: true,
-                  functionBind: true,
-                  exportDefaultFrom: true,
-                  exportNamespaceFrom: true,
-                  decorators: true,
-                  decoratorsBeforeExport: true,
-                  topLevelAwait: true,
-                  importMeta: true
-                },
-                transform: {
-                  legacyDecorator: true,
-                  react: {
-                    useBuiltins: true,
-                    runtime: 'automatic'
-                  }
-                },
-                target: 'es5',
-                loose: true,
-                externalHelpers: true
-              },
-              env: {
-                targets: {
-                  ie: '11'
-                },
-                dynamicImport: true,
-                loose: true,
-                mode: 'entry',
-                coreJs: 3
-              }
-            }
+            options: getSWCConfig({isModern: false, isTypeScript: true})
           }
         ]
       }

package/shared/resolve-alias.js

@@ -1,5 +1,6 @@
 const path = require('path')
 const {config} = require('./config.js')
+const fs = require('fs')
 
 const {PWD} = process.env
 
@@ -13,21 +14,31 @@ const defaultPackagesToAlias = [
   'react',
   'react-dom',
   'react-router-dom',
+  'react/jsx-dev-runtime',
+  'react/jsx-runtime',
   '@s-ui/pde',
   '@s-ui/react-context',
   '@s-ui/react-router'
 ]
 
-const createAliasPath = pkgName =>
-  path.resolve(path.join(PWD, `./node_modules/${pkgName}`))
+const createAliasPath = pkgName => {
+  const PWDNodeModules = path.join(PWD, './node_modules')
+  if (fs.existsSync(PWDNodeModules))
+    return path.resolve(path.join(PWDNodeModules, pkgName))
 
-const mustPackagesToAlias = {
-  'react/jsx-dev-runtime.js': require.resolve('react/jsx-dev-runtime'),
-  'react/jsx-runtime.js': require.resolve('react/jsx-runtime')
+  try {
+    return require.resolve(pkgName).replace(/\/index\.js$/, '')
+  } catch (e) {
+    return ''
+  }
 }
 
+const mustPackagesToAlias = {}
+
 exports.defaultAlias = Object.fromEntries(
-  defaultPackagesToAlias.map(pkgName => [pkgName, createAliasPath(pkgName)])
+  defaultPackagesToAlias
+    .map(pkgName => [pkgName, createAliasPath(pkgName)])
+    .filter(([, path]) => path)
 )
 
 const aliasFromConfig = config.alias

package/tsconfig.json

@@ -1,3 +1,3 @@
 {
-  "extends": ["@s-ui/typescript-config/tsconfig.json"]
+  "extends": "@s-ui/typescript-config/tsconfig.json"
 }