use rcompat's File#import to ensure Windows compat

primatejs · Feb 12, 2024 · e29bb8f · e29bb8f
1 parent b0258dc
commit e29bb8f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/packages/frontend/src/frontends/common/handler.js b/packages/frontend/src/frontends/common/handler.js
@@ -46,8 +46,7 @@ export default config => {
         });
       }
 
-      const imported = (await import(root)).default;
-      const { body, head } = render(imported, {
+      const { body, head } = render(await root.import("default"), {
         components: components.map(({ component }) => component),
         ...shared,
       });

diff --git a/packages/frontend/src/frontends/common/load.js b/packages/frontend/src/frontends/common/load.js
@@ -19,5 +19,5 @@ const get_error = (error, path) =>
     : ErrorInComponent;
 
 export default async path =>
-  tryreturn(_ => import(`${path}.js`))
+  tryreturn(_ => File.import(`${path}.js`))
     .orelse(error => get_error(error, `${path}.js`)(path.name, path, error));
diff --git a/packages/primate/src/app.js b/packages/primate/src/app.js
@@ -80,7 +80,7 @@ export default async (log, root, config) => {
     root,
     log,
     error: {
-      default: await error.exists() ? (await import(error)).default : undefined,
+      default: await error.exists() ? await error.import("default") : undefined,
     },
     handlers: { ...handlers },
     extensions: {

diff --git a/packages/primate/src/loaders/common.js b/packages/primate/src/loaders/common.js
@@ -19,9 +19,9 @@ export default async ({
   const objects = directory === undefined ? [] : await Promise.all(
     (await File.collect(directory, /^.*.js$/u, { recursive }))
       .filter(filter)
-      .map(async path => [
-        `${path}`.replace(directory, _ => "").slice(1, -ending.length),
-        await import(path),
+      .map(async file => [
+        `${file}`.replace(directory, _ => "").slice(1, -ending.length),
+        await file.import(),
       ]));
   warn && await directory.exists() && empty(log)(objects, name, directory);
 

diff --git a/packages/primate/src/run.js b/packages/primate/src/run.js
@@ -15,7 +15,7 @@ const get_config = async root => {
   const config = root.join(name);
   return await config.exists()
     ? tryreturn(async _ => {
-      const imported = (await import(config)).default;
+      const imported = await config.import("default");
 
       (imported === undefined || Object.keys(imported).length === 0) &&
         errors.EmptyConfigFile.warn(logger, config);

diff --git a/packages/store/src/module.js b/packages/store/src/module.js
@@ -65,8 +65,8 @@ export default ({
         // accept only lowercase-first directories in store path
         .filter(([name]) =>
           name.split("/").slice(0, last).every(part => /^[a-z]/u.test(part)))
-        .map(async ([store, path]) => {
-          const exports = await import(path);
+        .map(async ([store, file]) => {
+          const exports = await file.import();
           const schema = transform(exports.default, entry => entry
             .filter(([property, type]) => valid(type, property, store)));