From a69f162b89f1c5ee3c946a259057d219aa878377 Mon Sep 17 00:00:00 2001 From: mutoe Date: Fri, 10 Dec 2021 20:09:49 +0800 Subject: [PATCH] chore: fix dependencies breaking change --- package.json | 5 +++-- src/plugins/marked.ts | 2 +- src/types/global.d.ts | 1 - yarn.lock | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index ee8ee23..681a6df 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,9 @@ "lint:tsc": "vue-tsc --noEmit", "lint": "concurrently 'yarn build' 'yarn lint:tsc' 'yarn lint:script'", "test:unit": "cypress run-ct", - "test:e2e": "yarn build && concurrently -k \"yarn serve\" \"cypress run -c baseUrl=http://localhost:5000\"", + "test:e2e": "yarn build && concurrently -rk -s first \"yarn serve\" \"cypress run -c baseUrl=http://localhost:5000\"", "test:e2e:ci": "cypress run -C cypress.prod.json", - "test": "test:unit && yarn test:e2e" + "test": "yarn test:unit && yarn test:e2e" }, "dependencies": { "@harlem/core": "^2.2.0", @@ -26,6 +26,7 @@ "@cypress/vite-dev-server": "^2.2.1", "@cypress/vue": "^3.0.5", "@testing-library/cypress": "^8.0.2", + "@types/marked": "^4.0.1", "@typescript-eslint/eslint-plugin": "^5.6.0", "@typescript-eslint/parser": "^5.6.0", "@vitejs/plugin-vue": "^1.10.2", diff --git a/src/plugins/marked.ts b/src/plugins/marked.ts index c3236e9..eb473ec 100644 --- a/src/plugins/marked.ts +++ b/src/plugins/marked.ts @@ -1,4 +1,4 @@ -import marked from 'marked' +import { marked } from 'marked' import insane from 'insane' export default (markdown: string): string => { diff --git a/src/types/global.d.ts b/src/types/global.d.ts index 8da9e49..b82d2d4 100644 --- a/src/types/global.d.ts +++ b/src/types/global.d.ts @@ -1,2 +1 @@ declare module 'insane'; -declare module 'marked'; diff --git a/yarn.lock b/yarn.lock index 1afc5a1..23556f0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -409,6 +409,11 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= +"@types/marked@^4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.1.tgz#d588a7bbc4d6551c5e75249bc106ffda96ae33c5" + integrity sha512-ZigEmCWdNUU7IjZEuQ/iaimYdDHWHfTe3kg8ORfKjyGYd9RWumPoOJRQXB0bO+XLkNwzCthW3wUIQtANaEZ1ag== + "@types/node@*": version "16.11.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.12.tgz#ac7fb693ac587ee182c3780c26eb65546a1a3c10"