Website fixes (#1481)

Author: slowcheetah

scripts/check-dependencies/check-dependencies.mjs

@@ -6,6 +6,9 @@ const ignore = {
   'tests/observables': [
     'moon-unit',
   ],
+  'web-site': [
+    'jsdom',  // pinned because of a bug https://github.com/jsdom/jsdom/issues/3959
+  ],
 };
 
 const pkgs = await glob([

tests/eslint/eslint.config.js

@@ -2433,7 +2433,7 @@ export default [
       'packages/core-js-compat/src/**',
       'scripts/**',
       'tests/**/*.mjs',
-      'website/*.mjs',
+      'website/**.mjs',
     ],
     languageOptions: {
       // zx
@@ -2521,9 +2521,17 @@ export default [
     },
     rules: {
       ...transpiledAndPolyfilled,
-      'no-restricted-globals': 'off',
-      'unicorn/prefer-global-this': 'off',
+      'no-restricted-globals': OFF,
+      'unicorn/prefer-global-this': OFF,
       '@stylistic/quotes': [ERROR, 'single', { allowTemplateLiterals: ALWAYS }],
     },
   },
+  {
+    files: [
+      'website/**',
+    ],
+    rules: {
+      'import/no-unresolved': OFF,
+    },
+  },
 ];

website/build-local.mjs

@@ -4,7 +4,6 @@ import {
 import { join } from 'node:path';
 
 const BUILD_SRC_DIR = './';
-const BUNDLES_DIR = 'bundles';
 
 async function hasDocsLocal(srcDir) {
   const target = join(srcDir, 'docs/web/docs');
@@ -20,7 +19,7 @@ try {
 
   const version = { branch: targetBranch, label: targetBranch };
   await hasDocsLocal(BUILD_SRC_DIR);
-  await buildAndCopyCoreJS(version, BUILD_SRC_DIR, BUNDLES_DIR);
+  await buildAndCopyCoreJS(version, BUILD_SRC_DIR);
 
   await copyBabelStandalone(BUILD_SRC_DIR);
   await copyBlogPosts(BUILD_SRC_DIR);

website/build.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable import/no-unresolved -- dependencies are not installed */
 import { getDefaultVersion } from './scripts/helpers.mjs';
 import fm from 'front-matter';
 import { JSDOM } from 'jsdom';

website/package-lock.json

@@ -11,7 +11,7 @@
     "@vitejs/plugin-legacy": "^7.2.1",
     "front-matter": "^4.0.2",
     "highlight.js": "^11.11.1",
-    "jsdom": "^27.0.1",
+    "jsdom": "27.0.0",
     "marked": "^16.4.1",
     "marked-alert": "^2.1.2",
     "marked-gfm-heading-id": "^4.1.2",

website/package.json

@@ -74,19 +74,31 @@ export async function copyCommonFiles(srcDir) {
   console.timeEnd('Copied common files');
 }
 
-export async function buildAndCopyCoreJS(version, srcDir, destDir, checkout = false, cache = false) {
+export async function buildAndCopyCoreJS(version, srcDir, cacheDir = null, checkout = false) {
+  async function bundlePackage(esModules) {
+    await exec(`npm run bundle-package${ esModules ? ' esmodules' : '' }`, { cwd: srcDir });
+    const bundleName = `core-js-bundle${ esModules ? '-esmodules' : '' }.js`;
+    const srcPath = join(srcDir, 'packages/core-js-bundle/minified.js');
+    const destPath = join(srcDir, 'website/src/public/bundles/', target, bundleName);
+    await cp(srcPath, destPath);
+    if (cacheDir !== null) {
+      const cachePath = join(cacheDir, target, bundleName);
+      await cp(srcPath, cachePath);
+    }
+  }
+
   const target = version.branch ?? version.tag;
-  const name = version.path ?? version.label;
   console.log(`Building and copying core-js for ${ target }`);
-  const targetBundlePath = `${ destDir }/${ target }/`;
+  const targetBundlePath = join(cacheDir ?? '', target);
 
-  if (cache && await isExists(targetBundlePath)) {
+  if (cacheDir !== null && await isExists(targetBundlePath)) {
     console.time('Core JS bundles copied');
     const bundlePath = join(targetBundlePath, 'core-js-bundle.js');
-    const destBundlePath = join(srcDir, 'website/src/public/bundles/', name, 'core-js-bundle.js');
-    const esmodulesBundlePath = join(targetBundlePath, 'core-js-bundle-esmodules.js');
-    const esmodulesDestBundlePath = join(srcDir, 'website/src/public/bundles/', name, 'core-js-bundle-esmodules.js');
+    const destBundlePath = join(srcDir, 'website/src/public/bundles/', target, 'core-js-bundle.js');
     await cp(bundlePath, destBundlePath);
+
+    const esmodulesBundlePath = join(targetBundlePath, 'core-js-bundle-esmodules.js');
+    const esmodulesDestBundlePath = join(srcDir, 'website/src/public/bundles/', target, 'core-js-bundle-esmodules.js');
     await cp(esmodulesBundlePath, esmodulesDestBundlePath);
     console.timeEnd('Core JS bundles copied');
     return;
@@ -97,19 +109,10 @@ export async function buildAndCopyCoreJS(version, srcDir, destDir, checkout = fa
     await checkoutVersion(version, srcDir);
   }
   await installDependencies(srcDir);
-  await exec('npm run bundle-package', { cwd: srcDir });
-  const bundlePath = join(srcDir, 'packages/core-js-bundle/minified.js');
-  const destPath = join(srcDir, 'website/src/public/bundles/', name, 'core-js-bundle.js');
-  const destBundlePath = join(targetBundlePath, 'core-js-bundle.js');
-  await cp(bundlePath, destPath);
-  await cp(bundlePath, destBundlePath);
-
-  await exec('npm run bundle-package esmodules', { cwd: srcDir });
-  const esmodulesBundlePath = join(srcDir, 'packages/core-js-bundle/minified.js');
-  const esmodulesDestBundlePath = join(srcDir, 'website/src/public/bundles/', name, 'core-js-bundle-esmodules.js');
-  const destEsmodulesBundlePath = join(targetBundlePath, 'core-js-bundle-esmodules.js');
-  await cp(esmodulesBundlePath, esmodulesDestBundlePath);
-  await cp(esmodulesBundlePath, destEsmodulesBundlePath);
+
+  await bundlePackage(false);
+  await bundlePackage(true);
+
   console.timeEnd('Core JS bundles built');
 }
 

website/scripts/helpers.mjs

@@ -195,12 +195,12 @@ try {
     const versions = await getVersions(targetBranch);
     for (const version of versions) {
       await copyDocsToBuilder(version);
-      await buildAndCopyCoreJS(version, BUILD_SRC_DIR, BUNDLES_DIR, true, true);
+      await buildAndCopyCoreJS(version, BUILD_SRC_DIR, BUNDLES_DIR, true);
     }
   } else {
     const version = { branch: targetBranch, label: targetBranch };
     await hasDocs(version, BUILD_SRC_DIR);
-    await buildAndCopyCoreJS(version, BUILD_SRC_DIR, BUNDLES_DIR, true, true);
+    await buildAndCopyCoreJS(version, BUILD_SRC_DIR, BUNDLES_DIR, true);
   }
 
   await prepareBuilder(targetBranch);

website/scripts/runner.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable import/no-unresolved -- dependencies are not installed */
 import '../scss/app.scss';
 import hljs from 'highlight.js/lib/core';
 import javascript from 'highlight.js/lib/languages/javascript';

website/src/js/main.js

@@ -1,4 +1,3 @@
-/* eslint-disable import/no-unresolved -- dependencies are not installed */
 /* global Babel -- global scope directive */
 import hljs from 'highlight.js/lib/core';
 import javascript from 'highlight.js/lib/languages/javascript';