fix: adjust exports of SSR (#13)

statofu · Jun 26, 2023 · e47c959 · e47c959
1 parent 5ff795d
commit e47c959
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 20 deletions.
diff --git a/e2e/fixtures/basic-use-in-different-formats/public/index.browser-module-script-esm.html b/e2e/fixtures/basic-use-in-different-formats/public/index.browser-module-script-esm.html
@@ -8,7 +8,7 @@
       {
         "imports": {
           "statofu": "/dist/statofu.esm.min.js",
-          "statofu/ssr": "/dist/statofu/ssr.esm.min.js"
+          "statofu/ssr": "/dist/statofu-ssr.esm.min.js"
         }
       }
     </script>

diff --git a/e2e/fixtures/basic-use-in-different-formats/public/index.browser-plain-script-umd.html b/e2e/fixtures/basic-use-in-different-formats/public/index.browser-plain-script-umd.html
@@ -5,7 +5,7 @@
   <body>
     <div id="root"></div>
     <script src="/dist/statofu.umd.min.js"></script>
-    <script src="/dist/statofu/ssr.umd.min.js"></script>
+    <script src="/dist/statofu-ssr.umd.min.js"></script>
     <script src="../src/appLogics.js"></script>
     <script src="../src/index.browser-plain-script-umd.js"></script>
   </body>

diff --git a/e2e/fixtures/basic-use-in-different-formats/webpack.config.js b/e2e/fixtures/basic-use-in-different-formats/webpack.config.js
@@ -25,6 +25,9 @@ const webpackConf = {
       },
     ],
   },
+  resolve: {
+    extensions: ['.ts', '.cjs', '.mjs', '...'],
+  },
 };
 
 module.exports = webpackConf;
diff --git a/package.json b/package.json
@@ -51,20 +51,20 @@
     },
     "./ssr": {
       "types": "./dist/ssr/index.d.ts",
-      "module": "./dist/statofu/ssr.esm.js",
-      "default": "./dist/statofu/ssr.cjs.js"
+      "module": "./dist/statofu-ssr.esm.js",
+      "default": "./dist/statofu-ssr.cjs.js"
     },
     "./ssr/esm": {
       "types": "./dist/ssr/index.d.ts",
-      "default": "./dist/statofu/ssr.esm.js"
+      "default": "./dist/statofu-ssr.esm.js"
     },
     "./ssr/umd": {
       "types": "./dist/ssr/index.d.ts",
-      "default": "./dist/statofu/ssr.umd.js"
+      "default": "./dist/statofu-ssr.umd.js"
     },
     "./ssr/cjs": {
       "types": "./dist/ssr/index.d.ts",
-      "default": "./dist/statofu/ssr.cjs.js"
+      "default": "./dist/statofu-ssr.cjs.js"
     },
     "./package.json": "./package.json",
     "./src/*": "./src/*.ts",

diff --git a/rollup.config.mjs b/rollup.config.mjs
@@ -94,16 +94,9 @@ function evaluateInputName(input) {
 function evaluateOutputFilePrefix(input, format) {
   const { dir, name } = path.parse(path.relative(inputDir, input));
 
-  if (isEmpty(dir)) {
-    return path.join(
-      outputDir,
-      `${name === 'index' ? pkgName : path.join(pkgName, name)}.${format}`
-    );
-  } else {
-    if (name === 'index') {
-      return path.join(outputDir, pkgName, `${dir}.${format}`);
-    } else {
-      return path.join(outputDir, pkgName, dir, `${name}.${format}`);
-    }
-  }
+  const parentInfo = isEmpty(dir) ? pkgName : [pkgName, dir].join('-');
+
+  const namePrefix = `${name === 'index' ? parentInfo : [parentInfo, name].join('-')}.${format}`;
+
+  return path.join(outputDir, namePrefix);
 }
diff --git a/ssr/index.d.ts b/ssr/index.d.ts
@@ -0,0 +1 @@
+export * from '../dist/ssr';
diff --git a/ssr/index.js b/ssr/index.js
@@ -0,0 +1 @@
+module.exports = require('../dist/statofu-ssr.cjs');
diff --git a/tsconfig.json b/tsconfig.json
@@ -18,5 +18,12 @@
     "target": "es2015"
   },
   "include": ["."],
-  "exclude": ["**/node_modules", "**/dist", "**/coverage", "**/fixtures", "verdaccio/storage"]
+  "exclude": [
+    "**/node_modules",
+    "**/dist",
+    "**/coverage",
+    "**/fixtures",
+    "ssr",
+    "verdaccio/storage"
+  ]
 }