refactor: cleanup

wix · Nov 1, 2023 · 6f25ae0 · 6f25ae0
1 parent 93dfd4f
commit 6f25ae0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/packages/core/src/stylable-js-module-source.ts b/packages/core/src/stylable-js-module-source.ts
@@ -124,13 +124,7 @@ function runtimeImport(
     injectOptions: InjectCSSOptions | undefined
 ) {
     const importInjectCSS = injectOptions?.css ? `, injectCSS` : '';
-    const request = JSON.stringify(
-        runtimeRequest ??
-            // TODO: we use direct requests here since we don't know how this will be resolved
-            (moduleType === 'esm'
-                ? '@stylable/runtime/dist/index.mjs'
-                : '@stylable/runtime/dist/index.js')
-    );
+    const request = JSON.stringify(runtimeRequest ?? '@stylable/runtime');
     return moduleType === 'esm'
         ? `import { classesRuntime, statesRuntime${importInjectCSS} } from ${request};`
         : `const { classesRuntime, statesRuntime${importInjectCSS} } = require(${request});`;

diff --git a/packages/module-utils/test/test-kit.ts b/packages/module-utils/test/test-kit.ts
@@ -23,7 +23,11 @@ function evalModule(id: string, source: string, requireModule: (s: string) => an
  */
 export function evalStylableModule<T = unknown>(source: string, fullPath: string): T {
     return evalModule(fullPath, source, (id) => {
-        if (id === '@stylable/runtime' || id === '@stylable/runtime/dist/index.js' || id === '@stylable/runtime/dist/index.mjs') {
+        if (
+            id === '@stylable/runtime' ||
+            id === '@stylable/runtime/dist/index.js' ||
+            id === '@stylable/runtime/dist/index.mjs'
+        ) {
             return runtime;
         }
         throw new Error(`Could not find module: ${id}`);

diff --git a/packages/node/src/loader.ts b/packages/node/src/loader.ts
@@ -26,10 +26,6 @@ async function initiateModuleFactory() {
         },
         {
             moduleType: 'esm',
-            // point to cjs - the esm runtime isn't published with mjs
-            // and causes issues. currently it's problematic for direct esm
-            // usage and only works for bundlers.
-            runtimePath: '@stylable/runtime',
         }
     );
 }