From e93ece61a74da49731a6f1f88b8bb070b59133b8 Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Wed, 6 May 2020 09:15:47 -0700 Subject: [PATCH 1/2] Detect CommonJS (.cjs) files Node.js treats `.cjs` files as CommonJS modules. Details: https://nodejs.org/api/esm.html#esm_enabling --- lib/rouge/lexers/javascript.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rouge/lexers/javascript.rb b/lib/rouge/lexers/javascript.rb index db6546fe4e..8b12e468e3 100644 --- a/lib/rouge/lexers/javascript.rb +++ b/lib/rouge/lexers/javascript.rb @@ -15,7 +15,7 @@ class Javascript < RegexLexer tag 'javascript' aliases 'js' - filenames '*.js', '*.mjs' + filenames '*.cjs', '*.js', '*.mjs' mimetypes 'application/javascript', 'application/x-javascript', 'text/javascript', 'text/x-javascript' From 6103df5c87c58777ee277ee65e3c29f388820d6f Mon Sep 17 00:00:00 2001 From: Michael Camilleri Date: Tue, 12 May 2020 18:19:13 +0900 Subject: [PATCH 2/2] Add file glob tests to JavaScript spec --- spec/lexers/javascript_spec.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec/lexers/javascript_spec.rb b/spec/lexers/javascript_spec.rb index db059a8024..5afe694d4a 100644 --- a/spec/lexers/javascript_spec.rb +++ b/spec/lexers/javascript_spec.rb @@ -17,7 +17,9 @@ include Support::Guessing it 'guesses by filename' do + assert_guess :filename => 'foo.cjs' assert_guess :filename => 'foo.js' + assert_guess :filename => 'foo.mjs' end it 'guesses by mimetype' do