refactor & cleanup

Author: Lukas742

package.json

@@ -12,7 +12,7 @@
     "setup": "lerna run build:i18n && lerna run build:css && lerna run build:css-bundle && lerna run build:version-info && rimraf node_modules/@types/mocha",
     "build": "yarn setup && tsc --build tsconfig.build.json && lerna run build:client && lerna run build:wrapper",
     "build:storybook": "yarn build && yarn create-cypress-commands-docs && storybook build -o .out",
-    "build:storybook:reorder": "yarn build && yarn create-cypress-commands-docs && STORYBOOK_REORDER='true' node scripts/reorder-stories.js",
+    "build:storybook:reorder": "yarn build && yarn create-cypress-commands-docs && node scripts/reorder-stories.js",
     "build:storybook-sitemap": "node ./scripts/create-storybook-sitemap.js --directory .out",
     "test:prepare": "rimraf temp && lerna run build",
     "test:open": "CYPRESS_COVERAGE=false cypress open --component --browser chrome",

scripts/reorder-stories.js

@@ -81,7 +81,7 @@ function adjustMdxMetaTitle(content, newFirstSegment) {
   });
 }
 
-function main() {
+(() => {
   const storyFiles = getStoryFiles(ROOT_DIR);
   const mdxFiles = Object.keys(MDX_META_REPLACEMENTS)
     .map((rel) => path.join(ROOT_DIR, rel))
@@ -119,12 +119,16 @@ function main() {
   });
 
   // Build Sb
-  execSync(`npx storybook build -o ${OUTPUT_DIR}`, { stdio: 'inherit' });
+  execSync(`storybook build -o ${OUTPUT_DIR}`, {
+    stdio: 'inherit',
+    env: {
+      ...process.env,
+      STORYBOOK_REORDER: 'true',
+    },
+  });
 
   // Restore originals
   backups.forEach((b) => fs.writeFileSync(b.file, b.content, 'utf-8'));
 
   console.log(`Storybook built in '${OUTPUT_DIR}' and source files restored.`);
-}
-
-main();
+})();