always use linux path separators in require path

elastic · Jun 16, 2020 · 39713e4 · 39713e4
1 parent ed6bd63
commit 39713e4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/packages/kbn-optimizer/src/worker/entry_point_creator.ts b/packages/kbn-optimizer/src/worker/entry_point_creator.ts
@@ -17,9 +17,13 @@
  * under the License.
  */
 
-module.exports = function ({ entries }: { entries: Array<{ importId: string; relPath: string }> }) {
-  const lines = entries.map(({ importId, relPath }) => [
-    `__kbnBundles__.define('${importId}', __webpack_require__, require.resolve('./${relPath}'))`,
+module.exports = function ({
+  entries,
+}: {
+  entries: Array<{ importId: string; requirePath: string }>;
+}) {
+  const lines = entries.map(({ importId, requirePath }) => [
+    `__kbnBundles__.define('${importId}', __webpack_require__, require.resolve('${requirePath}'))`,
   ]);
 
   return {

diff --git a/packages/kbn-optimizer/src/worker/webpack.config.ts b/packages/kbn-optimizer/src/worker/webpack.config.ts
@@ -100,10 +100,16 @@ export function getWebpackConfig(bundle: Bundle, bundleRefs: BundleRefs, worker:
                 entries: bundle.publicDirNames.map((name) => {
                   const absolute = Path.resolve(bundle.contextDir, name);
                   const newContext = Path.dirname(ENTRY_CREATOR);
-                  return {
-                    importId: `${bundle.type}/${bundle.id}/${name}`,
-                    relPath: Path.relative(newContext, absolute),
-                  };
+                  const importId = `${bundle.type}/${bundle.id}/${name}`;
+
+                  // relative path from context of the ENTRY_CREATOR, with linux path separators
+                  let requirePath = Path.relative(newContext, absolute).split('\\').join('/');
+                  if (!requirePath.startsWith('.')) {
+                    // ensure requirePath is identified by node as relative
+                    requirePath = `./${requirePath}`;
+                  }
+
+                  return { importId, requirePath };
                 }),
               },
             },