fix: 🐛 SWC and babel fixes

seznam · Feb 22, 2022 · 4a872dc · 4a872dc
1 parent f00c359
commit 4a872dc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/packages/cli/src/commands/dev.ts b/packages/cli/src/commands/dev.ts
@@ -116,20 +116,19 @@ const dev: HandlerFn = async args => {
     // Create compiler
     const compiler = webpack(config);
 
-    // Start watch mode & create dev server for HMR (only on client bundle)
-    await Promise.all(
-      [
-        watchCompiler(compiler, args, imaConfig),
-        !args.forceSPA &&
-          createDevServer(
-            compiler.compilers.find(({ name }) =>
-              args.forceSPAWithHMR ? name === 'client' : name === 'client.es'
-            ),
-            devServerConfig.hostname,
-            devServerConfig.port
-          ),
-      ].filter(Boolean)
-    );
+    // Start watch compiler
+    await watchCompiler(compiler, args, imaConfig);
+
+    // Start HMR dev server
+    if (!args.forceSPA) {
+      await createDevServer(
+        compiler.compilers.find(({ name }) =>
+          args.forceSPAWithHMR ? name === 'client' : name === 'client.es'
+        ),
+        devServerConfig.hostname,
+        devServerConfig.port
+      );
+    }
 
     // Start nodemon and application server
     startNodemon(args);

diff --git a/packages/cli/src/webpack/config.ts b/packages/cli/src/webpack/config.ts
@@ -96,7 +96,7 @@ export default async (
                     ? '[path][name]__[local]--[hash:base64:5]'
                     : '[hash:base64]',
                 },
-                sourceMap: useSourceMaps,
+                sourceMap: imaConfig.experiments?.swc, // Doesn't currently work with babel
               },
             },
           ]
@@ -112,6 +112,7 @@ export default async (
                 [
                   'postcss-preset-env',
                   {
+                    browsers: 'defaults',
                     autoprefixer: {
                       flexbox: 'no-2009',
                     },
@@ -178,7 +179,7 @@ export default async (
                 }).toString()}`,
               useHMR &&
                 isDebug &&
-                `@ima/hmr-client/dist/imaHmrClient?${new URLSearchParams({
+                `@ima/hmr-client/dist/imaHmrClient.js?${new URLSearchParams({
                   port: devServerConfig.port.toString(),
                   hostname: devServerConfig.hostname,
                   public: devServerConfig.public,

diff --git a/packages/cli/src/webpack/utils.ts b/packages/cli/src/webpack/utils.ts
@@ -162,7 +162,8 @@ function createCacheKey(
    */
   hash.update(
     JSON.stringify({
-      experiments: JSON.stringify(imaConfig.experiments),
+      experimentsNativeCss: imaConfig.experiments?.nativeCss,
+      experimentsSwc: imaConfig.experiments?.swc,
       command: ctx.command,
       forceSPA: ctx.forceSPA,
       forceSPAWithHMR: ctx.forceSPAWithHMR,