feat: update to GRVSC v2 alpha

janosh · Jan 19, 2020 · 06d8963 · 06d8963
1 parent 82d842e
commit 06d8963
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 16 deletions.
diff --git a/gatsby-config.js b/gatsby-config.js
@@ -13,12 +13,7 @@ const gatsbyRemarkPlugins = [
   `gatsby-remark-autolink-headers`,
   {
     resolve: `gatsby-remark-vscode`,
-    options: {
-      extensions: [
-        { identifier: `silvenon.mdx`, version: `0.1.0` },
-        { identifier: `jpoissonnier.vscode-styled-components`, version: `0.0.26` },
-      ],
-    },
+    options: { extensions: [`mdx`, `vscode-styled-components`] },
   },
   {
     resolve: `gatsby-remark-katex`,

diff --git a/package.json b/package.json
@@ -40,12 +40,13 @@
     "gatsby-remark-responsive-iframe": "2.2.28",
     "gatsby-remark-smartypants": "2.1.17",
     "gatsby-remark-sub-sup": "^1.0.0",
-    "gatsby-remark-vscode": "^1.4.0",
+    "gatsby-remark-vscode": "^2.0.0-alpha.20200119",
     "gatsby-source-filesystem": "2.1.40",
     "gatsby-transformer-sharp": "2.3.7",
     "gatsby-transformer-yaml": "2.2.18",
     "katex": "^0.11.0",
     "lodash": "^4.17.15",
+    "mdx": "silvenon/vscode-mdx",
     "plotly.js": "^1.51.2",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
@@ -57,7 +58,8 @@
     "resize-observer-polyfill": "^1.5.1",
     "sharp": "0.23.4",
     "styled-components": "^4.2.1",
-    "styled-icons": "^9.0.1"
+    "styled-icons": "^9.0.1",
+    "vscode-styled-components": "styled-components/vscode-styled-components"
   },
   "devDependencies": {
     "babel-eslint": "^10.0.3",

diff --git a/src/utils/syntaxHighlight.js b/src/utils/syntaxHighlight.js
@@ -26,7 +26,7 @@ const langTagColor = [
 
 const languageTags = langTagColor.map(
   ({ lang, tag, color }) =>
-    `pre.vscode-highlight[data-language="${lang}"]::before {
+    `pre.grvsc-container[data-language="${lang}"]::before {
         content: '${tag}';
         background: ${color};
       }`
@@ -35,15 +35,15 @@ const languageTags = langTagColor.map(
 export default createGlobalStyle`
   ${languageTags.join(`\n`)}
 
-  pre.vscode-highlight {
+  pre.grvsc-container {
     position: relative;
     background: #050431;
     font-size: 0.9em;
     border-radius: ${props => props.theme.mediumBorderRadius};
     line-height: 1.5em
   }
 
-  pre.vscode-highlight[data-language]::before {
+  pre.grvsc-container[data-language]::before {
     position: absolute;
     top: 0;
     right: 2em;
@@ -70,7 +70,7 @@ export default createGlobalStyle`
   }
 
   /* highlighted lines */
-  .vscode-highlight .vscode-highlight-line-highlighted {
+  .grvsc-container .grvsc-line-highlighted {
     background: rgba(255, 255, 255, 0.15);
     box-shadow: inset 0.3em 0 0 0 ${props => props.theme.lighterBlue};
   }

diff --git a/yarn.lock b/yarn.lock
@@ -819,6 +819,11 @@
   dependencies:
     commander "^2.15.1"
 
+"@emmetio/extract-abbreviation@0.1.6":
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/@emmetio/extract-abbreviation/-/extract-abbreviation-0.1.6.tgz#e4a9856c1057f0aff7d443b8536477c243abe28c"
+  integrity sha512-Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw==
+
 "@emotion/cache@^10.0.17":
   version "10.0.19"
   resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.19.tgz#d258d94d9c707dcadaf1558def968b86bb87ad71"
@@ -7658,10 +7663,10 @@ gatsby-remark-sub-sup@^1.0.0:
   dependencies:
     remark-sub-super "^1.0.11"
 
-gatsby-remark-vscode@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/gatsby-remark-vscode/-/gatsby-remark-vscode-1.4.0.tgz#4950f97c9a32d72b3eba965e0bac16da9a7453e8"
-  integrity sha512-f+vLfVRKlLWuksAi3QQ/kh6MVKAuEKQw8PJ48d32f21RhQ2oo92DMQf7IfFgSLEApHIw1gDfU4g+GnmdrVuKdQ==
+gatsby-remark-vscode@^2.0.0-alpha.20200119:
+  version "2.0.0-alpha.20200119"
+  resolved "https://registry.yarnpkg.com/gatsby-remark-vscode/-/gatsby-remark-vscode-2.0.0-alpha.20200119.tgz#8ad8abb5181c78781bb1c6b552c8444c98974516"
+  integrity sha512-QUNtwbrmjnYaabgX8Cq+IPVsXc7mTd2H8wLniDdgQIusw9e0DG5cmpbuWfxqgyQARKNhYMKBT5HDEMIHdnSMAQ==
   dependencies:
     decompress "^4.2.0"
     json5 "^2.1.1"
@@ -10454,6 +10459,11 @@ json5@^2.1.0, json5@^2.1.1:
   dependencies:
     minimist "^1.2.0"
 
+jsonc-parser@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.3.tgz#1d53d7160e401a783dbceabaad82473f80e6ad7e"
+  integrity sha512-hk/69oAeaIzchq/v3lS50PXuzn5O2ynldopMC+SWBql7J2WtdptfB9dy8Y7+Og5rPkTCpn83zTiO8FMcqlXJ/g==
+
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -11218,6 +11228,10 @@ mdurl@^1.0.1:
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
 
+mdx@silvenon/vscode-mdx:
+  version "0.1.0"
+  resolved "https://codeload.github.com/silvenon/vscode-mdx/tar.gz/56840dbed0958f3efe8b505a22bb58d4d50eeda5"
+
 meant@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/meant/-/meant-1.0.1.tgz#66044fea2f23230ec806fb515efea29c44d2115d"
@@ -16954,6 +16968,21 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
+typescript-styled-plugin@0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/typescript-styled-plugin/-/typescript-styled-plugin-0.15.0.tgz#9e307f04f7cfab8c6319787bf854330326c9ba92"
+  integrity sha512-OyJBLsm/yPT6vH9S8SqUCjOQf+m24GZkn6Z5+QBdNyU1ViCAWJSDFoquogbKApUhRS9Fz3G5RHuRWOTwopZemw==
+  dependencies:
+    typescript-template-language-service-decorator "^2.2.0"
+    vscode-css-languageservice "^4.0.2"
+    vscode-emmet-helper "1.2.11"
+    vscode-languageserver-types "^3.13.0"
+
+typescript-template-language-service-decorator@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/typescript-template-language-service-decorator/-/typescript-template-language-service-decorator-2.2.0.tgz#4ee6d580f307fb9239978e69626f2775b8a59b2a"
+  integrity sha512-xiolqt1i7e22rpqMaprPgSFVgU64u3b9n6EJlAaUYE61jumipKAdI1+O5khPlWslpTUj80YzjUKjJ2jxT0D74w==
+
 ua-parser-js@^0.7.18:
   version "0.7.20"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz#7527178b82f6a62a0f243d1f94fd30e3e3c21098"
@@ -17699,6 +17728,39 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
+vscode-css-languageservice@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.0.2.tgz#7496e538b0c151feac16d5888cc0b1b104f4c736"
+  integrity sha512-pTnfXbsME3pl+yDfhUp/mtvPyIJk0Le4zqJxDn56s9GY9LqY0RmkSEh0oHH6D0HXR3Ni6wKosIaqu8a2G0+jdw==
+  dependencies:
+    vscode-languageserver-types "^3.15.0-next.2"
+    vscode-nls "^4.1.1"
+
+vscode-emmet-helper@1.2.11:
+  version "1.2.11"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.11.tgz#4de78223666bf917eb6dc4b225b6c40f6901950c"
+  integrity sha512-ms6/Z9TfNbjXS8r/KgbGxrNrFlu4RcIfVJxTZ2yFi0K4gn+Ka9X1+8cXvb5+5IOBGUrOsPjR0BuefdDkG+CKbQ==
+  dependencies:
+    "@emmetio/extract-abbreviation" "0.1.6"
+    jsonc-parser "^1.0.0"
+    vscode-languageserver-types "^3.6.0-next.1"
+
+vscode-languageserver-types@^3.13.0, vscode-languageserver-types@^3.15.0-next.2, vscode-languageserver-types@^3.6.0-next.1:
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0.tgz#c45a23308ec0967135c483b759dfaf97978d9e0a"
+  integrity sha512-AXteNagMhBWnZ6gNN0UB4HTiD/7TajgfHl6jaM6O7qz3zDJw0H3Jf83w05phihnBRCML+K6Ockh8f8bL0OObPw==
+
+vscode-nls@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.1.tgz#f9916b64e4947b20322defb1e676a495861f133c"
+  integrity sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A==
+
+vscode-styled-components@styled-components/vscode-styled-components:
+  version "0.0.27"
+  resolved "https://codeload.github.com/styled-components/vscode-styled-components/tar.gz/9a24df810b5e68639776f562a5e4dedb795f000d"
+  dependencies:
+    typescript-styled-plugin "0.15.0"
+
 vscode-textmate@4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-4.2.2.tgz#0b4dabc69a6fba79a065cb6b615f66eac07c8f4c"