From 87b18d21654acea3b34e61a864bdcc852666f42f Mon Sep 17 00:00:00 2001 From: Kyle Lawlor-Bagcal Date: Thu, 6 Jul 2023 17:44:48 -0400 Subject: [PATCH 1/2] docs: add copy to clip for code snippets (#1981) Co-authored-by: Ryan Christoffersen <12519942+ryanchristo@users.noreply.github.com> (cherry picked from commit 763d14bc014c0cf8c859b8a2bf1d7257333f6359) # Conflicts: # docs/package.json --- docs/.vuepress/config.ts | 2 ++ docs/package.json | 5 +++++ docs/yarn.lock | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/docs/.vuepress/config.ts b/docs/.vuepress/config.ts index 2457e12dc1..54b5c82010 100755 --- a/docs/.vuepress/config.ts +++ b/docs/.vuepress/config.ts @@ -8,6 +8,7 @@ const { description } = require('../package') import { backToTopPlugin } from '@vuepress/plugin-back-to-top' import { mediumZoomPlugin } from '@vuepress/plugin-medium-zoom' import { googleAnalyticsPlugin } from '@vuepress/plugin-google-analytics' +import codeCopyPlugin from '@snippetors/vuepress-plugin-code-copy'; /** * Ref:https://v2.vuepress.vuejs.org/guide/configuration.html#config-file @@ -275,5 +276,6 @@ export default defineUserConfig({ googleAnalyticsPlugin({ id: process.env.GOOGLE_ANALYTICS_ID }), + codeCopyPlugin(), ] }) diff --git a/docs/package.json b/docs/package.json index 90ebf9aad6..5409dff1cd 100644 --- a/docs/package.json +++ b/docs/package.json @@ -18,7 +18,12 @@ }, "license": "MIT", "devDependencies": { +<<<<<<< HEAD "@vuepress/plugin-google-analytics": "^2.0.0-beta.63", +======= + "@snippetors/vuepress-plugin-code-copy": "^1.2.3", + "@vuepress/plugin-google-analytics": "^2.0.0-beta.64", +>>>>>>> 763d14bc (docs: add copy to clip for code snippets (#1981)) "dotenv": "^16.3.1", "vuepress-vite": "^2.0.0-beta.63" } diff --git a/docs/yarn.lock b/docs/yarn.lock index 3f5402cd40..aab50ed22d 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -214,6 +214,11 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@snippetors/vuepress-plugin-code-copy@^1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@snippetors/vuepress-plugin-code-copy/-/vuepress-plugin-code-copy-1.2.3.tgz#4cc5f7ef7530ff6654786f6baa2e15ca4ffb8b14" + integrity sha512-PiUbhlYseY4UqsE/ike/Up27GkrbHvR7OJqV5nlmHEW141uWcrVaBZsBS870ckqNF+vd2fk8g4TyoiHvxaUzSg== + "@types/debug@^4.1.8": version "4.1.8" resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz#cef723a5d0a90990313faec2d1e22aee5eecb317" From f74a54d352735cf9dd71d5404b7876d2ab4c30f5 Mon Sep 17 00:00:00 2001 From: ryanchristo <12519942+ryanchristo@users.noreply.github.com> Date: Thu, 6 Jul 2023 16:28:35 -0700 Subject: [PATCH 2/2] resolve conflicts --- docs/package.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/package.json b/docs/package.json index 5409dff1cd..980e7593e5 100644 --- a/docs/package.json +++ b/docs/package.json @@ -18,12 +18,8 @@ }, "license": "MIT", "devDependencies": { -<<<<<<< HEAD - "@vuepress/plugin-google-analytics": "^2.0.0-beta.63", -======= "@snippetors/vuepress-plugin-code-copy": "^1.2.3", - "@vuepress/plugin-google-analytics": "^2.0.0-beta.64", ->>>>>>> 763d14bc (docs: add copy to clip for code snippets (#1981)) + "@vuepress/plugin-google-analytics": "^2.0.0-beta.63", "dotenv": "^16.3.1", "vuepress-vite": "^2.0.0-beta.63" }