@tamagui/build 1.112.0 → 1.112.2

package/__tests__/fixtures/simple-package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+  Copyright (c) 2020 Nate Wienert
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.

package/__tests__/fixtures/simple-package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tamagui-build-test-simple-tpackage",
-  "version": "1.112.0",
-  "main": "dist/cjs/index.js",
+  "version": "1.112.2",
+  "main": "dist/cjs",
   "module": "dist/esm/index.mjs",
   "types": "dist/types/index.d.ts",
   "scripts": {
@@ -16,7 +16,7 @@
     "build:target-native": "TAMAGUI_TARGET=native node ../../../tamagui-build.js"
   },
   "devDependencies": {
-    "@tamagui/build": "1.112.0",
+    "@tamagui/build": "1.112.2",
     "typescript": "^5.5.2"
   }
 }

package/__tests__/fixtures/watch-package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+  Copyright (c) 2020 Nate Wienert
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.

package/__tests__/fixtures/watch-package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tamagui-build-test-watch-package",
-  "version": "1.112.0",
-  "main": "dist/cjs/index.js",
+  "version": "1.112.2",
+  "main": "dist/cjs",
   "module": "dist/esm/index.mjs",
   "types": "dist/types/index.d.ts",
   "scripts": {
@@ -16,7 +16,7 @@
     "build:target-native": "TAMAGUI_TARGET=native node ../../../tamagui-build.js"
   },
   "devDependencies": {
-    "@tamagui/build": "1.112.0",
+    "@tamagui/build": "1.112.2",
     "typescript": "^5.5.2"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/build",
-  "version": "1.112.0",
+  "version": "1.112.2",
   "bin": {
     "tamagui-build": "tamagui-build.js",
     "teesx": "./teesx.sh"
@@ -14,11 +14,11 @@
   "dependencies": {
     "@babel/core": "^7.25.2",
     "@swc/core": "^1.7.21",
-    "@tamagui/babel-plugin-fully-specified": "1.112.0",
+    "@tamagui/babel-plugin-fully-specified": "1.112.2",
     "@types/fs-extra": "^9.0.13",
     "babel-plugin-fully-specified": "*",
     "chokidar": "^3.5.2",
-    "esbuild": "^0.23.1",
+    "esbuild": "^0.24.0",
     "esbuild-plugin-es5": "^2.1.1",
     "esbuild-register": "^3.6.0",
     "execa": "^5.0.0",
@@ -29,6 +29,6 @@
   },
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "devDependencies": {
-    "vitest": "0.34.3"
+    "vitest": "2.1.1"
   }
 }

package/tamagui-build.js

@@ -19,7 +19,7 @@ const shouldSkipTypes = !!(
   process.argv.includes('--skip-types') || process.env.SKIP_TYPES
 )
 const shouldSkipMJS = !!process.argv.includes('--skip-mjs')
-const shouldBundle = !!process.argv.includes('--bundle')
+const shouldBundleFlag = !!process.argv.includes('--bundle')
 const shouldBundleNodeModules = !!process.argv.includes('--bundle-modules')
 const shouldClean = !!process.argv.includes('clean')
 const shouldCleanBuildOnly = !!process.argv.includes('clean:build')
@@ -271,17 +271,26 @@ async function buildJs() {
     return
   }
 
-  const files = shouldBundle
-    ? [pkgSource || './src/index.ts']
-    : (await fg(['src/**/*.(m)?[jt]s(x)?', 'src/**/*.css'])).filter(
-        (x) => !x.includes('.d.ts') && (exclude ? !x.match(exclude) : true)
-      )
-
   const externalPlugin = createExternalPlugin({
     skipNodeModulesBundle: true,
   })
 
-  const external = shouldBundle ? ['@swc/*', '*.node'] : undefined
+  const bundlePlugin = {
+    name: `external-most-modules`,
+    setup(build) {
+      build.onResolve({ filter: /.*/ }, (args) => {
+        if (
+          !args.path.startsWith('.') &&
+          !args.path.startsWith('/') &&
+          !args.path.startsWith('node:')
+        ) {
+          return { external: /^(esbuild|mdx-bundler)$/.test(args.path) }
+        }
+      })
+    },
+  }
+
+  const external = shouldBundleFlag ? ['@swc/*', '*.node'] : undefined
 
   /** @type { import('esbuild').BuildOptions } */
   const esbuildBundleProps =
@@ -341,24 +350,36 @@ async function buildJs() {
 
   const start = Date.now()
 
+  const allFiles = (await fg(['src/**/*.(m)?[jt]s(x)?', 'src/**/*.css'])).filter(
+    (x) => !x.includes('.d.ts') && (exclude ? !x.match(exclude) : true)
+  )
+
+  const entryPoints = shouldBundleFlag ? [pkgSource || './src/index.ts'] : allFiles
+
   const cjsConfig = {
     format: 'cjs',
-    entryPoints: files,
+    entryPoints,
     outdir: flatOut ? 'dist' : 'dist/cjs',
-    bundle: shouldBundle,
+    bundle: shouldBundleFlag,
     external,
-    plugins: shouldBundleNodeModules ? [] : [externalPlugin],
+    plugins: shouldBundleNodeModules ? [bundlePlugin] : [externalPlugin],
     minify: !!process.env.MINIFY,
     platform: 'node',
   }
 
+  const cjsConfigWeb = {
+    ...cjsConfig,
+
+    // metro cant do platform-specific with cjs :/
+    // outExtension: { '.js': '.cjs' },
+  }
+
   const esmConfig = {
     target: 'esnext',
     format: 'esm',
-    entryPoints: files,
+    entryPoints,
+    bundle: shouldBundleFlag,
     outdir: flatOut ? 'dist' : 'dist/esm',
-    bundle: shouldBundle,
-    external,
     allowOverwrite: true,
     minify: !!process.env.MINIFY,
   }
@@ -379,8 +400,10 @@ async function buildJs() {
   return await Promise.all([
     // web output to cjs
     pkgMain
-      ? esbuildWriteIfChanged(cjsConfig, {
+      ? esbuildWriteIfChanged(cjsConfigWeb, {
           platform: 'web',
+          bundle: shouldBundleFlag,
+          // specifyCJS: true,
         })
       : null,
 
@@ -422,6 +445,7 @@ async function buildJs() {
     pkgModule
       ? esbuildWriteIfChanged(esmConfig, {
           platform: 'web',
+          bundle: shouldBundleFlag,
         })
       : null,
 
@@ -439,8 +463,8 @@ async function buildJs() {
             // only diff is jsx preserve and outdir
             jsx: 'preserve',
             outdir: flatOut ? 'dist' : 'dist/jsx',
-            entryPoints: files,
-            bundle: shouldBundle,
+            entryPoints,
+            bundle: shouldBundleFlag,
             allowOverwrite: true,
             target: 'esnext',
             format: 'esm',
@@ -460,8 +484,8 @@ async function buildJs() {
             // only diff is jsx preserve and outdir
             jsx: 'preserve',
             outdir: flatOut ? 'dist' : 'dist/jsx',
-            entryPoints: files,
-            bundle: shouldBundle,
+            entryPoints,
+            bundle: shouldBundleFlag,
             allowOverwrite: true,
             target: 'node16',
             format: 'esm',
@@ -474,7 +498,11 @@ async function buildJs() {
         )
       : null,
   ]).then(() => {
-    if (process.env.DEBUG) console.info(`built js in ${Date.now() - start}ms`)
+    if (process.env.DEBUG) {
+      console.info(`built js in ${Date.now() - start}ms`)
+    }
+
+    void esbuild.stop()
   })
 }
 
@@ -486,13 +514,14 @@ async function buildJs() {
 async function esbuildWriteIfChanged(
   /** @type { import('esbuild').BuildOptions } */
   opts,
-  { platform, env } = {
+  { platform, env, specifyCJS } = {
     platform: '',
+    specifyCJS: false,
     env: '',
   }
 ) {
-  if (!shouldWatch && !platform) {
-    return await esbuild.build(opts)
+  if (!platform) {
+    throw new Error(`Must provide platform of web or native`)
   }
 
   const isESM = opts.target === 'esm' || opts.target === 'esnext'
@@ -513,7 +542,7 @@ async function esbuildWriteIfChanged(
     const webEsbuildSettings = {
       target: 'esnext',
       jsx: 'automatic',
-      platform: shouldBundle ? 'node' : 'neutral',
+      platform: opts.bundle ? 'node' : 'neutral',
       tsconfigRaw: {
         compilerOptions: {
           paths: {
@@ -674,6 +703,32 @@ async function esbuildWriteIfChanged(
 
   // path specifics:
 
+  if (specifyCJS) {
+    await Promise.all(
+      outputs.map(async (file) => {
+        if (!file) return
+
+        const { path, contents } = file
+
+        if (!path.endsWith('.cjs')) return
+
+        const result = opts.bundle
+          ? { code: contents }
+          : transform(contents, {
+              filename: path,
+              configFile: false,
+              sourceMap: true,
+              plugins: [
+                require.resolve('@tamagui/babel-plugin-fully-specified/commonjs'),
+              ].filter(Boolean),
+            })
+
+        await FSE.writeFile(path, result.code)
+      })
+    )
+    return
+  }
+
   if (shouldSkipMJS || !isESM) {
     return
   }
@@ -691,7 +746,7 @@ async function esbuildWriteIfChanged(
 
       // if bundling no need to specify as its all internal
       // and babel is bad on huge bundled files
-      const result = shouldBundle
+      const result = opts.bundle
         ? { code: contents }
         : transform(contents, {
             filename: mjsOutPath,