PR Feedback

Author: adamraya

packages/pwa-kit-dev/src/configs/babel/babel-config.js

@@ -63,12 +63,12 @@ export default {
         function (filepath) {
             const normalizedPath = path.normalize(filepath)
 
+            const extensionRegex = new RegExp(
+                `node_modules${path.sep}[^${path.sep}]+${path.sep}(pwa-kit-extension-sdk|@[^${path.sep}]+${path.sep}extension-|extension-)`
+            )
+
             // Return false if it's an allowed extension package @salesforce/pwa-kit-extension-sdk and extension-*
-            if (
-                new RegExp(
-                    `node_modules\\${path.sep}[^\\${path.sep}]+\\${path.sep}(pwa-kit-extension-sdk|@[^\\${path.sep}]+\\${path.sep}extension-|extension-)`
-                ).test(normalizedPath)
-            ) {
+            if (extensionRegex.test(normalizedPath)) {
                 return false
             }
 

packages/pwa-kit-dev/src/configs/webpack/config.js

@@ -342,7 +342,7 @@ const ruleForBabelLoader = (babelPlugins) => {
         // NOTE: Because our extensions are just folders containing source code, we need to ensure that the babel-loader processes them.
         // This regex exclude everything in node_modules, but node_modules/extensions-*/ folders
         exclude: new RegExp(
-            `node_modules\\${path.sep}(?!(@?[^\\${path.sep}]+\\${path.sep})?extension-).*`,
+            `node_modules${path.sep}(?!(@?[^${path.sep}]+${path.sep})?extension-).*`,
             'i'
         ),
         use: [

packages/pwa-kit-extension-sdk/src/configs/babel/utils.ts

@@ -49,22 +49,21 @@ export const buildBabelExtensibilityArgs = (config: any) => {
         const extensions = getConfiguredExtensions(config)
         const serverPath = fse.realpathSync(p.resolve(SERVER_PATH))
         const placeHolderPath = fse.realpathSync(p.resolve(PLACEHOLDER_PATH))
-        const appPath = p.join('app', '**')
 
         const extensionSrcPaths =
             extensions.length > 0
-                ? extensions.map(([packageName]) => {
-                      const realPath = fse.realpathSync(
-                          p.resolve(p.join(NODE_MODULES_PATH, packageName, 'src'))
-                      )
-                      return p.join(realPath, '**')
-                  })
+                ? extensions.map(
+                      ([packageName]) =>
+                          fse.realpathSync(
+                              p.resolve(p.join(NODE_MODULES_PATH, packageName, 'src'))
+                          ) + `${p.sep}**`
+                  )
                 : []
 
         const extensionsPathsStr =
             extensionSrcPaths.length > 0 ? `,${extensionSrcPaths.join(',')}` : ''
 
-        const babelArgs = `--only "${appPath},${serverPath},${placeHolderPath}${extensionsPathsStr}"`
+        const babelArgs = `--only "${`app${p.sep}**`},${serverPath},${placeHolderPath}${extensionsPathsStr}"`
 
         return babelArgs
     } catch (error) {