highlight.js - npm Package Compare versions

Comparing version 7.0.1 to 7.1.0

bash.js

 module.exports = function(hljs) {
   var BASH_LITERAL = 'true false';
   var VAR1 = {
-    className: 'variable',
-    begin: '\\$([a-zA-Z0-9_]+)\\b'
+    className: 'variable', begin: '\\$[a-zA-Z0-9_]+\\b'
   };
   var VAR2 = {
-    className: 'variable',
-    begin: '\\$\\{(([^}])|(\\\\}))+\\}',
-    contains: [hljs.C_NUMBER_MODE]
+    className: 'variable', begin: '\\${([^}]|\\\\})+}'
   };
@@ -28,3 +25,3 @@ var QUOTE_STRING = {
     begin: '', end: '',
-    contains: [QUOTE_STRING, APOS_STRING, VAR1, VAR2, hljs.C_NUMBER_MODE],
+    contains: [QUOTE_STRING, APOS_STRING, VAR1, VAR2],
     keywords: {
@@ -51,3 +48,2 @@ literal: BASH_LITERAL
         hljs.HASH_COMMENT_MODE,
-        hljs.C_NUMBER_MODE,
         QUOTE_STRING,
@@ -54,0 +50,0 @@ APOS_STRING,

coffeescript.js

@@ -51,2 +51,11 @@ module.exports = function(hljs) {
 
+  var COFFEE_EMPTY_REGEX_MODE = {
+    className: 'regexp', begin: '//[gim]*'
+  };
+
+  var COFFEE_REGEX_MODE = {
+    className: 'regexp',
+    begin: '/\\S(\\\\.|[^\\n])*/[gim]*' // \S is required to parse x / 2 / 3 as two divisions
+  };
+
   var COFFEE_FUNCTION_DECLARATION_MODE = {
@@ -90,2 +99,4 @@ className: 'function',
         COFFEE_HEREGEX_MODE,
+        COFFEE_EMPTY_REGEX_MODE,
+        COFFEE_REGEX_MODE,
         COFFEE_EMBEDDED_JAVASCRIPT,
@@ -92,0 +103,0 @@ COFFEE_FUNCTION_DECLARATION_MODE

css.js

@@ -5,6 +5,3 @@ module.exports = function(hljs) {
     begin: hljs.IDENT_RE + '\\(', end: '\\)',
-    contains: [{
-        endsWithParent: true, excludeEnd: true,
-        contains: [hljs.NUMBER_MODE, hljs.APOS_STRING_MODE, hljs.QUOTE_STRING_MODE]
-    }]
+    contains: [hljs.NUMBER_MODE, hljs.APOS_STRING_MODE, hljs.QUOTE_STRING_MODE]
   };
@@ -11,0 +8,0 @@ return {

highlight.js

@@ -26,2 +26,4 @@ var hljs = new function() {
 
+  var is_old_IE = (typeof navigator !== 'undefined' && /MSIE [678]/.test(navigator.userAgent));
+
   function blockText(block, ignoreNewLines) {
@@ -39,4 +41,3 @@ var result = '';
         result += blockText(block.childNodes[i]);
-    // Thank you, MSIE...
-    if (/MSIE [678]/.test(navigator.userAgent))
+    if (is_old_IE)
       result = result.replace(/\r/g, '\n');
@@ -156,3 +157,3 @@ return result;
 
-  function compileModes() {
+  function compileModes(language_name) {
 
@@ -218,10 +219,7 @@ function compileMode(mode, language, is_default) {
     }
-
-    for (var i in languages) {
-      if (!languages.hasOwnProperty(i))
-        continue;
-      compileMode(languages[i].defaultMode, languages[i], true);
-    }
+    compileMode(languages[language_name].defaultMode, languages[language_name], true);
   }
 
+  var compiled_languages = {};
+
   /*
@@ -237,5 +235,5 @@ Core highlighting function. Accepts a language name and a string with the
   function highlight(language_name, value) {
-    if (!compileModes.called) {
-      compileModes();
-      compileModes.called = true;
+    if (!compiled_languages[language_name]) {
+      compileModes(language_name);
+      compiled_languages[language_name] = true;
     }
@@ -359,3 +357,3 @@
     function startNewMode(mode, lexem) {
-      var markup = mode.className?'<span class="' + mode.className + '">':'';
+      var markup = mode.className? '<span class="' + mode.className + '">': '';
       if (mode.returnBegin) {
@@ -538,3 +536,3 @@ result += markup;
     }
-    if (/MSIE [678]/.test(navigator.userAgent) && block.tagName == 'CODE' && block.parentNode.tagName == 'PRE') {
+    if (is_old_IE && block.tagName == 'CODE' && block.parentNode.tagName == 'PRE') {
       // This is for backwards compatibility only. IE needs this strange
@@ -610,3 +608,3 @@ // hack becasue it cannot just cleanly replace <code> block contents.
   this.NUMBER_RE = '\\b\\d+(\\.\\d+)?';
-  this.C_NUMBER_RE = '\\b(0[xX][a-fA-F0-9]+|(\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)'; // 0x..., 0..., decimal, float
+  this.C_NUMBER_RE = '(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)'; // 0x..., 0..., decimal, float
   this.BINARY_NUMBER_RE = '\\b(0b[01]+)'; // 0b...
@@ -617,3 +615,3 @@ this.RE_STARTERS_RE = '!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|\\.|-|-=|/|/=|:|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~';
   this.BACKSLASH_ESCAPE = {
-    begin: '\\\\.', relevance: 0
+    begin: '\\\\[\\s\\S]', relevance: 0
   };
@@ -673,53 +671,54 @@ this.APOS_STRING_MODE = {
 }();
-hljs.LANGUAGES['haskell'] = require('./haskell.js')(hljs);
-hljs.LANGUAGES['xml'] = require('./xml.js')(hljs);
-hljs.LANGUAGES['django'] = require('./django.js')(hljs);
 hljs.LANGUAGES['bash'] = require('./bash.js')(hljs);
-hljs.LANGUAGES['ini'] = require('./ini.js')(hljs);
-hljs.LANGUAGES['objectivec'] = require('./objectivec.js')(hljs);
-hljs.LANGUAGES['python'] = require('./python.js')(hljs);
-hljs.LANGUAGES['mel'] = require('./mel.js')(hljs);
-hljs.LANGUAGES['dos'] = require('./dos.js')(hljs);
-hljs.LANGUAGES['java'] = require('./java.js')(hljs);
-hljs.LANGUAGES['tex'] = require('./tex.js')(hljs);
-hljs.LANGUAGES['glsl'] = require('./glsl.js')(hljs);
+hljs.LANGUAGES['erlang'] = require('./erlang.js')(hljs);
 hljs.LANGUAGES['cs'] = require('./cs.js')(hljs);
-hljs.LANGUAGES['http'] = require('./http.js')(hljs);
+hljs.LANGUAGES['ruby'] = require('./ruby.js')(hljs);
 hljs.LANGUAGES['rust'] = require('./rust.js')(hljs);
-hljs.LANGUAGES['cmake'] = require('./cmake.js')(hljs);
-hljs.LANGUAGES['lisp'] = require('./lisp.js')(hljs);
 hljs.LANGUAGES['rib'] = require('./rib.js')(hljs);
+hljs.LANGUAGES['diff'] = require('./diff.js')(hljs);
+hljs.LANGUAGES['javascript'] = require('./javascript.js')(hljs);
+hljs.LANGUAGES['glsl'] = require('./glsl.js')(hljs);
+hljs.LANGUAGES['rsl'] = require('./rsl.js')(hljs);
+hljs.LANGUAGES['lua'] = require('./lua.js')(hljs);
+hljs.LANGUAGES['xml'] = require('./xml.js')(hljs);
+hljs.LANGUAGES['markdown'] = require('./markdown.js')(hljs);
 hljs.LANGUAGES['css'] = require('./css.js')(hljs);
-hljs.LANGUAGES['avrasm'] = require('./avrasm.js')(hljs);
-hljs.LANGUAGES['apache'] = require('./apache.js')(hljs);
+hljs.LANGUAGES['lisp'] = require('./lisp.js')(hljs);
+hljs.LANGUAGES['profile'] = require('./profile.js')(hljs);
+hljs.LANGUAGES['http'] = require('./http.js')(hljs);
+hljs.LANGUAGES['java'] = require('./java.js')(hljs);
+hljs.LANGUAGES['php'] = require('./php.js')(hljs);
+hljs.LANGUAGES['haskell'] = require('./haskell.js')(hljs);
 hljs.LANGUAGES['1c'] = require('./1c.js')(hljs);
-hljs.LANGUAGES['javascript'] = require('./javascript.js')(hljs);
-hljs.LANGUAGES['matlab'] = require('./matlab.js')(hljs);
-hljs.LANGUAGES['delphi'] = require('./delphi.js')(hljs);
-hljs.LANGUAGES['cpp'] = require('./cpp.js')(hljs);
-hljs.LANGUAGES['json'] = require('./json.js')(hljs);
-hljs.LANGUAGES['perl'] = require('./perl.js')(hljs);
-hljs.LANGUAGES['markdown'] = require('./markdown.js')(hljs);
+hljs.LANGUAGES['python'] = require('./python.js')(hljs);
+hljs.LANGUAGES['smalltalk'] = require('./smalltalk.js')(hljs);
+hljs.LANGUAGES['tex'] = require('./tex.js')(hljs);
+hljs.LANGUAGES['actionscript'] = require('./actionscript.js')(hljs);
+hljs.LANGUAGES['sql'] = require('./sql.js')(hljs);
+hljs.LANGUAGES['vala'] = require('./vala.js')(hljs);
+hljs.LANGUAGES['ini'] = require('./ini.js')(hljs);
 hljs.LANGUAGES['d'] = require('./d.js')(hljs);
-hljs.LANGUAGES['coffeescript'] = require('./coffeescript.js')(hljs);
-hljs.LANGUAGES['lua'] = require('./lua.js')(hljs);
-hljs.LANGUAGES['rsl'] = require('./rsl.js')(hljs);
-hljs.LANGUAGES['vbscript'] = require('./vbscript.js')(hljs);
-hljs.LANGUAGES['go'] = require('./go.js')(hljs);
 hljs.LANGUAGES['axapta'] = require('./axapta.js')(hljs);
-hljs.LANGUAGES['vala'] = require('./vala.js')(hljs);
-hljs.LANGUAGES['erlang'] = require('./erlang.js')(hljs);
-hljs.LANGUAGES['ruby'] = require('./ruby.js')(hljs);
-hljs.LANGUAGES['sql'] = require('./sql.js')(hljs);
-hljs.LANGUAGES['r'] = require('./r.js')(hljs);
+hljs.LANGUAGES['perl'] = require('./perl.js')(hljs);
 hljs.LANGUAGES['scala'] = require('./scala.js')(hljs);
-hljs.LANGUAGES['profile'] = require('./profile.js')(hljs);
-hljs.LANGUAGES['php'] = require('./php.js')(hljs);
-hljs.LANGUAGES['parser3'] = require('./parser3.js')(hljs);
-hljs.LANGUAGES['actionscript'] = require('./actionscript.js')(hljs);
+hljs.LANGUAGES['cmake'] = require('./cmake.js')(hljs);
+hljs.LANGUAGES['objectivec'] = require('./objectivec.js')(hljs);
+hljs.LANGUAGES['avrasm'] = require('./avrasm.js')(hljs);
+hljs.LANGUAGES['vhdl'] = require('./vhdl.js')(hljs);
+hljs.LANGUAGES['coffeescript'] = require('./coffeescript.js')(hljs);
 hljs.LANGUAGES['nginx'] = require('./nginx.js')(hljs);
-hljs.LANGUAGES['vhdl'] = require('./vhdl.js')(hljs);
-hljs.LANGUAGES['diff'] = require('./diff.js')(hljs);
-hljs.LANGUAGES['smalltalk'] = require('./smalltalk.js')(hljs);
 hljs.LANGUAGES['erlang-repl'] = require('./erlang-repl.js')(hljs);
+hljs.LANGUAGES['r'] = require('./r.js')(hljs);
+hljs.LANGUAGES['json'] = require('./json.js')(hljs);
+hljs.LANGUAGES['django'] = require('./django.js')(hljs);
+hljs.LANGUAGES['delphi'] = require('./delphi.js')(hljs);
+hljs.LANGUAGES['vbscript'] = require('./vbscript.js')(hljs);
+hljs.LANGUAGES['mel'] = require('./mel.js')(hljs);
+hljs.LANGUAGES['dos'] = require('./dos.js')(hljs);
+hljs.LANGUAGES['apache'] = require('./apache.js')(hljs);
+hljs.LANGUAGES['cpp'] = require('./cpp.js')(hljs);
+hljs.LANGUAGES['matlab'] = require('./matlab.js')(hljs);
+hljs.LANGUAGES['parser3'] = require('./parser3.js')(hljs);
+hljs.LANGUAGES['clojure'] = require('./clojure.js')(hljs);
+hljs.LANGUAGES['go'] = require('./go.js')(hljs);
 module.exports = hljs;

ini.js

@@ -17,3 +17,3 @@ module.exports = function(hljs) {
           className: 'setting',
-          begin: '^[a-z0-9_\\[\\]]+[ \\t]*=[ \\t]*', end: '$',
+          begin: '^[a-z0-9\\[\\]_-]+[ \\t]*=[ \\t]*', end: '$',
           contains: [
@@ -20,0 +20,0 @@ {

javascript.js

@@ -7,3 +7,4 @@ module.exports = function(hljs) {
           'in if for while finally var new function do return void else break catch ' +
-          'instanceof with throw case default try this switch continue typeof delete',
+          'instanceof with throw case default try this switch continue typeof delete ' +
+          'let yield',
         literal:
@@ -10,0 +11,0 @@ 'true false null undefined NaN Infinity'

nginx.js

@@ -93,5 +93,5 @@ module.exports = function(hljs) {
       ],
-      illegal: '[\\\\/%\\[\\$]'
+      illegal: '[^\\s\\}]'
     }
   };
 };

package.json

@@ -214,2 +214,14 @@ {
       "email": "[e-mail]"
+    }, 
+    {
+      "name": "Marc Fornos", 
+      "email": "[e-mail]"
+    }, 
+    {
+      "name": "Yoshihide Jimbo", 
+      "email": "[e-mail]"
+    }, 
+    {
+      "name": "Casey Duncan", 
+      "email": "[e-mail]"
     }
@@ -233,3 +245,3 @@ ],
   ], 
-  "version": "7.0.1", 
+  "version": "7.1.0", 
   "scripts": {}, 
@@ -236,0 +248,0 @@ "keywords": [

ruby.js

@@ -8,36 +8,3 @@ module.exports = function(hljs) {
       'next until do begin unless END rescue nil else break undef not super class case ' +
-      'require yield alias while ensure elsif or def',
-    keymethods:
-      '__id__ __send__ abort abs all? allocate ancestors any? arity assoc at at_exit ' +
-      'autoload autoload? between? binding binmode block_given? call callcc caller capitalize ' +
-      'capitalize! casecmp catch ceil center chomp chomp! chop chop! chr class class_eval ' +
-      'class_variable_defined? class_variables clear clone close close_read ' +
-      'close_write closed? coerce collect collect! compact compact! concat const_defined? ' +
-      'const_get const_missing const_set constants count crypt default default_proc delete ' +
-      'delete! delete_at delete_if detect display div divmod downcase downcase! downto dump ' +
-      'dup each each_byte each_index each_key each_line each_pair each_value each_with_index ' +
-      'empty? entries eof eof? eql? equal? eval exec exit exit! extend fail fcntl fetch ' +
-      'fileno fill find find_all first flatten flatten! floor flush for_fd foreach fork ' +
-      'format freeze frozen? fsync getc gets global_variables grep gsub gsub! has_key? ' +
-      'has_value? hash hex id include include? included_modules index indexes indices ' +
-      'induced_from inject insert inspect instance_eval instance_method instance_methods ' +
-      'instance_of? instance_variable_defined? instance_variable_get instance_variable_set ' +
-      'instance_variables integer? intern invert ioctl is_a? isatty iterator? join key? keys ' +
-      'kind_of? lambda last length lineno ljust load local_variables loop lstrip lstrip! map ' +
-      'map! match max member? merge merge! method method_defined? method_missing methods min ' +
-      'module_eval modulo name nesting new next next! nil? nitems nonzero? object_id oct open ' +
-      'pack partition pid pipe pop popen pos prec prec_f prec_i print printf ' +
-      'private_class_method private_instance_methods private_method_defined? private_methods ' +
-      'proc protected_instance_methods protected_method_defined? protected_methods ' +
-      'public_class_method public_instance_methods public_method_defined? public_methods push ' +
-      'putc puts quo raise rand rassoc read read_nonblock readchar readline readlines ' +
-      'readpartial rehash reject reject! remainder reopen replace require respond_to? reverse ' +
-      'reverse! reverse_each rewind rindex rjust round rstrip rstrip! scan seek select send ' +
-      'set_trace_func shift singleton_method_added singleton_methods size sleep slice slice! ' +
-      'sort sort! sort_by split sprintf squeeze squeeze! srand stat step store strip strip! ' +
-      'sub sub! succ succ! sum superclass swapcase swapcase! sync syscall sysopen sysread ' +
-      'sysseek system syswrite taint tainted? tell test throw times to_a to_ary to_f to_hash ' +
-      'to_i to_int to_io to_proc to_s to_str to_sym tr tr! tr_s tr_s! trace_var transpose ' +
-      'trap truncate tty? type ungetc uniq uniq! unpack unshift untaint untrace_var upcase ' +
-      'upcase! update upto value? values values_at warn write write_nonblock zero? zip'
+      'require yield alias while ensure elsif or include'
   };
@@ -133,5 +100,4 @@ var YARDOCTAG = {
     className: 'function',
-    begin: '\\bdef\\s+', end: ' |$|;',
-    lexems: RUBY_IDENT_RE,
-    keywords: RUBY_KEYWORDS,
+    beginWithKeyword: true, end: ' |$|;',
+    keywords: 'def',
     contains: [
@@ -152,9 +118,2 @@ {
   };
-  var IDENTIFIER = {
-    className: 'identifier',
-    begin: RUBY_IDENT_RE,
-    lexems: RUBY_IDENT_RE,
-    keywords: RUBY_KEYWORDS,
-    relevance: 0
-  };
 
@@ -185,3 +144,3 @@ var RUBY_DEFAULT_CONTAINS = COMMENTS.concat(STRINGS.concat([
       className: 'constant',
-      begin: '(::)?([A-Z]\\w*(::)?)+',
+      begin: '(::)?(\\b[A-Z]\\w*(::)?)+',
       relevance: 0
@@ -192,3 +151,3 @@ },
       begin: ':',
-      contains: STRINGS.concat([IDENTIFIER]),
+      contains: STRINGS.concat([{begin: RUBY_IDENT_RE}]),
       relevance: 0
@@ -209,3 +168,2 @@ },
     },
-    IDENTIFIER,
     { // regexp container
@@ -212,0 +170,0 @@ begin: '(' + hljs.RE_STARTERS_RE + ')\\s*',

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

175088

increased by1.07%

Number of package files

54

increased by1.89%

Lines of code

4541

increased by1.18%

Number of medium supply chain risk alerts

0

decreased by-100%

No dependency changes