Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge from khan/simple-markdown #2

Merged
merged 48 commits into from
Jan 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
f32a628
Fix #68 escaping pipes in tables
ariabuckles Aug 5, 2019
96ef4ea
v0.5.0
ariabuckles Aug 5, 2019
5aa8530
Fix license copyright
ariabuckles Aug 5, 2019
b9c05c5
v0.5.1: Fix .git folder in published archive
ariabuckles Aug 5, 2019
a52c270
Tests: Add exponential backtracking test for inline code
ariabuckles Aug 31, 2019
89797fe
inlineCode: Fix ReDoS & improve escape semantics
ariabuckles Aug 31, 2019
f7cda49
Heading: Add test for exponential backtracking in headings
ariabuckles Aug 31, 2019
f3332cd
Heading: Fix exponential backtracking
ariabuckles Aug 31, 2019
f5311e5
Del: Add test for del/strikethrough exponential backtracking
ariabuckles Aug 31, 2019
31ca48a
Del: Fix del/strikethrough exponential backtracking
ariabuckles Aug 31, 2019
acbf1f6
Fence: Add test for code fence exponential backtracking
ariabuckles Aug 31, 2019
70586f9
Fence: fix fence exponential backtracks
ariabuckles Aug 31, 2019
01bcc3e
v0.5.2: Fix exponential backtracking / ReDoS regexes
ariabuckles Aug 31, 2019
bdf0427
inlineCode: fix overzealous replacement
Alcaro Sep 16, 2019
822e701
Add a globalPrevCapture that persists into nested parses
FuegoFro Jul 10, 2019
225b66c
Move `prevCapture` to the `state` and make it global for a given parse.
FuegoFro Sep 10, 2019
966a17a
Remove stray comma
FuegoFro Sep 10, 2019
92b2164
Bump mixin-deep from 1.3.1 to 1.3.2
dependabot[bot] Aug 27, 2019
7c8b032
Make prevCapture comparisons `== null` for consistency
ariabuckles Sep 19, 2019
41ce8bb
v0.6.0
ariabuckles Sep 19, 2019
8a2b428
Minify for v0.6.0
ariabuckles Sep 19, 2019
015a719
Fix ReDoS with autolink
Alcaro Sep 25, 2019
a922462
Dev Dependencies: Run `npm audit fix` to fix vulnerabilities
ariabuckles Oct 24, 2019
ff64487
Create index.d.ts typings file
dannycochran Nov 2, 2017
caa85bd
Export everything
dannycochran Nov 2, 2017
a630853
v0.6.1: #73 Fix ReDoS with autolink
ariabuckles Oct 24, 2019
b2bebfa
Flow: Clean up some flow types to match typescript
ariabuckles Oct 24, 2019
ebf17b3
React Keys: Fix sending null as a key
ariabuckles Oct 24, 2019
ca9c0f8
Error handling: Clean up error handling
ariabuckles Oct 24, 2019
0225614
Typescript: Move index.d.ts to simple-markdown.d.ts
ariabuckles Oct 24, 2019
4474b15
Typescript: Combine ts and flow types into up-to-date v0.6 ts types
ariabuckles Oct 24, 2019
f0ad9b9
Typescript: Add types to simple-markdown.js source
ariabuckles Oct 24, 2019
1b2333e
Typescript: Configure typescript checking for build process
ariabuckles Oct 24, 2019
e44b8e8
Typescript: Add type checking of tests
ariabuckles Oct 24, 2019
c1e7ce4
v0.7.0: Typescript types
ariabuckles Oct 24, 2019
de25ed5
Allow one level of balanced parens in link urls
faergeek Oct 9, 2019
886a07b
Setup rollup
faergeek Oct 28, 2019
bbbe5bf
Build system: Integrate rollup with the rest of the system
ariabuckles Nov 3, 2019
8ea273a
Remove unnecessary extra LIST_R.exec call
ariabuckles Nov 3, 2019
d26a295
Flow: Upgrade flow to 0.111.1 and fix flow errors
ariabuckles Nov 3, 2019
71030b8
DevDependencies: version bumps
ariabuckles Nov 3, 2019
3dab3f6
Flow: Build files after flow changes
ariabuckles Nov 3, 2019
515ade0
Tests: Remove test dependency on underscore
ariabuckles Nov 3, 2019
510aa68
flow-typed: update flow types
ariabuckles Nov 4, 2019
5bed44a
v0.7.1
ariabuckles Nov 4, 2019
f00aba5
Typescript dependencies: Remove @types/node dependency
ariabuckles Dec 30, 2019
dd31187
DevDependencies: Update nyc/coverage for `npm audit`
ariabuckles Dec 30, 2019
7931523
v0.7.2
ariabuckles Dec 30, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2018 Khan Academy, Aria Buckles
Copyright (c) 2018 Khan Academy, Aria Buckles, Christopher Jeffrey

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
17 changes: 15 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.PHONY: all
all: install test size
all: install test build

.PHONY: install
install:
Expand All @@ -11,16 +11,29 @@ minify: simple-markdown.min.js
.PHONY: test
test: check runtests size

.PHONY: build
build: simple-markdown.js minify

.PHONY: simple-markdown.js
simple-markdown.js: src/*
./node_modules/.bin/rollup -c

.PHONY: check
check:
@echo "Checking flow types..."
./node_modules/.bin/flow
@echo "Flow types complete."
@echo "Checking typescript types..."
./node_modules/.bin/tsc
@echo "Typescript types complete."

.PHONY: runtests
runtests:
./node_modules/.bin/mocha __tests__

.PHONY: coverage
./node_modules/.bin/nyc --reporter=html --reporter=text ./node_modules/.bin/mocha __tests__
coverage:
./node_modules/.bin/nyc --cache=false --reporter=html --reporter=text ./node_modules/.bin/mocha __tests__

# Start a chrome debugger for test case(s). Usage:
# `make debug` or `make debug TEST="part of a test name"`
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ and parsing. The most common field on `state` is `inline`, which all of
the default rules set to true when we are in an inline scope, and false
or undefined when we are in a block scope.

`lookbehind` is the string previously captured at this parsing level, to
**DEPRECATED - use `state.prevCapture` instead.** `lookbehind` is the string previously captured at this parsing level, to
allow for lookbehind. For example, lists check that lookbehind ends with
`/^$|\n *$/` to ensure that lists only match at the beginning of a new
line.
Expand Down
Loading