Use highlight.js from npm

pull/6100/head
Maki Nishifuji 8 years ago
parent 544d224ceb
commit ffc0bdaed3
  1. 1
      .meteor/versions
  2. 4
      client/startup/startup.js
  3. 1
      package.json
  4. 4
      packages/rocketchat-integrations/client/views/integrationsIncoming.js
  5. 3
      packages/rocketchat-integrations/client/views/integrationsOutgoing.js
  6. 4
      packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js
  7. 1
      packages/rocketchat-integrations/package.js
  8. 1
      packages/rocketchat-markdown/markdowncode.coffee
  9. 1
      packages/rocketchat-markdown/package.js

@ -220,7 +220,6 @@ service-configuration@1.0.11
session@1.1.7
sha@1.0.9
shell-server@0.2.2
simple:highlight.js@1.2.0
simple:json-routes@2.1.0
smoral:sweetalert@1.1.1
spacebars@1.0.13

@ -2,6 +2,10 @@
import moment from 'moment';
import toastr from 'toastr';
import hljs from 'highlight.js';
import 'highlight.js/styles/github.css';
hljs.initHighlightingOnLoad();
if (window.DISABLE_ANIMATION) {
toastr.options.timeOut = 1;

@ -64,6 +64,7 @@
"bcrypt": "^1.0.2",
"codemirror": "^5.23.0",
"file-type": "^4.1.0",
"highlight.js": "^9.9.0",
"jquery": "^3.1.1",
"mime-db": "^1.26.0",
"mime-type": "^3.0.4",

@ -1,4 +1,6 @@
/* global ChatIntegrations, hljs */
/* global ChatIntegrations */
import hljs from 'highlight.js';
import toastr from 'toastr';
Template.integrationsIncoming.onCreated(function _incomingIntegrationsOnCreated() {

@ -1,5 +1,6 @@
/* global ChatIntegrations, hljs */
/* global ChatIntegrations */
import hljs from 'highlight.js';
import toastr from 'toastr';
Template.integrationsOutgoing.onCreated(function _integrationsOutgoingOnCreated() {

@ -1,4 +1,6 @@
/* global ChatIntegrations, ChatIntegrationHistory, hljs */
/* global ChatIntegrations, ChatIntegrationHistory */
import hljs from 'highlight.js';
import moment from 'moment';
import toastr from 'toastr';

@ -11,7 +11,6 @@ Package.onUse(function(api) {
api.use('underscore');
api.use('ecmascript');
api.use('babel-compiler');
api.use('simple:highlight.js');
api.use('rocketchat:lib');
api.use('rocketchat:authorization');
api.use('rocketchat:api');

@ -2,6 +2,7 @@
# MarkdownCode is a named function that will parse `inline code` and ```codeblock``` syntaxes
# @param {Object} message - The message object
###
import hljs from 'highlight.js';
class MarkdownCode
constructor: (message) ->

@ -12,7 +12,6 @@ Package.onUse(function(api) {
'underscore',
'templating',
'underscorestring:underscore.string',
'simple:highlight.js',
'rocketchat:lib'
]);

Loading…
Cancel
Save