From 476917bda93ef59c66c8395dfc12ec57a0c2a4fd Mon Sep 17 00:00:00 2001 From: Alois Klink Date: Sat, 22 Oct 2022 18:38:15 +0100 Subject: [PATCH 1/2] Revert "chore(deps): pin dependencies" This reverts commit 17b72d565de595c94c1e339da37fc81676c4b200. --- package.json | 102 +++++----- packages/mermaid-example-diagram/package.json | 4 +- packages/mermaid-mindmap/package.json | 4 +- packages/mermaid/package.json | 56 +++--- pnpm-lock.yaml | 178 +++++++++--------- 5 files changed, 171 insertions(+), 173 deletions(-) diff --git a/package.json b/package.json index c23f632dfb..7bd6488777 100644 --- a/package.json +++ b/package.json @@ -53,60 +53,60 @@ ] }, "devDependencies": { - "@applitools/eyes-cypress": "3.27.6", - "@commitlint/cli": "17.2.0", - "@commitlint/config-conventional": "17.2.0", - "@cspell/eslint-plugin": "6.14.2", - "@types/eslint": "8.4.10", - "@types/express": "4.17.14", - "@types/jsdom": "20.0.1", - "@types/lodash": "4.14.188", - "@types/mdast": "3.0.10", + "@applitools/eyes-cypress": "^3.27.6", + "@commitlint/cli": "^17.2.0", + "@commitlint/config-conventional": "^17.2.0", + "@cspell/eslint-plugin": "^6.14.2", + "@types/eslint": "^8.4.10", + "@types/express": "^4.17.14", + "@types/jsdom": "^20.0.1", + "@types/lodash": "^4.14.188", + "@types/mdast": "^3.0.10", "@types/node": "^18.11.9", - "@types/prettier": "2.7.1", - "@typescript-eslint/eslint-plugin": "5.42.1", - "@typescript-eslint/parser": "5.42.1", - "@vitest/coverage-c8": "0.25.1", - "@vitest/ui": "0.25.1", - "concurrently": "7.5.0", - "coveralls": "3.1.1", - "cypress": "10.11.0", - "cypress-image-snapshot": "4.0.1", - "esbuild": "0.15.13", - "eslint": "8.27.0", - "eslint-config-prettier": "8.5.0", - "eslint-plugin-cypress": "2.12.1", - "eslint-plugin-html": "7.1.0", - "eslint-plugin-jest": "27.1.5", - "eslint-plugin-jsdoc": "39.6.2", - "eslint-plugin-json": "3.1.0", - "eslint-plugin-markdown": "3.0.0", - "eslint-plugin-no-only-tests": "3.1.0", - "eslint-plugin-tsdoc": "0.2.17", - "express": "4.18.2", - "globby": "13.1.2", - "husky": "8.0.2", - "identity-obj-proxy": "3.0.0", - "jest": "29.3.1", - "jison": "0.4.18", - "jsdom": "20.0.2", - "lint-staged": "13.0.3", - "path-browserify": "1.0.1", - "pnpm": "7.15.0", - "prettier": "2.7.1", - "prettier-plugin-jsdoc": "0.4.2", - "rimraf": "3.0.2", - "start-server-and-test": "1.14.0", - "ts-node": "10.9.1", - "typescript": "4.8.4", - "vite": "3.2.3", - "vitepress": "1.0.0-alpha.28", - "vitepress-plugin-mermaid": "2.0.8", - "vitepress-plugin-search": "1.0.4-alpha.15", - "vitest": "0.25.1" + "@types/prettier": "^2.7.1", + "@typescript-eslint/eslint-plugin": "^5.42.1", + "@typescript-eslint/parser": "^5.42.1", + "@vitest/coverage-c8": "^0.25.1", + "@vitest/ui": "^0.25.1", + "concurrently": "^7.5.0", + "coveralls": "^3.1.1", + "cypress": "^10.11.0", + "cypress-image-snapshot": "^4.0.1", + "esbuild": "^0.15.13", + "eslint": "^8.27.0", + "eslint-config-prettier": "^8.5.0", + "eslint-plugin-cypress": "^2.12.1", + "eslint-plugin-html": "^7.1.0", + "eslint-plugin-jest": "^27.1.5", + "eslint-plugin-jsdoc": "^39.6.2", + "eslint-plugin-json": "^3.1.0", + "eslint-plugin-markdown": "^3.0.0", + "eslint-plugin-no-only-tests": "^3.1.0", + "eslint-plugin-tsdoc": "^0.2.17", + "express": "^4.18.2", + "globby": "^13.1.2", + "husky": "^8.0.2", + "identity-obj-proxy": "^3.0.0", + "jest": "^29.3.1", + "jison": "^0.4.18", + "jsdom": "^20.0.2", + "lint-staged": "^13.0.3", + "path-browserify": "^1.0.1", + "pnpm": "^7.15.0", + "prettier": "^2.7.1", + "prettier-plugin-jsdoc": "^0.4.2", + "rimraf": "^3.0.2", + "start-server-and-test": "^1.14.0", + "ts-node": "^10.9.1", + "typescript": "^4.8.4", + "vite": "^3.2.3", + "vitepress": "^1.0.0-alpha.28", + "vitepress-plugin-mermaid": "^2.0.8", + "vitepress-plugin-search": "^1.0.4-alpha.15", + "vitest": "^0.25.1" }, "resolutions": { - "d3": "7.6.1" + "d3": "^7.6.1" }, "sideEffects": [ "**/*.css", diff --git a/packages/mermaid-example-diagram/package.json b/packages/mermaid-example-diagram/package.json index f05a0bb490..8e958806a7 100644 --- a/packages/mermaid-example-diagram/package.json +++ b/packages/mermaid-example-diagram/package.json @@ -50,8 +50,8 @@ }, "dependencies": {}, "devDependencies": { - "concurrently": "7.5.0", - "rimraf": "3.0.2" + "concurrently": "^7.5.0", + "rimraf": "^3.0.2" }, "resolutions": { "d3": "^7.0.0" diff --git a/packages/mermaid-mindmap/package.json b/packages/mermaid-mindmap/package.json index 43dcf49fc5..852c0871b8 100644 --- a/packages/mermaid-mindmap/package.json +++ b/packages/mermaid-mindmap/package.json @@ -47,9 +47,9 @@ "non-layered-tidy-tree-layout": "^2.0.2" }, "devDependencies": { - "concurrently": "7.5.0", + "concurrently": "^7.5.0", "mermaid": "workspace:*", - "rimraf": "3.0.2" + "rimraf": "^3.0.2" }, "resolutions": { "d3": "^7.0.0" diff --git a/packages/mermaid/package.json b/packages/mermaid/package.json index 648c114e78..842e9ba9ab 100644 --- a/packages/mermaid/package.json +++ b/packages/mermaid/package.json @@ -67,36 +67,36 @@ "uuid": "^9.0.0" }, "devDependencies": { - "@types/d3": "7.4.0", - "@types/dompurify": "2.4.0", - "@types/jsdom": "20.0.1", - "@types/lodash": "4.14.188", - "@types/micromatch": "4.0.2", - "@types/prettier": "2.7.1", - "@types/stylis": "4.0.2", - "@types/uuid": "8.3.4", - "@typescript-eslint/eslint-plugin": "5.42.1", - "@typescript-eslint/parser": "5.42.1", - "chokidar": "3.5.3", - "concurrently": "7.5.0", - "coveralls": "3.1.1", - "globby": "13.1.2", - "identity-obj-proxy": "3.0.0", - "jison": "0.4.18", - "js-base64": "3.7.2", - "jsdom": "20.0.2", + "@types/d3": "^7.4.0", + "@types/dompurify": "^2.4.0", + "@types/jsdom": "^20.0.1", + "@types/lodash": "^4.14.188", + "@types/micromatch": "^4.0.2", + "@types/prettier": "^2.7.1", + "@types/stylis": "^4.0.2", + "@types/uuid": "^8.3.4", + "@typescript-eslint/eslint-plugin": "^5.42.1", + "@typescript-eslint/parser": "^5.42.1", + "chokidar": "^3.5.3", + "concurrently": "^7.5.0", + "coveralls": "^3.1.1", + "globby": "^13.1.2", + "identity-obj-proxy": "^3.0.0", + "jison": "^0.4.18", + "js-base64": "^3.7.2", + "jsdom": "^20.0.2", "micromatch": "^4.0.5", - "moment": "2.29.4", - "path-browserify": "1.0.1", - "prettier": "2.7.1", - "remark": "14.0.2", - "rimraf": "3.0.2", + "moment": "^2.29.4", + "path-browserify": "^1.0.1", + "prettier": "^2.7.1", + "remark": "^14.0.2", + "rimraf": "^3.0.2", "shiki": "^0.11.1", - "start-server-and-test": "1.14.0", - "typedoc": "0.23.18", - "typedoc-plugin-markdown": "3.13.6", - "typescript": "4.8.4", - "unist-util-flatmap": "1.0.0" + "start-server-and-test": "^1.14.0", + "typedoc": "^0.23.18", + "typedoc-plugin-markdown": "^3.13.6", + "typescript": "^4.8.4", + "unist-util-flatmap": "^1.0.0" }, "resolutions": { "d3": "^7.0.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e5b7f57791..11703bd03e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,164 +1,164 @@ lockfileVersion: 5.4-inlineSpecifiers overrides: - d3: 7.6.1 + d3: ^7.6.1 importers: .: devDependencies: '@applitools/eyes-cypress': - specifier: 3.27.6 + specifier: ^3.27.6 version: 3.27.6 '@commitlint/cli': - specifier: 17.2.0 + specifier: ^17.2.0 version: 17.2.0 '@commitlint/config-conventional': - specifier: 17.2.0 + specifier: ^17.2.0 version: 17.2.0 '@cspell/eslint-plugin': - specifier: 6.14.2 + specifier: ^6.14.2 version: 6.14.2 '@types/eslint': - specifier: 8.4.10 + specifier: ^8.4.10 version: 8.4.10 '@types/express': - specifier: 4.17.14 + specifier: ^4.17.14 version: 4.17.14 '@types/jsdom': - specifier: 20.0.1 + specifier: ^20.0.1 version: 20.0.1 '@types/lodash': - specifier: 4.14.188 + specifier: ^4.14.188 version: 4.14.188 '@types/mdast': - specifier: 3.0.10 + specifier: ^3.0.10 version: 3.0.10 '@types/node': specifier: ^18.11.9 version: 18.11.9 '@types/prettier': - specifier: 2.7.1 + specifier: ^2.7.1 version: 2.7.1 '@typescript-eslint/eslint-plugin': - specifier: 5.42.1 + specifier: ^5.42.1 version: 5.42.1_2udltptbznfmezdozpdoa2aemq '@typescript-eslint/parser': - specifier: 5.42.1 + specifier: ^5.42.1 version: 5.42.1_rmayb2veg2btbq6mbmnyivgasy '@vitest/coverage-c8': - specifier: 0.25.1 + specifier: ^0.25.1 version: 0.25.1_iyb77cyw3lw7duusvxyjdsflhu '@vitest/ui': - specifier: 0.25.1 + specifier: ^0.25.1 version: 0.25.1 concurrently: - specifier: 7.5.0 + specifier: ^7.5.0 version: 7.5.0 coveralls: - specifier: 3.1.1 + specifier: ^3.1.1 version: 3.1.1 cypress: - specifier: 10.11.0 + specifier: ^10.11.0 version: 10.11.0 cypress-image-snapshot: - specifier: 4.0.1 + specifier: ^4.0.1 version: 4.0.1_bg25yee4qeg7mpleuvd346a3tq esbuild: - specifier: 0.15.13 + specifier: ^0.15.13 version: 0.15.13 eslint: - specifier: 8.27.0 + specifier: ^8.27.0 version: 8.27.0 eslint-config-prettier: - specifier: 8.5.0 + specifier: ^8.5.0 version: 8.5.0_eslint@8.27.0 eslint-plugin-cypress: - specifier: 2.12.1 + specifier: ^2.12.1 version: 2.12.1_eslint@8.27.0 eslint-plugin-html: - specifier: 7.1.0 + specifier: ^7.1.0 version: 7.1.0 eslint-plugin-jest: - specifier: 27.1.5 + specifier: ^27.1.5 version: 27.1.5_kdswgjmqcx7mthqz7ow2zlfevy eslint-plugin-jsdoc: - specifier: 39.6.2 + specifier: ^39.6.2 version: 39.6.2_eslint@8.27.0 eslint-plugin-json: - specifier: 3.1.0 + specifier: ^3.1.0 version: 3.1.0 eslint-plugin-markdown: - specifier: 3.0.0 + specifier: ^3.0.0 version: 3.0.0_eslint@8.27.0 eslint-plugin-no-only-tests: - specifier: 3.1.0 + specifier: ^3.1.0 version: 3.1.0 eslint-plugin-tsdoc: - specifier: 0.2.17 + specifier: ^0.2.17 version: 0.2.17 express: - specifier: 4.18.2 + specifier: ^4.18.2 version: 4.18.2 globby: - specifier: 13.1.2 + specifier: ^13.1.2 version: 13.1.2 husky: - specifier: 8.0.2 + specifier: ^8.0.2 version: 8.0.2 identity-obj-proxy: - specifier: 3.0.0 + specifier: ^3.0.0 version: 3.0.0 jest: - specifier: 29.3.1 + specifier: ^29.3.1 version: 29.3.1_odkjkoia5xunhxkdrka32ib6vi jison: - specifier: 0.4.18 + specifier: ^0.4.18 version: 0.4.18 jsdom: - specifier: 20.0.2 + specifier: ^20.0.2 version: 20.0.2 lint-staged: - specifier: 13.0.3 + specifier: ^13.0.3 version: 13.0.3 path-browserify: - specifier: 1.0.1 + specifier: ^1.0.1 version: 1.0.1 pnpm: - specifier: 7.15.0 + specifier: ^7.15.0 version: 7.15.0 prettier: - specifier: 2.7.1 + specifier: ^2.7.1 version: 2.7.1 prettier-plugin-jsdoc: - specifier: 0.4.2 + specifier: ^0.4.2 version: 0.4.2_prettier@2.7.1 rimraf: - specifier: 3.0.2 + specifier: ^3.0.2 version: 3.0.2 start-server-and-test: - specifier: 1.14.0 + specifier: ^1.14.0 version: 1.14.0 ts-node: - specifier: 10.9.1 + specifier: ^10.9.1 version: 10.9.1_cbe7ovvae6zqfnmtgctpgpys54 typescript: - specifier: 4.8.4 + specifier: ^4.8.4 version: 4.8.4 vite: - specifier: 3.2.3 + specifier: ^3.2.3 version: 3.2.3_@types+node@18.11.9 vitepress: - specifier: 1.0.0-alpha.28 + specifier: ^1.0.0-alpha.28 version: 1.0.0-alpha.28_ysryt2e75uhznkanan6iyjk4mi vitepress-plugin-mermaid: - specifier: 2.0.8 + specifier: ^2.0.8 version: 2.0.8_2q5vfj2vm6nj3r62ddjdsi7aoe vitepress-plugin-search: - specifier: 1.0.4-alpha.15 + specifier: ^1.0.4-alpha.15 version: 1.0.4-alpha.15_s3edpouswd4dgoi2en7bdlrp54 vitest: - specifier: 0.25.1 + specifier: ^0.25.1 version: 0.25.1_iyb77cyw3lw7duusvxyjdsflhu packages/mermaid: @@ -167,7 +167,7 @@ importers: specifier: ^6.0.0 version: 6.0.0 d3: - specifier: 7.6.1 + specifier: ^7.6.1 version: 7.6.1 dagre: specifier: ^0.8.5 @@ -204,103 +204,103 @@ importers: version: 9.0.0 devDependencies: '@types/d3': - specifier: 7.4.0 + specifier: ^7.4.0 version: 7.4.0 '@types/dompurify': - specifier: 2.4.0 + specifier: ^2.4.0 version: 2.4.0 '@types/jsdom': - specifier: 20.0.1 + specifier: ^20.0.1 version: 20.0.1 '@types/lodash': - specifier: 4.14.188 + specifier: ^4.14.188 version: 4.14.188 '@types/micromatch': - specifier: 4.0.2 + specifier: ^4.0.2 version: 4.0.2 '@types/prettier': - specifier: 2.7.1 + specifier: ^2.7.1 version: 2.7.1 '@types/stylis': - specifier: 4.0.2 + specifier: ^4.0.2 version: 4.0.2 '@types/uuid': - specifier: 8.3.4 + specifier: ^8.3.4 version: 8.3.4 '@typescript-eslint/eslint-plugin': - specifier: 5.42.1 + specifier: ^5.42.1 version: 5.42.1_2udltptbznfmezdozpdoa2aemq '@typescript-eslint/parser': - specifier: 5.42.1 + specifier: ^5.42.1 version: 5.42.1_rmayb2veg2btbq6mbmnyivgasy chokidar: - specifier: 3.5.3 + specifier: ^3.5.3 version: 3.5.3 concurrently: - specifier: 7.5.0 + specifier: ^7.5.0 version: 7.5.0 coveralls: - specifier: 3.1.1 + specifier: ^3.1.1 version: 3.1.1 globby: - specifier: 13.1.2 + specifier: ^13.1.2 version: 13.1.2 identity-obj-proxy: - specifier: 3.0.0 + specifier: ^3.0.0 version: 3.0.0 jison: - specifier: 0.4.18 + specifier: ^0.4.18 version: 0.4.18 js-base64: - specifier: 3.7.2 + specifier: ^3.7.2 version: 3.7.2 jsdom: - specifier: 20.0.2 + specifier: ^20.0.2 version: 20.0.2 micromatch: specifier: ^4.0.5 version: 4.0.5 moment: - specifier: 2.29.4 + specifier: ^2.29.4 version: 2.29.4 path-browserify: - specifier: 1.0.1 + specifier: ^1.0.1 version: 1.0.1 prettier: - specifier: 2.7.1 + specifier: ^2.7.1 version: 2.7.1 remark: - specifier: 14.0.2 + specifier: ^14.0.2 version: 14.0.2 rimraf: - specifier: 3.0.2 + specifier: ^3.0.2 version: 3.0.2 shiki: specifier: ^0.11.1 version: 0.11.1 start-server-and-test: - specifier: 1.14.0 + specifier: ^1.14.0 version: 1.14.0 typedoc: - specifier: 0.23.18 + specifier: ^0.23.18 version: 0.23.18_typescript@4.8.4 typedoc-plugin-markdown: - specifier: 3.13.6 + specifier: ^3.13.6 version: 3.13.6_typedoc@0.23.18 typescript: - specifier: 4.8.4 + specifier: ^4.8.4 version: 4.8.4 unist-util-flatmap: - specifier: 1.0.0 + specifier: ^1.0.0 version: 1.0.0 packages/mermaid-example-diagram: devDependencies: concurrently: - specifier: 7.5.0 + specifier: ^7.5.0 version: 7.5.0 rimraf: - specifier: 3.0.2 + specifier: ^3.0.2 version: 3.0.2 packages/mermaid-mindmap: @@ -318,7 +318,7 @@ importers: specifier: ^2.1.0 version: 2.1.0_cytoscape@3.23.0 d3: - specifier: 7.6.1 + specifier: ^7.6.1 version: 7.6.1 khroma: specifier: ^2.0.0 @@ -328,13 +328,13 @@ importers: version: 2.0.2 devDependencies: concurrently: - specifier: 7.5.0 + specifier: ^7.5.0 version: 7.5.0 mermaid: specifier: workspace:* version: link:../mermaid rimraf: - specifier: 3.0.2 + specifier: ^3.0.2 version: 3.0.2 tests/webpack: @@ -3537,7 +3537,7 @@ packages: /axios/0.21.4_debug@4.3.2: resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} dependencies: - follow-redirects: 1.15.2_debug@4.3.2 + follow-redirects: 1.15.2 transitivePeerDependencies: - debug dev: true @@ -6047,7 +6047,7 @@ packages: resolution: {integrity: sha512-XGozTsMPYkm+6b5QL3Z9wQcJjNYxp0CYn3U1gO7dwD6PAqU1SVWZxI9CCg3z+ml3YfqdPnrBehaBrnH2AGKbNA==} dev: true - /follow-redirects/1.15.2_debug@4.3.2: + /follow-redirects/1.15.2: resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} engines: {node: '>=4.0'} peerDependencies: @@ -6055,8 +6055,6 @@ packages: peerDependenciesMeta: debug: optional: true - dependencies: - debug: 4.3.2 dev: true /foreground-child/2.0.0: @@ -6633,7 +6631,7 @@ packages: engines: {node: '>=8.0.0'} dependencies: eventemitter3: 4.0.7 - follow-redirects: 1.15.2_debug@4.3.2 + follow-redirects: 1.15.2 requires-port: 1.0.0 transitivePeerDependencies: - debug From c2bd6a490fb8db60302b7a225b7e5250f2c8b74a Mon Sep 17 00:00:00 2001 From: Alois Klink Date: Sat, 22 Oct 2022 18:38:48 +0100 Subject: [PATCH 2/2] ci(renovate): disable pinning dependencies We shouldn't pin dependencies unless we have to. This is for two reasons: - If a dependency has a security issue, users should be able to easily update the dependency, before `mermaid` makes a new release - If using `mermaid.core.js` in an app, using a dependency range means that users can bundle less dependencies. E.g. they won't need to bundle `lodash@4.17.y` just becasue mermaid needs `lodash@4.17.x`. For development/CI, our dependencies are pinned by pnpm-lock.yaml file anyway. --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 1413a3cea1..548f5b5be5 100644 --- a/renovate.json +++ b/renovate.json @@ -12,7 +12,7 @@ ], "packageRules": [ { - "matchUpdateTypes": ["minor", "patch", "pin", "digest"], + "matchUpdateTypes": ["minor", "patch", "digest"], "automerge": true } ],