Assume WSL is primary version 2 when throwing error while checking WSL2

marp-team · Sep 23, 2024 · 5d3f750 · 5d3f750
1 parent 357e32f
commit 5d3f750
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/utils/wsl.ts b/src/utils/wsl.ts
@@ -50,8 +50,10 @@ export const isWSL = async (): Promise<number> => {
             const gccMatched = verStr.match(/gcc[^,]+?(\d+)\.\d+\.\d+/)
             if (gccMatched && Number.parseInt(gccMatched[1], 10) >= 8)
               return true
-          } catch {
-            // no ops
+          } catch (e) {
+            debug('Error while detecting WSL version: %o', e)
+            debug('Assuming current WSL version is the primary version 2')
+            return true
           }
         })()
 

diff --git a/test/browser/manager.ts b/test/browser/manager.ts
@@ -1,5 +1,5 @@
-import { browserManager, BrowserManager } from '../../src/browser/manager'
 import { ChromeBrowser } from '../../src/browser/browsers/chrome'
+import { browserManager, BrowserManager } from '../../src/browser/manager'
 
 describe('browserManager static instance', () => {
   it('is an instance of BrowserManager', () => {

diff --git a/test/utils/wsl.ts b/test/utils/wsl.ts
@@ -173,14 +173,14 @@ describe('#isWSL', () => {
     expect(readFile).toHaveBeenCalledTimes(1)
   })
 
-  it('returns 1 if throing an error while checking WSL 2', async () => {
+  it('returns 2 if throing an error while checking WSL 2 because 2 is the primary version of current WSL', async () => {
     jest.doMock('is-wsl', () => true)
 
     const readFile = jest
       .spyOn(fs.promises, 'readFile')
       .mockRejectedValue(new Error('Failed to read file'))
 
-    expect(await wsl().isWSL()).toBe(1)
+    expect(await wsl().isWSL()).toBe(2)
     expect(readFile).toHaveBeenCalledTimes(1)
   })
 })