Skip to content

Commit

Permalink
[5.6] fork marked and remove npm marked dependency (#13444) (#13468)
Browse files Browse the repository at this point in the history
* fork marked and swap for npm marked dependency

* remove unneeded files in marked fork, fix broken test in marked fork, shorten marked import path
  • Loading branch information
nreese authored Aug 11, 2017
1 parent 983a48d commit d1d762c
Show file tree
Hide file tree
Showing 224 changed files with 11,729 additions and 4 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/optimize
/src/fixtures/vislib/mock_data
/src/forked/*
/src/ui/public/angular-bootstrap
/test/fixtures/scenarios
/src/core_plugins/console/public/webpackShims
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@
"less": "2.7.1",
"less-loader": "2.2.3",
"lodash": "3.10.1",
"marked": "0.3.6",
"minimatch": "2.0.10",
"mkdirp": "0.5.1",
"moment": "2.13.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import marked from 'marked';
import marked from '../../../forked/marked';
import { uiModules } from 'ui/modules';
import 'angular-sanitize';

Expand Down
19 changes: 19 additions & 0 deletions src/forked/marked/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Copyright (c) 2011-2014, Christopher Jeffrey (https://github.com/chjj/)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
Loading

0 comments on commit d1d762c

Please sign in to comment.