Move common static files handling to abstract render

src/config.ts

@@ -53,12 +53,14 @@ const config = {
   },
 
   output: {
-    // CSS resources added by Kiwix
-    cssResources: ['style', 'content.parsoid', 'inserted_style'],
-    mainPageCssResources: ['mobile_main_page'],
-    wikimediaMobileCssResources: ['wm_mobile_override_style'],
+    // CSS and JS resources added by Kiwix
+    cssResourcesCommon: ['style', 'mobile_main_page'],
+    jsResourcesCommon: ['script', 'masonry.min', 'article_list_home', 'images_loaded.min'],
+
+    cssResources: ['content.parsoid', 'inserted_style'],
+    jsResources: ['../node_modules/details-element-polyfill/dist/details-element-polyfill'],
 
-    jsResources: ['script', 'masonry.min', 'article_list_home', 'images_loaded.min', '../node_modules/details-element-polyfill/dist/details-element-polyfill'],
+    wikimediaMobileCssResources: ['wm_mobile_override_style'],
     mwMobileJsResources: ['wm_mobile_override_script'],
 
     // JS/CSS resources to be imported from MediaWiki

src/mwoffliner.lib.ts

@@ -219,7 +219,6 @@ async function execute(argv: any) {
   RedisStore.setOptions(argv.redis || config.defaults.redisPath)
   await RedisStore.connect()
   const { articleDetailXId, filesToDownloadXPath, filesToRetryXPath, redirectsXId } = RedisStore
-  await downloader.setBaseUrls(forceRender)
   // Output directory
   const outputDirectory = path.isAbsolute(_outputDirectory || '') ? _outputDirectory : path.join(process.cwd(), _outputDirectory || 'out')
   await mkdirPromise(outputDirectory)

src/renderers/abstract.renderer.ts

@@ -18,6 +18,7 @@ import {
   isWebpCandidateImageMimeType,
   interpolateTranslationString,
   encodeArticleIdForZimHtmlUrl,
+  getStaticFiles,
 } from '../util/misc.js'
 
 type renderType = 'auto' | 'desktop' | 'mobile' | 'specific'
@@ -63,6 +64,13 @@ export interface RenderSingleOutput {
 export type RenderOutput = RenderSingleOutput[]
 
 export abstract class Renderer {
+  public staticFilesListCommon: string[] = []
+  constructor() {
+    if (this.staticFilesListCommon.length === 0) {
+      this.staticFilesListCommon = getStaticFiles(config.output.jsResourcesCommon, config.output.cssResourcesCommon)
+    }
+  }
+
   protected async treatVideo(
     dump: Dump,
     srcCache: KVS<boolean>,

src/renderers/abstractDesktop.render.ts

@@ -11,7 +11,7 @@ export abstract class DesktopRenderer extends Renderer {
   public staticFilesListDesktop: string[] = []
   constructor() {
     super()
-    this.staticFilesListDesktop = getStaticFiles(config.output.jsResources, config.output.mainPageCssResources.concat(config.output.cssResources))
+    this.staticFilesListDesktop = this.staticFilesListCommon.concat(getStaticFiles(config.output.jsResources, config.output.cssResources))
   }
 
   public filterWikimediaDesktopModules(_moduleDependencies) {

src/renderers/abstractMobile.render.ts

@@ -11,7 +11,7 @@ export abstract class MobileRenderer extends Renderer {
   public staticFilesListMobile: string[] = []
   constructor() {
     super()
-    this.staticFilesListMobile = getStaticFiles(config.output.mwMobileJsResources, config.output.wikimediaMobileCssResources)
+    this.staticFilesListMobile = this.staticFilesListCommon.concat(getStaticFiles(config.output.mwMobileJsResources, config.output.wikimediaMobileCssResources))
   }
 
   public filterWikimediaMobileModules(_moduleDependencies) {

test/e2e/en.e2e.test.ts

@@ -20,14 +20,16 @@ const verifyImgElements = (imgFilesArr, imgElements) => {
 }
 
 const mwUrl = 'https://en.wikipedia.org'
-const articleList = 'User:Kelson/MWoffliner_CI_reference'
+const articleList = 'BMW'
 const format = ''
 
 await testAllRenders(mwUrl, articleList, format, async (outFiles) => {
   const articleFromDump = await zimdump(`show --url A/${articleList} ${outFiles[0].outFile}`)
-  await expect(zimcheck(outFiles[0].outFile)).resolves.not.toThrowError()
   describe('e2e test for en.wikipedia.org', () => {
     const articleDoc = domino.createDocument(articleFromDump)
+    test(`test zim integrity for ${outFiles[0]?.renderer} renderer`, async () => {
+      await expect(zimcheck(outFiles[0].outFile)).resolves.not.toThrowError()
+    })
     test(`test article header for ${outFiles[0]?.renderer} renderer`, async () => {
       expect(articleDoc.querySelector('h1.article-header, h1.pcs-edit-section-title')).toBeTruthy()
     })

test/unit/saveStaticFiles.test.ts

@@ -0,0 +1,48 @@
+import { startRedis, stopRedis } from './bootstrap.js'
+import { jest } from '@jest/globals'
+import { WikimediaDesktopRenderer } from '../../src/renderers/wikimedia-desktop.renderer.js'
+import { WikimediaMobileRenderer } from '../../src/renderers/wikimedia-mobile.renderer.js'
+
+jest.setTimeout(10000)
+
+describe('saveStaticFiles', () => {
+  beforeAll(startRedis)
+  afterAll(stopRedis)
+
+  test('Compare desktop static files list', async () => {
+    const desktopAndCommonStaticFiles = [
+      'script.js',
+      'masonry.min.js',
+      'article_list_home.js',
+      'images_loaded.min.js',
+      'style.css',
+      'mobile_main_page.css',
+      '../node_modules/details-element-polyfill/dist/details-element-polyfill.js',
+      'content.parsoid.css',
+      'inserted_style.css',
+    ]
+
+    const wikimediaDesktopRenderer = new WikimediaDesktopRenderer()
+    const staticFilesFromRenderer = wikimediaDesktopRenderer.staticFilesListDesktop
+
+    expect(desktopAndCommonStaticFiles).toEqual(staticFilesFromRenderer)
+  })
+
+  test('Compare mobile static files list', async () => {
+    const mobileAndCommonStatiFiles = [
+      'script.js',
+      'masonry.min.js',
+      'article_list_home.js',
+      'images_loaded.min.js',
+      'style.css',
+      'mobile_main_page.css',
+      'wm_mobile_override_script.js',
+      'wm_mobile_override_style.css',
+    ]
+
+    const wikimediaMobileRenderer = new WikimediaMobileRenderer()
+    const staticFilesFromRenderer = wikimediaMobileRenderer.staticFilesListMobile
+
+    expect(mobileAndCommonStatiFiles).toEqual(staticFilesFromRenderer)
+  })
+})