diff --git a/.build/common.ts b/.build/common.ts
index e9d0ebfa6..274977fa2 100644
--- a/.build/common.ts
+++ b/.build/common.ts
@@ -22,4 +22,9 @@ export const packageOptions = {
packageName: 'mermaid-zenuml',
file: 'detector.ts',
},
+ 'mermaid-flowchart-elk': {
+ name: 'mermaid-flowchart-elk',
+ packageName: 'mermaid-flowchart-elk',
+ file: 'detector.ts',
+ },
} as const;
diff --git a/.esbuild/server.ts b/.esbuild/server.ts
index 63d981b99..fb3f236e2 100644
--- a/.esbuild/server.ts
+++ b/.esbuild/server.ts
@@ -5,6 +5,7 @@ import { getBuildConfig, defaultOptions } from './util.js';
import { context } from 'esbuild';
import chokidar from 'chokidar';
import { generateLangium } from '../.build/generateLangium.js';
+import { packageOptions } from '../.build/common.js';
const parserCtx = await context(
getBuildConfig({ ...defaultOptions, minify: false, core: false, entryName: 'parser' })
@@ -101,10 +102,9 @@ async function createServer() {
app.use(cors());
app.get('/events', eventsHandler);
- app.use(express.static('./packages/parser/dist'));
- app.use(express.static('./packages/mermaid/dist'));
- app.use(express.static('./packages/mermaid-zenuml/dist'));
- app.use(express.static('./packages/mermaid-example-diagram/dist'));
+ for (const { packageName } of Object.values(packageOptions)) {
+ app.use(express.static(`./packages/${packageName}/dist`));
+ }
app.use(express.static('demos'));
app.use(express.static('cypress/platform'));
diff --git a/demos/flowchart-elk.html b/demos/flowchart-elk.html
new file mode 100644
index 000000000..69ac2d2bc
--- /dev/null
+++ b/demos/flowchart-elk.html
@@ -0,0 +1,35 @@
+
+
+
+
+
+ Mermaid Flowchart ELK Test Page
+
+
+
+ Flowchart ELK
+
+ flowchart-elk TD
+ A([Start]) ==> B[Step 1]
+ B ==> C{Flow 1}
+ C -- Choice 1.1 --> D[Step 2.1]
+ C -- Choice 1.3 --> I[Step 2.3]
+ C == Choice 1.2 ==> E[Step 2.2]
+ D --> F{Flow 2}
+ E ==> F{Flow 2}
+ F{Flow 2} == Choice 2.1 ==> H[Feedback node]
+ H[Feedback node] ==> B[Step 1]
+ F{Flow 2} == Choice 2.2 ==> G((Finish))
+
+
+
+
+
+
diff --git a/package.json b/package.json
index 51645c6a2..28d4f9592 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
"build:esbuild": "pnpm run -r clean && ts-node-esm --transpileOnly .esbuild/build.ts",
"build:mermaid": "pnpm build:esbuild --mermaid",
"build:viz": "pnpm build:esbuild --visualize",
- "build:types": "tsc -p ./packages/parser/tsconfig.json --emitDeclarationOnly && tsc -p ./packages/mermaid/tsconfig.json --emitDeclarationOnly && tsc -p ./packages/mermaid-zenuml/tsconfig.json --emitDeclarationOnly && tsc -p ./packages/mermaid-example-diagram/tsconfig.json --emitDeclarationOnly",
+ "build:types": "tsc -p ./packages/parser/tsconfig.json --emitDeclarationOnly && tsc -p ./packages/mermaid/tsconfig.json --emitDeclarationOnly && tsc -p ./packages/mermaid-zenuml/tsconfig.json --emitDeclarationOnly && tsc -p ./packages/mermaid-example-diagram/tsconfig.json --emitDeclarationOnly && tsc -p ./packages/mermaid-flowchart-elk/tsconfig.json --emitDeclarationOnly",
"build:types:watch": "tsc -p ./packages/mermaid/tsconfig.json --emitDeclarationOnly --watch",
"dev": "ts-node-esm --transpileOnly .esbuild/server.ts",
"dev:vite": "ts-node-esm --transpileOnly .vite/server.ts",
diff --git a/packages/mermaid-flowchart-elk/package.json b/packages/mermaid-flowchart-elk/package.json
index 8b98016ed..8a68891aa 100644
--- a/packages/mermaid-flowchart-elk/package.json
+++ b/packages/mermaid-flowchart-elk/package.json
@@ -1,12 +1,55 @@
{
"name": "@mermaid-js/flowchart-elk",
"version": "1.0.0",
- "description": "",
- "main": "index.js",
- "scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
+ "description": "Flowchart plugin for mermaid with ELK layout",
+ "module": "dist/mermaid-flowchart-elk.core.mjs",
+ "types": "dist/packages/mermaid-flowchart-elk/src/detector.d.ts",
+ "type": "module",
+ "exports": {
+ ".": {
+ "import": "./dist/mermaid-flowchart-elk.core.mjs",
+ "types": "./dist/packages/mermaid-flowchart-elk/src/detector.d.ts"
+ },
+ "./*": "./*"
},
- "keywords": [],
- "author": "",
- "license": "MIT"
+ "keywords": [
+ "diagram",
+ "markdown",
+ "flowchart",
+ "elk",
+ "mermaid"
+ ],
+ "scripts": {
+ "prepublishOnly": "pnpm -w run build"
+ },
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/mermaid-js/mermaid"
+ },
+ "author": "Knut Sveidqvist",
+ "license": "MIT",
+ "standard": {
+ "ignore": [
+ "**/parser/*.js",
+ "dist/**/*.js",
+ "cypress/**/*.js"
+ ],
+ "globals": [
+ "page"
+ ]
+ },
+ "dependencies": {
+ "d3": "^7.4.0",
+ "dagre-d3-es": "7.0.10",
+ "khroma": "^2.0.0",
+ "elkjs": "^0.8.2"
+ },
+ "devDependencies": {
+ "concurrently": "^8.0.0",
+ "rimraf": "^5.0.0",
+ "mermaid": "workspace:*"
+ },
+ "files": [
+ "dist"
+ ]
}
diff --git a/packages/mermaid/src/diagrams/flowchart/elk/detector.spec.ts b/packages/mermaid-flowchart-elk/src/detector.spec.ts
similarity index 100%
rename from packages/mermaid/src/diagrams/flowchart/elk/detector.spec.ts
rename to packages/mermaid-flowchart-elk/src/detector.spec.ts
diff --git a/packages/mermaid-flowchart-elk/src/detector.ts b/packages/mermaid-flowchart-elk/src/detector.ts
new file mode 100644
index 000000000..52fb355a5
--- /dev/null
+++ b/packages/mermaid-flowchart-elk/src/detector.ts
@@ -0,0 +1,32 @@
+import type {
+ ExternalDiagramDefinition,
+ DiagramDetector,
+ DiagramLoader,
+} from '../../mermaid/src/diagram-api/types.js';
+
+const id = 'flowchart-elk';
+
+const detector: DiagramDetector = (txt, config): boolean => {
+ if (
+ // If diagram explicitly states flowchart-elk
+ /^\s*flowchart-elk/.test(txt) ||
+ // If a flowchart/graph diagram has their default renderer set to elk
+ (/^\s*flowchart|graph/.test(txt) && config?.flowchart?.defaultRenderer === 'elk')
+ ) {
+ return true;
+ }
+ return false;
+};
+
+const loader: DiagramLoader = async () => {
+ const { diagram } = await import('./diagram-definition.js');
+ return { id, diagram };
+};
+
+const plugin: ExternalDiagramDefinition = {
+ id,
+ detector,
+ loader,
+};
+
+export default plugin;
diff --git a/packages/mermaid-flowchart-elk/src/diagram-definition.ts b/packages/mermaid-flowchart-elk/src/diagram-definition.ts
new file mode 100644
index 000000000..a4e678dcc
--- /dev/null
+++ b/packages/mermaid-flowchart-elk/src/diagram-definition.ts
@@ -0,0 +1,12 @@
+// @ts-ignore: JISON typing missing
+import parser from '../../mermaid/src/diagrams/flowchart/parser/flow.jison';
+import * as db from '../../mermaid/src/diagrams/flowchart/flowDb.js';
+import styles from '../../mermaid/src/diagrams/flowchart/styles.js';
+import renderer from './flowRenderer-elk.js';
+
+export const diagram = {
+ db,
+ renderer,
+ parser,
+ styles,
+};
diff --git a/packages/mermaid/src/diagrams/flowchart/elk/flowRenderer-elk.js b/packages/mermaid-flowchart-elk/src/flowRenderer-elk.js
similarity index 97%
rename from packages/mermaid/src/diagrams/flowchart/elk/flowRenderer-elk.js
rename to packages/mermaid-flowchart-elk/src/flowRenderer-elk.js
index e45739524..da4f339d5 100644
--- a/packages/mermaid/src/diagrams/flowchart/elk/flowRenderer-elk.js
+++ b/packages/mermaid-flowchart-elk/src/flowRenderer-elk.js
@@ -1,16 +1,16 @@
import { select, line, curveLinear } from 'd3';
-import { insertNode } from '../../../dagre-wrapper/nodes.js';
-import insertMarkers from '../../../dagre-wrapper/markers.js';
-import { insertEdgeLabel } from '../../../dagre-wrapper/edges.js';
+import { insertNode } from '../../mermaid/src/dagre-wrapper/nodes.js';
+import insertMarkers from '../../mermaid/src/dagre-wrapper/markers.js';
+import { insertEdgeLabel } from '../../mermaid/src/dagre-wrapper/edges.js';
import { findCommonAncestor } from './render-utils.js';
-import { labelHelper } from '../../../dagre-wrapper/shapes/util.js';
-import { getConfig } from '../../../config.js';
-import { log } from '../../../logger.js';
-import { setupGraphViewbox } from '../../../setupGraphViewbox.js';
-import common from '../../common/common.js';
-import { interpolateToCurve, getStylesFromArray } from '../../../utils.js';
+import { labelHelper } from '../../mermaid/src/dagre-wrapper/shapes/util.js';
+import { getConfig } from '../../mermaid/src/config.js';
+import { log } from '../../mermaid/src/logger.js';
+import { setupGraphViewbox } from '../../mermaid/src/setupGraphViewbox.js';
+import common from '../../mermaid/src/diagrams/common/common.js';
+import { interpolateToCurve, getStylesFromArray } from '../../mermaid/src/utils.js';
import ELK from 'elkjs/lib/elk.bundled.js';
-import { getLineFunctionsWithOffset } from '../../../utils/lineWithOffset.js';
+import { getLineFunctionsWithOffset } from '../../mermaid/src/utils/lineWithOffset.js';
const elk = new ELK();
@@ -695,7 +695,7 @@ const addMarkersToEdge = function (svgPath, edgeData, diagramType, arrowMarkerAb
*
* @param text
* @param diagObj
- * @returns {Record} ClassDef styles
+ * @returns {Record} ClassDef styles
*/
export const getClasses = function (text, diagObj) {
log.info('Extracting classes');
diff --git a/packages/mermaid/src/diagrams/flowchart/elk/render-utils.spec.ts b/packages/mermaid-flowchart-elk/src/render-utils.spec.ts
similarity index 100%
rename from packages/mermaid/src/diagrams/flowchart/elk/render-utils.spec.ts
rename to packages/mermaid-flowchart-elk/src/render-utils.spec.ts
diff --git a/packages/mermaid/src/diagrams/flowchart/elk/render-utils.ts b/packages/mermaid-flowchart-elk/src/render-utils.ts
similarity index 100%
rename from packages/mermaid/src/diagrams/flowchart/elk/render-utils.ts
rename to packages/mermaid-flowchart-elk/src/render-utils.ts
diff --git a/packages/mermaid/src/diagrams/flowchart/elk/styles.ts b/packages/mermaid-flowchart-elk/src/styles.ts
similarity index 100%
rename from packages/mermaid/src/diagrams/flowchart/elk/styles.ts
rename to packages/mermaid-flowchart-elk/src/styles.ts
diff --git a/packages/mermaid-flowchart-elk/tsconfig.json b/packages/mermaid-flowchart-elk/tsconfig.json
new file mode 100644
index 000000000..e7ca78fe4
--- /dev/null
+++ b/packages/mermaid-flowchart-elk/tsconfig.json
@@ -0,0 +1,9 @@
+{
+ "extends": "../../tsconfig.json",
+ "compilerOptions": {
+ "rootDir": "../..",
+ "outDir": "./dist"
+ },
+ "include": ["./src/**/*.ts"],
+ "typeRoots": ["./src/types"]
+}
diff --git a/packages/mermaid/package.json b/packages/mermaid/package.json
index 4ac0b7046..eaf2f0c70 100644
--- a/packages/mermaid/package.json
+++ b/packages/mermaid/package.json
@@ -68,7 +68,6 @@
"dagre-d3-es": "7.0.10",
"dayjs": "^1.11.7",
"dompurify": "^3.0.5",
- "elkjs": "^0.8.2",
"khroma": "^2.0.0",
"lodash-es": "^4.17.21",
"mdast-util-from-markdown": "^1.3.0",
diff --git a/packages/mermaid/src/diagrams/flowchart/elk/detector.ts b/packages/mermaid/src/diagrams/flowchart/elk/detector.ts
index 6cfcf2619..b476ff11b 100644
--- a/packages/mermaid/src/diagrams/flowchart/elk/detector.ts
+++ b/packages/mermaid/src/diagrams/flowchart/elk/detector.ts
@@ -3,6 +3,7 @@ import type {
DiagramDetector,
DiagramLoader,
} from '../../../diagram-api/types.js';
+import { log } from '../../../logger.js';
const id = 'flowchart-elk';
@@ -13,13 +14,21 @@ const detector: DiagramDetector = (txt, config): boolean => {
// If a flowchart/graph diagram has their default renderer set to elk
(/^\s*flowchart|graph/.test(txt) && config?.flowchart?.defaultRenderer === 'elk')
) {
+ // This will log at the end, hopefully.
+ setTimeout(
+ () =>
+ log.warn(
+ 'flowchart-elk was moved to an external package in Mermaid v11. Please refer [release notes](link) for more details. This diagram will be rendered using `dagre` layout as a fallback.'
+ ),
+ 500
+ );
return true;
}
return false;
};
const loader: DiagramLoader = async () => {
- const { diagram } = await import('./flowchart-elk-definition.js');
+ const { diagram } = await import('../flowDiagram-v2.js');
return { id, diagram };
};
diff --git a/packages/mermaid/src/diagrams/flowchart/elk/flowchart-elk-definition.ts b/packages/mermaid/src/diagrams/flowchart/elk/flowchart-elk-definition.ts
deleted file mode 100644
index 9855c7389..000000000
--- a/packages/mermaid/src/diagrams/flowchart/elk/flowchart-elk-definition.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// @ts-ignore: JISON typing missing
-import parser from '../parser/flow.jison';
-
-import * as db from '../flowDb.js';
-import renderer from './flowRenderer-elk.js';
-import styles from './styles.js';
-
-export const diagram = {
- db,
- renderer,
- parser,
- styles,
-};
diff --git a/packages/mermaid/src/styles.spec.ts b/packages/mermaid/src/styles.spec.ts
index 420ee9757..d22b0f2ee 100644
--- a/packages/mermaid/src/styles.spec.ts
+++ b/packages/mermaid/src/styles.spec.ts
@@ -17,7 +17,6 @@ import theme from './themes/index.js';
import c4 from './diagrams/c4/styles.js';
import classDiagram from './diagrams/class/styles.js';
import flowchart from './diagrams/flowchart/styles.js';
-import flowchartElk from './diagrams/flowchart/elk/styles.js';
import er from './diagrams/er/styles.js';
import git from './diagrams/git/styles.js';
import gantt from './diagrams/gantt/styles.js';
@@ -86,7 +85,6 @@ describe('styles', () => {
classDiagram,
er,
flowchart,
- flowchartElk,
gantt,
git,
journey,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3e5d16f4c..c67f93f25 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -224,9 +224,6 @@ importers:
dompurify:
specifier: ^3.0.5
version: 3.0.5
- elkjs:
- specifier: ^0.8.2
- version: 0.8.2
khroma:
specifier: ^2.0.0
version: 2.0.0
@@ -416,6 +413,31 @@ importers:
specifier: ^5.0.0
version: 5.0.0
+ packages/mermaid-flowchart-elk:
+ dependencies:
+ d3:
+ specifier: ^7.4.0
+ version: 7.8.5
+ dagre-d3-es:
+ specifier: 7.0.10
+ version: 7.0.10
+ elkjs:
+ specifier: ^0.8.2
+ version: 0.8.2
+ khroma:
+ specifier: ^2.0.0
+ version: 2.0.0
+ devDependencies:
+ concurrently:
+ specifier: ^8.0.0
+ version: 8.0.1
+ mermaid:
+ specifier: workspace:*
+ version: link:../mermaid
+ rimraf:
+ specifier: ^5.0.0
+ version: 5.0.0
+
packages/mermaid-zenuml:
dependencies:
'@zenuml/core':
@@ -500,8 +522,8 @@ importers:
specifier: ^1.1.16
version: 1.1.16
'@unocss/reset':
- specifier: ^0.55.2
- version: 0.55.7
+ specifier: ^0.57.0
+ version: 0.57.1
'@vite-pwa/vitepress':
specifier: ^0.2.0
version: 0.2.0(vite-plugin-pwa@0.16.0)
@@ -518,8 +540,8 @@ importers:
specifier: ^1.1.0
version: 1.1.1
unocss:
- specifier: ^0.55.2
- version: 0.55.7(postcss@8.4.31)(rollup@2.79.1)(vite@4.5.0)
+ specifier: ^0.57.0
+ version: 0.57.1(postcss@8.4.31)(rollup@2.79.1)(vite@4.5.0)
unplugin-vue-components:
specifier: ^0.25.0
version: 0.25.0(rollup@2.79.1)(vue@3.3.7)
@@ -530,8 +552,8 @@ importers:
specifier: ^0.16.0
version: 0.16.0(vite@4.5.0)(workbox-build@7.0.0)(workbox-window@7.0.0)
vitepress:
- specifier: 1.0.0-rc.12
- version: 1.0.0-rc.12(@algolia/client-search@4.19.1)(@types/node@18.17.5)(search-insights@2.7.0)(typescript@5.1.6)
+ specifier: 1.0.0-rc.25
+ version: 1.0.0-rc.25(@algolia/client-search@4.19.1)(@types/node@18.17.5)(postcss@8.4.31)(search-insights@2.7.0)(typescript@5.1.6)
workbox-window:
specifier: ^7.0.0
version: 7.0.0
@@ -5059,22 +5081,6 @@ packages:
eslint-visitor-keys: 3.4.3
dev: true
- /@unocss/astro@0.55.7(rollup@2.79.1)(vite@4.5.0):
- resolution: {integrity: sha512-mw8r14ArxUQBVCCisAJlF/WsZb650iBsduD/lXMk56N/nQ3MMArCcn62kcAxgZSb5tfIOQGQu/tbR8hEcD8y2g==}
- peerDependencies:
- vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0
- peerDependenciesMeta:
- vite:
- optional: true
- dependencies:
- '@unocss/core': 0.55.7
- '@unocss/reset': 0.55.7
- '@unocss/vite': 0.55.7(rollup@2.79.1)(vite@4.5.0)
- vite: 4.5.0(@types/node@18.17.5)
- transitivePeerDependencies:
- - rollup
- dev: true
-
/@unocss/astro@0.57.1(rollup@2.79.1)(vite@4.4.9):
resolution: {integrity: sha512-KNaqN/SGM/uz1QitajIkzNEw0jy9Zx9Wp8fl4GhfGYEMAN2+M4cuvBZRmlb6cLctSXmSAJQDG91ivbD1JijGnw==}
peerDependencies:
@@ -5091,24 +5097,18 @@ packages:
- rollup
dev: true
- /@unocss/cli@0.55.7(rollup@2.79.1):
- resolution: {integrity: sha512-ZHX2SR2WQbKfcmgOOHjBLB3V57Ct76Zb76YULzBj2EVX43lX/YDCVG87n6ePDY7rOcjCAthjrFQYCLV5KVLKHg==}
- engines: {node: '>=14'}
- hasBin: true
+ /@unocss/astro@0.57.1(rollup@2.79.1)(vite@4.5.0):
+ resolution: {integrity: sha512-KNaqN/SGM/uz1QitajIkzNEw0jy9Zx9Wp8fl4GhfGYEMAN2+M4cuvBZRmlb6cLctSXmSAJQDG91ivbD1JijGnw==}
+ peerDependencies:
+ vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0
+ peerDependenciesMeta:
+ vite:
+ optional: true
dependencies:
- '@ampproject/remapping': 2.2.1
- '@rollup/pluginutils': 5.0.5(rollup@2.79.1)
- '@unocss/config': 0.55.7
- '@unocss/core': 0.55.7
- '@unocss/preset-uno': 0.55.7
- cac: 6.7.14
- chokidar: 3.5.3
- colorette: 2.0.20
- consola: 3.2.3
- fast-glob: 3.3.1
- magic-string: 0.30.5
- pathe: 1.1.1
- perfect-debounce: 1.0.0
+ '@unocss/core': 0.57.1
+ '@unocss/reset': 0.57.1
+ '@unocss/vite': 0.57.1(rollup@2.79.1)(vite@4.5.0)
+ vite: 4.5.0(@types/node@18.17.5)
transitivePeerDependencies:
- rollup
dev: true
@@ -5135,14 +5135,6 @@ packages:
- rollup
dev: true
- /@unocss/config@0.55.7:
- resolution: {integrity: sha512-+X6rPScyFEWbkZyCyM+HfoJhJNN+CEl2n2izWkm0kuDj3w9fY9B3f/0dsk+jmx/gJEI5Y797q9zspNMNDib1AA==}
- engines: {node: '>=14'}
- dependencies:
- '@unocss/core': 0.55.7
- unconfig: 0.3.11
- dev: true
-
/@unocss/config@0.57.1:
resolution: {integrity: sha512-mbuVO0mH1PX7rEkViMNWb3jG1ji7TUydo2DdnMHhJE+dOrGtnQzhzXGlAd4qqel1fnt/VWuOyZKwJA3QO6VCtg==}
engines: {node: '>=14'}
@@ -5151,33 +5143,16 @@ packages:
unconfig: 0.3.11
dev: true
- /@unocss/core@0.55.7:
- resolution: {integrity: sha512-c+bWe844Xjlwc1EPwHj0+n3LpntJG7ELPbEOOxNIG+CQdcEX0l1G0rkM8+nKstJ9WJmgpf1HdJQLVMF62HXvhw==}
- dev: true
-
/@unocss/core@0.57.1:
resolution: {integrity: sha512-cqQW/4gCuk+bFMPg9lBanuRNQ9Lx1l4PpMN/6uKxI5WROpq7ce/Xb4uGvAxKLh3ITtFSpXs2cLfsy7QD6cVD/Q==}
dev: true
- /@unocss/extractor-arbitrary-variants@0.55.7:
- resolution: {integrity: sha512-imK2g/frlo5Ag0uVB+C/Psyo5+9AnqhoRAgYa6gyrQ/TJnrnwf+M3jFngU9evIMHw92vig1DGfPa2ZId901DwQ==}
- dependencies:
- '@unocss/core': 0.55.7
- dev: true
-
/@unocss/extractor-arbitrary-variants@0.57.1:
resolution: {integrity: sha512-9s+azHhBnwjxm46TsD1RY0krDAwOR8tcw58Vtl3emd6C0VQsAOdoprt7UHE7GEXMvDVq7nMf8lAT0BM0LteW3w==}
dependencies:
'@unocss/core': 0.57.1
dev: true
- /@unocss/inspector@0.55.7:
- resolution: {integrity: sha512-N0mjZozDDyqx8Mh6C/ZlMTlDzGiq22sXY/hPRX55Cf44WZI4W/ZWajqAAp42B+lw2MN0k1FYEMIAwn9n+xgq/g==}
- dependencies:
- gzip-size: 6.0.0
- sirv: 2.0.3
- dev: true
-
/@unocss/inspector@0.57.1:
resolution: {integrity: sha512-qV7ta7iHGX2EpZJ4IWY/05kgyhKFeWlvVJbrOnGsaH8gVt33T/43YAhB/8K5GIXBXIwkhwk13iB13nlg2gSheg==}
dependencies:
@@ -5186,20 +5161,6 @@ packages:
sirv: 2.0.3
dev: true
- /@unocss/postcss@0.55.7(postcss@8.4.31):
- resolution: {integrity: sha512-53Z/yv/CNdlTqKZQ9gpYRoLZSuzQ28J0SDrGCdzwjLcvHG/FD7/x1S7yxE7cUp/4sjvLL15HSzkWq8vNy6SkwQ==}
- engines: {node: '>=14'}
- peerDependencies:
- postcss: ^8.4.21
- dependencies:
- '@unocss/config': 0.55.7
- '@unocss/core': 0.55.7
- css-tree: 2.3.1
- fast-glob: 3.3.1
- magic-string: 0.30.5
- postcss: 8.4.31
- dev: true
-
/@unocss/postcss@0.57.1(postcss@8.4.31):
resolution: {integrity: sha512-DexrV+v/qkVh6t660rXigNr2Y6lON8jxD1z2KVk2bjHKhFflF6q6seps6d/MquyLJI1mXF2uANTeFAeL2q6evw==}
engines: {node: '>=14'}
@@ -5215,28 +5176,12 @@ packages:
postcss: 8.4.31
dev: true
- /@unocss/preset-attributify@0.55.7:
- resolution: {integrity: sha512-L1sNw3DyM4mymIm4DBTTTOllk8LmhYlWMgDlaAW2MYWygjqDCsp99wRKT2175Ya5xHYBA6XetMoBryZD23qJYQ==}
- dependencies:
- '@unocss/core': 0.55.7
- dev: true
-
/@unocss/preset-attributify@0.57.1:
resolution: {integrity: sha512-pvGQHaqBlB0jQysWhNbcKLOGrkj8b53k0sAa9LYxQjD1fa8t/dwbuMpZv4twX+gysF0vBhxRoWBPLH1/S6zRZg==}
dependencies:
'@unocss/core': 0.57.1
dev: true
- /@unocss/preset-icons@0.55.7:
- resolution: {integrity: sha512-JXLOHkyEKKAjLTqjAxYfhwln05WXilGg3jctkZWKpMNawPaonrGt3kZT12YMuMmOryxk7UcyKB0dtYc+p3QYvw==}
- dependencies:
- '@iconify/utils': 2.1.11
- '@unocss/core': 0.55.7
- ofetch: 1.3.3
- transitivePeerDependencies:
- - supports-color
- dev: true
-
/@unocss/preset-icons@0.57.1:
resolution: {integrity: sha512-ve4jC6yREfS0mv97DCld9xLjMuiSCcsQPKucdtpUfCjLMqtGd1ZGGdFv02Q+92NkW7HDfgj+izEw1SKh9695Ow==}
dependencies:
@@ -5247,13 +5192,6 @@ packages:
- supports-color
dev: true
- /@unocss/preset-mini@0.55.7:
- resolution: {integrity: sha512-ZCskE2uprjGkpQezEPM6KPMf84rIZEUNc1p2DxWVHaFUPRV24/JSNsO4PsKrQgNIb2dLQxzPNlMzQJI7ssdBXQ==}
- dependencies:
- '@unocss/core': 0.55.7
- '@unocss/extractor-arbitrary-variants': 0.55.7
- dev: true
-
/@unocss/preset-mini@0.57.1:
resolution: {integrity: sha512-v9ZsIUGDfZNXbIrOc7zrBp+RFbFFGSQN/vKIf761js4fJ31j6lan4pPQPGcY17xHConkI1HJT/+yb/UVJaAcHw==}
dependencies:
@@ -5262,25 +5200,12 @@ packages:
'@unocss/rule-utils': 0.57.1
dev: true
- /@unocss/preset-tagify@0.55.7:
- resolution: {integrity: sha512-aDsuN3a/ZirbCDKpFsue9tc8MHs3l0Rl81n2ZOdIrJoZW4YWyydMVl++cz/HERZW81ZySK8EJKwGBaMJMgsnHA==}
- dependencies:
- '@unocss/core': 0.55.7
- dev: true
-
/@unocss/preset-tagify@0.57.1:
resolution: {integrity: sha512-GV8knxnsOVH/XiG2KB+mVZeEJqr0PZvvkSTPftGPbjttoKVZ+28Y5q9/qezH7p4W6RYVAAK+3qHHy5wWZosiMw==}
dependencies:
'@unocss/core': 0.57.1
dev: true
- /@unocss/preset-typography@0.55.7:
- resolution: {integrity: sha512-hLV4nsgsDIk66pt7Ej4NYUmaGtI2EfGb1h2yl5FmBtdtACrgPq+Skr2Br9Iq+Bj1QFhbsMOWLDdbojFQwBdH6A==}
- dependencies:
- '@unocss/core': 0.55.7
- '@unocss/preset-mini': 0.55.7
- dev: true
-
/@unocss/preset-typography@0.57.1:
resolution: {integrity: sha512-C4cqCiGW0OSoSXsVQKgfLulYxY5C8M40f+a8VtBlAaEaN6eSlEt+catXb0chF9T2mvz/b87b0PahPvPwJdDf1Q==}
dependencies:
@@ -5288,14 +5213,6 @@ packages:
'@unocss/preset-mini': 0.57.1
dev: true
- /@unocss/preset-uno@0.55.7:
- resolution: {integrity: sha512-z4pCxOv/OU1ARo++cvbijWNW2zy/EVTMqJXa+SEep9b99wFXPQE3gaPvLdURp/e5f1PoxVyPZ6JiBknbClSDuA==}
- dependencies:
- '@unocss/core': 0.55.7
- '@unocss/preset-mini': 0.55.7
- '@unocss/preset-wind': 0.55.7
- dev: true
-
/@unocss/preset-uno@0.57.1:
resolution: {integrity: sha512-0+DKZiowYjYzq2swJzQA2dhqDvLJdm0Y437ITzc2GzZMKGUUuNi+w2v3/SzwkpkRd9zTB9/YaOIJVfdrx6ZOXQ==}
dependencies:
@@ -5305,13 +5222,6 @@ packages:
'@unocss/rule-utils': 0.57.1
dev: true
- /@unocss/preset-web-fonts@0.55.7:
- resolution: {integrity: sha512-ygAz0540kdBapErW2BcObWfQT/6g0SpVUPYg92PPiZD57CZAvuNXiYTfFMRXd88QrBL1zIrZ6NrzY0NZ645H+w==}
- dependencies:
- '@unocss/core': 0.55.7
- ofetch: 1.3.3
- dev: true
-
/@unocss/preset-web-fonts@0.57.1:
resolution: {integrity: sha512-9DCIMlBRaGrljLmeciH4WqP+uRx2z2nLxvrvEmGbpJJpMn2H4higR5Zu5tDyKYGr9QBl9vXdWgib+43OSswkqA==}
dependencies:
@@ -5319,13 +5229,6 @@ packages:
ofetch: 1.3.3
dev: true
- /@unocss/preset-wind@0.55.7:
- resolution: {integrity: sha512-vLi0mtYDnvx3uYtBR4fSCR52T59drTUp3XVAAqQTbhvRctnSWm65MWE4G+gqdt2qQ9fM4SVCsxLLaXuJkI2eqw==}
- dependencies:
- '@unocss/core': 0.55.7
- '@unocss/preset-mini': 0.55.7
- dev: true
-
/@unocss/preset-wind@0.57.1:
resolution: {integrity: sha512-5UairNahUXNDe9AggPtTCodyPjl6NgPCsiEB22LVgN20UjBXjaqzN5wUe1OgtpLoAUaSk0KI7eLWhnWbTbST3A==}
dependencies:
@@ -5334,10 +5237,6 @@ packages:
'@unocss/rule-utils': 0.57.1
dev: true
- /@unocss/reset@0.55.7:
- resolution: {integrity: sha512-yvmLhxqUNgf6wue7IvhV/FdrQW9H9LF1Bmmhwwaiz2aV0E74aN4pbuYPZwNq3YafsQvNQ0UdtuXjddY4QMRCPw==}
- dev: true
-
/@unocss/reset@0.57.1:
resolution: {integrity: sha512-f/ofoudjFN/HMtv1XV5phP58pOmNruBhr0GbVdBNylyieMQkFHowA7iSemChnC/fTbCcY6oSOAcFl4n9AefjdA==}
dev: true
@@ -5350,57 +5249,28 @@ packages:
magic-string: 0.30.5
dev: true
- /@unocss/scope@0.55.7:
- resolution: {integrity: sha512-r0CaS1aSpcC37ztqOJ3qaWIzM6zwdlX8r0rib2vTvWTckw1J0ocVhjNkWRBM9kRWte006JhecdiZzXNHA40akg==}
- dev: true
-
/@unocss/scope@0.57.1:
resolution: {integrity: sha512-ZAzg6lLGwKNQGCvJXEie3TvGztkAyajEFqygu0mjtHb+CmDql4iAjoygs+3dnRI5hSDwfMYFrJ2azX26+2CsoA==}
dev: true
- /@unocss/transformer-attributify-jsx-babel@0.55.7:
- resolution: {integrity: sha512-xl5K/Zg7tLyI6Oee+xHgvBm0gSEviYdBDwaGC4O6cP9VXTBm6waz9NUU6CmmVYKh4dSeLQ1PKNboMeg2nFuJMw==}
- dependencies:
- '@unocss/core': 0.55.7
- dev: true
-
/@unocss/transformer-attributify-jsx-babel@0.57.1:
resolution: {integrity: sha512-EOCPB8OGmhroAuFU0i0W5p6GmJpx6mAkP4KmsqVLd4QMgw+8aXkG7SKyLnxQZnekM0/dSo0TcpVGeGrZaUNgvQ==}
dependencies:
'@unocss/core': 0.57.1
dev: true
- /@unocss/transformer-attributify-jsx@0.55.7:
- resolution: {integrity: sha512-ZyUBc0wguBhd+nbIlcrSYpmzKtqBi+8BII8SK4lIB/Ol1wBboByPTjBENsQkxRyffp5K9VTuZZ/LamFgPGOWDg==}
- dependencies:
- '@unocss/core': 0.55.7
- dev: true
-
/@unocss/transformer-attributify-jsx@0.57.1:
resolution: {integrity: sha512-ohgSEwm2j98ltPWl1zRPvZhRjQPpd7qZtgoROTQh6n2W7wEO1SlnYjgBBz+pGuo2dkfBN5NjuZJ93AEjS10Ysw==}
dependencies:
'@unocss/core': 0.57.1
dev: true
- /@unocss/transformer-compile-class@0.55.7:
- resolution: {integrity: sha512-tiYiT9EG4ucSBvMo+9Hv43GY0YvXQjfQCXDhDm3tcJyreMg6BRMO412eir54RBS+JAdNU0DUoITVYu+PkF7hLg==}
- dependencies:
- '@unocss/core': 0.55.7
- dev: true
-
/@unocss/transformer-compile-class@0.57.1:
resolution: {integrity: sha512-z0WZN6hbgpyBm2xqIrojqEjpQMhiyzHRbaBjWzI/6ieHWoFo5ajIwnReaFUEfJRNruLTd7/9hFDZdRXRPhttFw==}
dependencies:
'@unocss/core': 0.57.1
dev: true
- /@unocss/transformer-directives@0.55.7:
- resolution: {integrity: sha512-xNmR40FssHWYJSmJv/9TQC2IdTyZPV8U3Iv/PIuke1zndMwMciclghEFiw0wSeRmhoRI7iFZck5EI/Bokyo7CQ==}
- dependencies:
- '@unocss/core': 0.55.7
- css-tree: 2.3.1
- dev: true
-
/@unocss/transformer-directives@0.57.1:
resolution: {integrity: sha512-rIk3XEU2NywEJUOkngBSmJfvS3IVgxkkqgMvuIqz8ZDbwWhepuMxsiI0QR3ypkipGr/eKK5DJ7eK0OVlo6FPFA==}
dependencies:
@@ -5409,38 +5279,12 @@ packages:
css-tree: 2.3.1
dev: true
- /@unocss/transformer-variant-group@0.55.7:
- resolution: {integrity: sha512-uLyZ08XXVriUDenZCTGA3xGgMD3B9GVr6mSz002pDlLpQDi8FcMQTOGg8X4ViCGzS3l03S/+r+JY7kJTpMFa9w==}
- dependencies:
- '@unocss/core': 0.55.7
- dev: true
-
/@unocss/transformer-variant-group@0.57.1:
resolution: {integrity: sha512-qwydzn2Lqz/8zW6UUXdORaUl8humsG8ll74LN/z8cjEsqtXZkVdkV0l6Brpp9Xp/XPbKwO+II+KH3/1LGwXSzQ==}
dependencies:
'@unocss/core': 0.57.1
dev: true
- /@unocss/vite@0.55.7(rollup@2.79.1)(vite@4.5.0):
- resolution: {integrity: sha512-xmdyDnt9Ag4o7DGl22/P6MaB+HSjWOQw9qYYzIefSv3SVUvn3cEhIX/PCWqFp8Kts2HyvAoJLbZmygSf1XdZNQ==}
- peerDependencies:
- vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0
- dependencies:
- '@ampproject/remapping': 2.2.1
- '@rollup/pluginutils': 5.0.5(rollup@2.79.1)
- '@unocss/config': 0.55.7
- '@unocss/core': 0.55.7
- '@unocss/inspector': 0.55.7
- '@unocss/scope': 0.55.7
- '@unocss/transformer-directives': 0.55.7
- chokidar: 3.5.3
- fast-glob: 3.3.1
- magic-string: 0.30.5
- vite: 4.5.0(@types/node@18.17.5)
- transitivePeerDependencies:
- - rollup
- dev: true
-
/@unocss/vite@0.57.1(rollup@2.79.1)(vite@4.4.9):
resolution: {integrity: sha512-kEBDvGgQNkX2n87S6Ao5seyFb1kuWZ5p96dGOS7VFpD7HvR5xholkJXaVhUK9/exCldjLExbo5UtVlbxFLUFYg==}
peerDependencies:
@@ -5461,6 +5305,26 @@ packages:
- rollup
dev: true
+ /@unocss/vite@0.57.1(rollup@2.79.1)(vite@4.5.0):
+ resolution: {integrity: sha512-kEBDvGgQNkX2n87S6Ao5seyFb1kuWZ5p96dGOS7VFpD7HvR5xholkJXaVhUK9/exCldjLExbo5UtVlbxFLUFYg==}
+ peerDependencies:
+ vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0
+ dependencies:
+ '@ampproject/remapping': 2.2.1
+ '@rollup/pluginutils': 5.0.5(rollup@2.79.1)
+ '@unocss/config': 0.57.1
+ '@unocss/core': 0.57.1
+ '@unocss/inspector': 0.57.1
+ '@unocss/scope': 0.57.1
+ '@unocss/transformer-directives': 0.57.1
+ chokidar: 3.5.3
+ fast-glob: 3.3.1
+ magic-string: 0.30.5
+ vite: 4.5.0(@types/node@18.17.5)
+ transitivePeerDependencies:
+ - rollup
+ dev: true
+
/@vite-pwa/vitepress@0.2.0(vite-plugin-pwa@0.16.0):
resolution: {integrity: sha512-dVQVaP6NB9woCFe4UASUqRp7uwBQJOVXlJlqK4krqXcbb3NuXIXIWOnU7HLpJnHqZj5U/81gKtLN6gs5gJBwiQ==}
peerDependencies:
@@ -15784,45 +15648,6 @@ packages:
engines: {node: '>= 10.0.0'}
dev: true
- /unocss@0.55.7(postcss@8.4.31)(rollup@2.79.1)(vite@4.5.0):
- resolution: {integrity: sha512-3W9P7vj2EhSk/4oPCHBS0VgrwSf5zZL6Az1/XARVOpBnRJtCM2szFInYxHkMgt9pkZTsW8SFCuk/g+QIJ6A8tg==}
- engines: {node: '>=14'}
- peerDependencies:
- '@unocss/webpack': 0.55.7
- vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0
- peerDependenciesMeta:
- '@unocss/webpack':
- optional: true
- vite:
- optional: true
- dependencies:
- '@unocss/astro': 0.55.7(rollup@2.79.1)(vite@4.5.0)
- '@unocss/cli': 0.55.7(rollup@2.79.1)
- '@unocss/core': 0.55.7
- '@unocss/extractor-arbitrary-variants': 0.55.7
- '@unocss/postcss': 0.55.7(postcss@8.4.31)
- '@unocss/preset-attributify': 0.55.7
- '@unocss/preset-icons': 0.55.7
- '@unocss/preset-mini': 0.55.7
- '@unocss/preset-tagify': 0.55.7
- '@unocss/preset-typography': 0.55.7
- '@unocss/preset-uno': 0.55.7
- '@unocss/preset-web-fonts': 0.55.7
- '@unocss/preset-wind': 0.55.7
- '@unocss/reset': 0.55.7
- '@unocss/transformer-attributify-jsx': 0.55.7
- '@unocss/transformer-attributify-jsx-babel': 0.55.7
- '@unocss/transformer-compile-class': 0.55.7
- '@unocss/transformer-directives': 0.55.7
- '@unocss/transformer-variant-group': 0.55.7
- '@unocss/vite': 0.55.7(rollup@2.79.1)(vite@4.5.0)
- vite: 4.5.0(@types/node@18.17.5)
- transitivePeerDependencies:
- - postcss
- - rollup
- - supports-color
- dev: true
-
/unocss@0.57.1(postcss@8.4.31)(rollup@2.79.1)(vite@4.4.9):
resolution: {integrity: sha512-xLsyJ8+T1/Ux93yrqOvuQy268wF5rSzydlsbqZ5EVfi01PxYyydez3nycPqbyPZientkJ0Yohzd5aBqmZgku3A==}
engines: {node: '>=14'}
@@ -15862,6 +15687,45 @@ packages:
- supports-color
dev: true
+ /unocss@0.57.1(postcss@8.4.31)(rollup@2.79.1)(vite@4.5.0):
+ resolution: {integrity: sha512-xLsyJ8+T1/Ux93yrqOvuQy268wF5rSzydlsbqZ5EVfi01PxYyydez3nycPqbyPZientkJ0Yohzd5aBqmZgku3A==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@unocss/webpack': 0.57.1
+ vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0
+ peerDependenciesMeta:
+ '@unocss/webpack':
+ optional: true
+ vite:
+ optional: true
+ dependencies:
+ '@unocss/astro': 0.57.1(rollup@2.79.1)(vite@4.5.0)
+ '@unocss/cli': 0.57.1(rollup@2.79.1)
+ '@unocss/core': 0.57.1
+ '@unocss/extractor-arbitrary-variants': 0.57.1
+ '@unocss/postcss': 0.57.1(postcss@8.4.31)
+ '@unocss/preset-attributify': 0.57.1
+ '@unocss/preset-icons': 0.57.1
+ '@unocss/preset-mini': 0.57.1
+ '@unocss/preset-tagify': 0.57.1
+ '@unocss/preset-typography': 0.57.1
+ '@unocss/preset-uno': 0.57.1
+ '@unocss/preset-web-fonts': 0.57.1
+ '@unocss/preset-wind': 0.57.1
+ '@unocss/reset': 0.57.1
+ '@unocss/transformer-attributify-jsx': 0.57.1
+ '@unocss/transformer-attributify-jsx-babel': 0.57.1
+ '@unocss/transformer-compile-class': 0.57.1
+ '@unocss/transformer-directives': 0.57.1
+ '@unocss/transformer-variant-group': 0.57.1
+ '@unocss/vite': 0.57.1(rollup@2.79.1)(vite@4.5.0)
+ vite: 4.5.0(@types/node@18.17.5)
+ transitivePeerDependencies:
+ - postcss
+ - rollup
+ - supports-color
+ dev: true
+
/unpipe@1.0.0:
resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
engines: {node: '>= 0.8'}
@@ -16237,49 +16101,6 @@ packages:
- terser
dev: true
- /vitepress@1.0.0-rc.12(@algolia/client-search@4.19.1)(@types/node@18.17.5)(search-insights@2.7.0)(typescript@5.1.6):
- resolution: {integrity: sha512-mZknN5l9lgbBjXwumwdOQQDM+gPivswFEykEQeenY0tv7eocS+bb801IpFZT3mFV6YRhSddmbutHlFgPPADjEg==}
- hasBin: true
- dependencies:
- '@docsearch/css': 3.5.2
- '@docsearch/js': 3.5.2(@algolia/client-search@4.19.1)(search-insights@2.7.0)
- '@vue/devtools-api': 6.5.1
- '@vueuse/core': 10.5.0(vue@3.3.7)
- '@vueuse/integrations': 10.5.0(focus-trap@7.5.4)(vue@3.3.7)
- focus-trap: 7.5.4
- mark.js: 8.11.1
- minisearch: 6.1.0
- shiki: 0.14.5
- vite: 4.5.0(@types/node@18.17.5)
- vue: 3.3.7(typescript@5.1.6)
- transitivePeerDependencies:
- - '@algolia/client-search'
- - '@types/node'
- - '@types/react'
- - '@vue/composition-api'
- - async-validator
- - axios
- - change-case
- - drauu
- - fuse.js
- - idb-keyval
- - jwt-decode
- - less
- - lightningcss
- - nprogress
- - qrcode
- - react
- - react-dom
- - sass
- - search-insights
- - sortablejs
- - stylus
- - sugarss
- - terser
- - typescript
- - universal-cookie
- dev: true
-
/vitepress@1.0.0-rc.25(@algolia/client-search@4.19.1)(@types/node@18.17.5)(postcss@8.4.31)(search-insights@2.7.0)(typescript@5.1.6):
resolution: {integrity: sha512-1dqWiHNThNrVZ08ixmfEDBEH+764KOgnev9oXga/x6cN++Vb9pnuu8p3K6DQP+KZrYcG+WiX7jxal0iSNpAWuQ==}
hasBin: true