@tamagui/build 1.97.0 → 1.98.0

package/package.json

@@ -1,19 +1,16 @@
 {
   "name": "@tamagui/build",
-  "version": "1.97.0",
+  "version": "1.98.0",
   "bin": {
     "tamagui-build": "tamagui-build.js",
     "teesx": "./teesx.sh"
   },
-  "scripts": {
-    "build": "true",
-    "watch": "true"
-  },
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@babel/core": "^7.23.3",
+    "@tamagui/babel-plugin-fully-specified": "1.98.0",
     "@types/fs-extra": "^9.0.13",
     "babel-plugin-fully-specified": "*",
     "chokidar": "^3.5.2",
@@ -30,7 +27,7 @@
     "typescript": "*"
   },
   "devDependencies": {
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.5"
   },
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14"
 }

package/tamagui-build.js

@@ -245,7 +245,7 @@ async function buildJs() {
             '.js',
             '.jsx',
           ],
-          minify: process.env.MINIFY ? true : false,
+          minify: !!process.env.MINIFY,
           define: {
             'process.env.TAMAGUI_IS_CORE_NODE': '"1"',
           },
@@ -261,7 +261,7 @@ async function buildJs() {
     bundle: shouldBundle,
     external,
     plugins: shouldBundleNodeModules ? [] : [externalPlugin],
-    minify: process.env.MINIFY ? true : false,
+    minify: !!process.env.MINIFY,
     platform: 'node',
   }
 
@@ -272,7 +272,7 @@ async function buildJs() {
     bundle: shouldBundle,
     external,
     allowOverwrite: true,
-    minify: process.env.MINIFY ? true : false,
+    minify: !!process.env.MINIFY,
   }
 
   if (pkgSource) {
@@ -357,7 +357,7 @@ async function buildJs() {
             allowOverwrite: true,
             target: 'esnext',
             format: 'esm',
-            minify: process.env.MINIFY ? true : false,
+            minify: !!process.env.MINIFY,
             platform: 'neutral',
           },
           {
@@ -379,7 +379,7 @@ async function buildJs() {
             allowOverwrite: true,
             target: 'node16',
             format: 'esm',
-            minify: process.env.MINIFY ? true : false,
+            minify: !!process.env.MINIFY,
             platform: 'neutral',
           },
           {
@@ -587,48 +587,47 @@ async function esbuildWriteIfChanged(
             !(await fs.pathExists(path)) ||
             (await fs.readFile(path, 'utf8')) !== contents
           ) {
-            await fs.writeFile(path, contents)
+            await fs.writeFile(path, contents, 'utf8')
           }
         } else {
-          await fs.writeFile(path, contents)
+          await fs.writeFile(path, contents, 'utf8')
         }
       }
 
-      await Promise.all([
-        flush(outString, outPath),
-        (async () => {
-          const shouldDoMJS = !shouldSkipMJS && isESM && mjs && outPath.endsWith('.js')
-          if (shouldDoMJS) {
-            const mjsOutPath = outPath.replace('.js', '.mjs')
-            // if bundling no need to specify as its all internal
-            // and babel is bad on huge bundled files
-            const output = shouldBundle
-              ? outString
-              : transform(outString, {
-                  filename: mjsOutPath,
-                  configFile: false,
-                  plugins: [
-                    [
-                      require.resolve('babel-plugin-fully-specified'),
-                      {
-                        // this doesnt work because the files dont exist as you build in random orders
-                        // ensureFileExists: true,
-                        esExtensionDefault: '.mjs',
-                        tryExtensions: ['.mjs', '.js'],
-                        esExtensions: ['.mjs', '.js'],
-                      },
-                    ],
-                    // pkg.tamagui?.build?.skipEnvToMeta
-                    //   ? null
-                    //   : require.resolve('./babel-plugin-process-env-to-meta'),
-                  ].filter(Boolean),
-                }).code
-
-            // output to mjs fully specified
-            await flush(output, mjsOutPath)
-          }
-        })(),
-      ])
+      // flush before fully specified so it finds the file
+      await flush(outString, outPath)
+
+      await (async () => {
+        const shouldDoMJS = !shouldSkipMJS && isESM && mjs && outPath.endsWith('.js')
+        if (shouldDoMJS) {
+          const mjsOutPath = outPath.replace('.js', '.mjs')
+          // if bundling no need to specify as its all internal
+          // and babel is bad on huge bundled files
+          const output = shouldBundle
+            ? outString
+            : transform(outString, {
+                filename: mjsOutPath,
+                configFile: false,
+                plugins: [
+                  [
+                    require.resolve('@tamagui/babel-plugin-fully-specified'),
+                    {
+                      ensureFileExists: true,
+                      esExtensionDefault: '.mjs',
+                      tryExtensions: ['.js'],
+                      esExtensions: ['.mjs'],
+                    },
+                  ],
+                  // pkg.tamagui?.build?.skipEnvToMeta
+                  //   ? null
+                  //   : require.resolve('./babel-plugin-process-env-to-meta'),
+                ].filter(Boolean),
+              }).code
+
+          // output to mjs fully specified
+          await fs.writeFile(mjsOutPath, output, 'utf8')
+        }
+      })()
     })
   )
 }