diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 12abb7f0d..08bc130e8 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -1,5 +1,8 @@ # Changelog +## 15.2.0 / 2020-10-07 +- Allow language-specific theme styles to override default theme styles + ## 15.1.0 / 2020-10-05 - Updated to `prism-themes` 1.4.1 diff --git a/demo/build/demo-build.js b/demo/build/demo-build.js index 6e3b7e077..0ef9b0d86 100644 --- a/demo/build/demo-build.js +++ b/demo/build/demo-build.js @@ -75880,7 +75880,7 @@ function getCodeTree(_ref6) { _ref7$codeTagProps = _ref7.codeTagProps, codeTagProps = _ref7$codeTagProps === void 0 ? { className: language ? "language-".concat(language) : undefined, - style: style['code[class*="language-"]'] + style: _babel_runtime_helpers_objectSpread__WEBPACK_IMPORTED_MODULE_2___default()({}, style['code[class*="language-"]'], style['code[class*="language-${language}"]']) } : _ref7$codeTagProps, _ref7$useInlineStyles = _ref7.useInlineStyles, useInlineStyles = _ref7$useInlineStyles === void 0 ? true : _ref7$useInlineStyles, diff --git a/demo/build/diff-build.js b/demo/build/diff-build.js index dbfdcb87d..f8a297cf5 100644 --- a/demo/build/diff-build.js +++ b/demo/build/diff-build.js @@ -75752,7 +75752,7 @@ function getCodeTree(_ref6) { _ref7$codeTagProps = _ref7.codeTagProps, codeTagProps = _ref7$codeTagProps === void 0 ? { className: language ? "language-".concat(language) : undefined, - style: style['code[class*="language-"]'] + style: _babel_runtime_helpers_objectSpread__WEBPACK_IMPORTED_MODULE_2___default()({}, style['code[class*="language-"]'], style['code[class*="language-${language}"]']) } : _ref7$codeTagProps, _ref7$useInlineStyles = _ref7.useInlineStyles, useInlineStyles = _ref7$useInlineStyles === void 0 ? true : _ref7$useInlineStyles, diff --git a/demo/build/prism-build.js b/demo/build/prism-build.js index 96468da5a..dec35293f 100644 --- a/demo/build/prism-build.js +++ b/demo/build/prism-build.js @@ -42755,7 +42755,7 @@ function getCodeTree(_ref6) { _ref7$codeTagProps = _ref7.codeTagProps, codeTagProps = _ref7$codeTagProps === void 0 ? { className: language ? "language-".concat(language) : undefined, - style: style['code[class*="language-"]'] + style: _babel_runtime_helpers_objectSpread__WEBPACK_IMPORTED_MODULE_2___default()({}, style['code[class*="language-"]'], style['code[class*="language-${language}"]']) } : _ref7$codeTagProps, _ref7$useInlineStyles = _ref7.useInlineStyles, useInlineStyles = _ref7$useInlineStyles === void 0 ? true : _ref7$useInlineStyles, diff --git a/demo/build/prismAsyncLight-build.js b/demo/build/prismAsyncLight-build.js index 3fc4c448c..307defa15 100644 --- a/demo/build/prismAsyncLight-build.js +++ b/demo/build/prismAsyncLight-build.js @@ -42751,7 +42751,7 @@ function getCodeTree(_ref6) { _ref7$codeTagProps = _ref7.codeTagProps, codeTagProps = _ref7$codeTagProps === void 0 ? { className: language ? "language-".concat(language) : undefined, - style: style['code[class*="language-"]'] + style: _babel_runtime_helpers_objectSpread__WEBPACK_IMPORTED_MODULE_2___default()({}, style['code[class*="language-"]'], style['code[class*="language-${language}"]']) } : _ref7$codeTagProps, _ref7$useInlineStyles = _ref7.useInlineStyles, useInlineStyles = _ref7$useInlineStyles === void 0 ? true : _ref7$useInlineStyles, diff --git a/demo/build/virtualized-build.js b/demo/build/virtualized-build.js index 27b05447c..f34970211 100644 --- a/demo/build/virtualized-build.js +++ b/demo/build/virtualized-build.js @@ -109302,7 +109302,7 @@ function getCodeTree(_ref6) { _ref7$codeTagProps = _ref7.codeTagProps, codeTagProps = _ref7$codeTagProps === void 0 ? { className: language ? "language-".concat(language) : undefined, - style: style['code[class*="language-"]'] + style: _babel_runtime_helpers_objectSpread__WEBPACK_IMPORTED_MODULE_2___default()({}, style['code[class*="language-"]'], style['code[class*="language-${language}"]']) } : _ref7$codeTagProps, _ref7$useInlineStyles = _ref7.useInlineStyles, useInlineStyles = _ref7$useInlineStyles === void 0 ? true : _ref7$useInlineStyles, diff --git a/package-lock.json b/package-lock.json index c7d6c0711..75dfb6ce6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "react-syntax-highlighter", - "version": "15.0.1", + "version": "15.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e1e3a62e5..651b4c517 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-syntax-highlighter", - "version": "15.1.0", + "version": "15.2.0", "description": "syntax highlighting component for react with prismjs or highlightjs ast using inline styles", "main": "dist/cjs/index.js", "module": "dist/esm/index.js",