@s-ui/bundler 9.39.0-typescript.109 → 9.39.0-typescript.111

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@s-ui/bundler",
-  "version": "9.39.0-typescript.109",
+  "version": "9.39.0-typescript.111",
   "description": "Config-free bundler for ES6 React apps.",
   "bin": {
     "sui-bundler": "./bin/sui-bundler.js"
@@ -23,7 +23,7 @@
   "homepage": "https://github.com/SUI-Components/sui/tree/master/packages/sui-bundler#readme",
   "dependencies": {
     "@babel/core": "7.21.8",
-    "@s-ui/helpers": "1",
+    "@s-ui/helpers": "typescript",
     "@s-ui/sass-loader": "1",
     "@s-ui/typescript-config": "typescript",
     "@swc/core": "1.3.14",

package/scripts/postinstall.js

@@ -4,6 +4,7 @@ const crypto = require('crypto')
 const fs = require('fs-extra')
 const path = require('path')
 const {writeFile} = require('@s-ui/helpers/file.js')
+const {dynamicPackage} = require('@s-ui/helpers/packages')
 
 const {INIT_CWD} = process.env
 const tsConfigTemplate = `\
@@ -17,9 +18,14 @@ const tsConfigTemplate = `\
 
 const md5 = str => crypto.createHash('md5').update(str).digest('hex')
 const TS_CONFIG_PATH = path.join(INIT_CWD, 'tsconfig.json')
+const PACKAGE_JSON_CONFIG_PATH = path.join(INIT_CWD, 'package.json')
+
+const config = require(PACKAGE_JSON_CONFIG_PATH)?.config?.['sui-bundler'] || {}
 
 const shouldGenerateTSConfig = () => {
   try {
+    if (!config?.type || config?.type !== 'typescript') return false
+
     if (!fs.existsSync(TS_CONFIG_PATH)) return true
 
     const tsConfigLocal = fs.readFileSync(TS_CONFIG_PATH, {encoding: 'utf8'})
@@ -38,6 +44,7 @@ async function main() {
     process.exit(0)
   }
   await writeFile(TS_CONFIG_PATH, tsConfigTemplate)
+  await dynamicPackage('typescript')
   console.log(
     '❌ [sui-bundler postinstall] tsconfig.json was not up to date, so we updated it'
   )

package/webpack.config.dev.js

@@ -34,7 +34,15 @@ const webpackConfig = {
   resolve: {
     alias: {
       ...defaultAlias,
-      ...aliasFromConfig
+      ...aliasFromConfig,
+      'react/jsx-dev-runtime.js': path.resolve(
+        process.cwd(),
+        'node_modules/react/jsx-dev-runtime.js'
+      ),
+      'react/jsx-runtime.js': path.resolve(
+        process.cwd(),
+        'node_modules/react/jsx-runtime.js'
+      )
     },
     fallback: {
       fs: false,