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

Migrate to marksy@6 #2464

Merged
merged 2 commits into from
Dec 12, 2017
Merged

Migrate to marksy@6 #2464

merged 2 commits into from
Dec 12, 2017

Conversation

Hypnosphi
Copy link
Member

@Hypnosphi Hypnosphi commented Dec 12, 2017

Fixes #2207 and fixes #2461

How to test

Open markdown example, click "Show info"

@codecov
Copy link

codecov bot commented Dec 12, 2017

Codecov Report

Merging #2464 into release/3.3 will increase coverage by 75.81%.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff               @@
##           release/3.3   #2464       +/-   ##
===============================================
+ Coverage        19.18%     95%   +75.81%     
===============================================
  Files              355       6      -349     
  Lines             8252      40     -8212     
  Branches           917       2      -915     
===============================================
- Hits              1583      38     -1545     
+ Misses            5972       1     -5971     
+ Partials           697       1      -696
Impacted Files Coverage Δ
addons/info/src/components/types/Signature.js
addons/knobs/src/components/types/index.js
addons/viewport/src/index.js
...rganisation-name/update-organisation-name.input.js
...react/src/server/config/defaults/webpack.config.js
app/angular/bin/index.js
...-native/src/preview/components/OnDeviceUI/style.js
...dons/storyshots/stories/directly_required/index.js
app/angular/src/client/preview/actions.js
...modules/ui/components/stories_panel/text_filter.js
... and 336 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2f9ce07...a49d221. Read the comment docs.

@Hypnosphi Hypnosphi merged commit 2b00e12 into release/3.3 Dec 12, 2017
@Hypnosphi Hypnosphi deleted the scoped-marksy branch December 12, 2017 09:08
@eur00t
Copy link

eur00t commented Dec 27, 2017

For those people who used marksyConf: { highlight: ... } before: you can make this work with prismjs. Built-in storybook's <Code> component, which is given to marksy, check if Prism is available globally and then applies it.
Just add this to your storybook config:

import 'prismjs';
import 'prismjs/components/prism-<language you need>';
import 'prismjs/themes/prism.css';

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants