From 7dcfe00692389f58c3e28fc78b9da25cb8f8e3f7 Mon Sep 17 00:00:00 2001 From: lovebird Date: Mon, 22 Jan 2024 08:21:03 +0100 Subject: [PATCH] osr latest:) --- package-lock.json | 263 ++++++++++++++++++++++++++++++++++++++-------- package.json | 5 +- 2 files changed, 223 insertions(+), 45 deletions(-) diff --git a/package-lock.json b/package-lock.json index 653c6d52c..75160f881 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,11 +11,10 @@ "dependencies": { "@plastichub/core": "^0.2.6", "@plastichub/fs": "^0.13.32", - "@plastichub/osr-cache": "^0.4.4", + "@plastichub/osr-cache": "^0.4.5", "@plastichub/osr-cli-commons": "^0.4.3", - "@plastichub/osr-commons": "file:../osr-commons", "@plastichub/osr-fs-utils": "file:../osr-fs-utils", - "@plastichub/osr-tasks": "^0.4.7", + "@plastichub/osr-tasks": "^0.4.9", "@plastichub/osrl": "^0.5.3", "@types/lodash": "^4.14.148", "@types/node": "^12.12.8", @@ -543,9 +542,9 @@ } }, "node_modules/@plastichub/fs": { - "version": "0.13.36", - "resolved": "https://registry.npmjs.org/@plastichub/fs/-/fs-0.13.36.tgz", - "integrity": "sha512-rRWnUes7Oq5w5G53hmYI2Lo3NQAsRoTOVLM8j8qIoa20lmoL3P8h3lvNF3qx5gbCB5jBdSxhLXjqp/1Fk4BA1w==", + "version": "0.13.37", + "resolved": "https://registry.npmjs.org/@plastichub/fs/-/fs-0.13.37.tgz", + "integrity": "sha512-GPtUtfVt1JJSYfFGqNnjgkfgEFxcR0iy1cSb0muk69ee6u4aS26eNIvlgw+T9plqwsYSjGDrVMSiytwRHz+O3A==", "dependencies": { "@plastichub/core": "^0.2.1", "@types/denodeify": "^1.2.31", @@ -589,9 +588,9 @@ } }, "node_modules/@plastichub/osr-cache": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/@plastichub/osr-cache/-/osr-cache-0.4.4.tgz", - "integrity": "sha512-xeQPOJmXEmHI7sVLZX8l8jdTtv7kE63PJHjgu/n/ZW1N+qEAv/uQjfYT+FKswsYELFaSGaDqqaePG/Q8ldXErA==", + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/@plastichub/osr-cache/-/osr-cache-0.4.5.tgz", + "integrity": "sha512-lY+OeSE8MgzW4PLDOhwAU7FhTYEY2RoGU4JHfbQP5NGx7ZHID9nlDu2/NwPkK0t5aBH2UGkVbAwVAjBuiFfyLw==", "dependencies": { "@plastichub/core": "^0.2.6", "@plastichub/fs": "^0.13.32", @@ -1281,16 +1280,16 @@ } }, "node_modules/@plastichub/osr-cad": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@plastichub/osr-cad/-/osr-cad-0.7.4.tgz", - "integrity": "sha512-9sdUJNmZvl/JN3/mB/3KEkmNLrMy2Og+yYFDD892HocFdBPX2izzkpp/Fu2iJbfS204Jm6KleknJkT8Is1SnQQ==", + "version": "0.7.8", + "resolved": "https://registry.npmjs.org/@plastichub/osr-cad/-/osr-cad-0.7.8.tgz", + "integrity": "sha512-GEbJzs6scrLdWkzqEJzwyyYEqv0wvqrZylMBLSw1TktEPaCmHcopaPbdynZnXz5SvRPzQL350akiJv6mkCJbKg==", "dependencies": { "@iarna/toml": "^2.2.5", "@plastichub/core": "^0.2.6", "@plastichub/fs": "^0.13.36", "@plastichub/osr-cache": "^0.4.4", "@plastichub/osr-cli-commons": "^0.4.2", - "@plastichub/osr-sync": "^0.2.9", + "@plastichub/osr-sync": "^0.3.5", "@types/yargs": "^17.0.11", "add": "^2.0.6", "axios": "^0.21.1", @@ -1329,6 +1328,36 @@ "osr-cad": "main.js" } }, + "node_modules/@plastichub/osr-cad/node_modules/@plastichub/osr-sync": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@plastichub/osr-sync/-/osr-sync-0.3.5.tgz", + "integrity": "sha512-N2Lomp7yqxrKWtX50AjcFPkxyzXucQ5NuE4iL4CgC5IzhajqI/GOpl2kTwoqvy+TYZKQVUxDgdgazcL8FblULA==", + "dependencies": { + "@plastichub/core": "^0.2.6", + "@plastichub/fs": "^0.13.37", + "@plastichub/osr-cli-commons": "^0.4.2", + "archiver": "^5.3.1", + "bluebird": "^3.5.1", + "escape-html": "^1.0.3", + "globby": "^6.1.0", + "googleapis": "^59.0.0", + "jsome": "^2.3.24", + "json2csv": "^5.0.1", + "lodash": "^4.16.6", + "markdown-table": "^2.0.0", + "mkdirp": "^0.5.1", + "pkg-dir": "^2.0.0", + "q": "^1.4.1", + "showdown": "^1.9.1", + "tslib": "^1.8.1", + "typescript": "^4.7.4", + "yargonaut": "^1.1.2", + "yargs": "^17.0.1" + }, + "bin": { + "osr-sync": "main.js" + } + }, "node_modules/@plastichub/osr-cad/node_modules/axios": { "version": "0.21.4", "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", @@ -1337,6 +1366,32 @@ "follow-redirects": "^1.14.0" } }, + "node_modules/@plastichub/osr-cad/node_modules/cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dependencies": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "node_modules/@plastichub/osr-cad/node_modules/emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + }, + "node_modules/@plastichub/osr-cad/node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/@plastichub/osr-cad/node_modules/glob-parent": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-1.3.0.tgz", @@ -1364,6 +1419,59 @@ "node": ">=0.10.0" } }, + "node_modules/@plastichub/osr-cad/node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", + "engines": { + "node": ">=4" + } + }, + "node_modules/@plastichub/osr-cad/node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@plastichub/osr-cad/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@plastichub/osr-cad/node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@plastichub/osr-cad/node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "engines": { + "node": ">=6" + } + }, "node_modules/@plastichub/osr-cad/node_modules/parse-glob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-2.1.1.tgz", @@ -1397,6 +1505,56 @@ "node": ">=0.10.0" } }, + "node_modules/@plastichub/osr-cad/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "engines": { + "node": ">=4" + } + }, + "node_modules/@plastichub/osr-cad/node_modules/showdown": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/showdown/-/showdown-1.9.1.tgz", + "integrity": "sha512-9cGuS382HcvExtf5AHk7Cb4pAeQQ+h0eTr33V1mu+crYWV4KvWAw6el92bDrqGEk5d46Ai/fhbEUwqJ/mTCNEA==", + "dependencies": { + "yargs": "^14.2" + }, + "bin": { + "showdown": "bin/showdown.js" + } + }, + "node_modules/@plastichub/osr-cad/node_modules/showdown/node_modules/yargs": { + "version": "14.2.3", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz", + "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==", + "dependencies": { + "cliui": "^5.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^15.0.1" + } + }, + "node_modules/@plastichub/osr-cad/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/@plastichub/osr-cad/node_modules/typescript": { "version": "4.9.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", @@ -1409,6 +1567,24 @@ "node": ">=4.2.0" } }, + "node_modules/@plastichub/osr-cad/node_modules/wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dependencies": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@plastichub/osr-cad/node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" + }, "node_modules/@plastichub/osr-cli-commons": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/@plastichub/osr-cli-commons/-/osr-cli-commons-0.4.3.tgz", @@ -3288,17 +3464,17 @@ "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" }, "node_modules/@plastichub/osr-tasks": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/@plastichub/osr-tasks/-/osr-tasks-0.4.7.tgz", - "integrity": "sha512-CNKXKKNdfEgsAL7y5G5k84OLvfvNLfz7YD5oQv3QmuFy3Uk+llkYJZjjfXVqU6hiNpeldwomQ/ociFFZc1LDtQ==", + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@plastichub/osr-tasks/-/osr-tasks-0.4.9.tgz", + "integrity": "sha512-3WOppHXsIE0YxuX3F7V4KrFJ86qHar9FiOKH3kFqDfVkoXEg1tOlAIE6+yl38Gs5p4RamjmXl11br72zS3ez2A==", "dependencies": { "@plastichub/core": "^0.2.6", "@plastichub/osr-cache": "^0.4.3", - "@plastichub/osr-cad": "^0.7.4", + "@plastichub/osr-cad": "^0.7.6", "@plastichub/osr-cli-commons": "^0.4.3", "@plastichub/osr-cscart": "^0.1.4", "@plastichub/osr-media": "^0.2.3", - "@plastichub/osr-sync": "^0.3.2", + "@plastichub/osr-sync": "^0.3.5", "@plastichub/osrl": "^0.5.3", "axios": "^0.27.2", "bluebird": "^3.7.2", @@ -3328,12 +3504,12 @@ } }, "node_modules/@plastichub/osr-tasks/node_modules/@plastichub/osr-sync": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@plastichub/osr-sync/-/osr-sync-0.3.2.tgz", - "integrity": "sha512-8PuAJCTYZzknla+gaBHRZgroG/tdQUQD7jKfPFt8RrS+KSnIMueEpgbG6vP/QiFQMnrC+yEUpAXmHBWBqOGXCA==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@plastichub/osr-sync/-/osr-sync-0.3.5.tgz", + "integrity": "sha512-N2Lomp7yqxrKWtX50AjcFPkxyzXucQ5NuE4iL4CgC5IzhajqI/GOpl2kTwoqvy+TYZKQVUxDgdgazcL8FblULA==", "dependencies": { "@plastichub/core": "^0.2.6", - "@plastichub/fs": "^0.13.36", + "@plastichub/fs": "^0.13.37", "@plastichub/osr-cli-commons": "^0.4.2", "archiver": "^5.3.1", "bluebird": "^3.5.1", @@ -7852,11 +8028,11 @@ } }, "node_modules/editions": { - "version": "6.19.0", - "resolved": "https://registry.npmjs.org/editions/-/editions-6.19.0.tgz", - "integrity": "sha512-mJabiGaqoKWjgz0kqrVPzLBsk4sh11zcNXKFXBZ3eLwwHBWylz5OcrBrZRRaLPWoRpm9m428CLzKcituabUuFg==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/editions/-/editions-6.21.0.tgz", + "integrity": "sha512-ofkXJtn7z0urokN62DI3SBo/5xAtF0rR7tn+S/bSYV79Ka8pTajIIl+fFQ1q88DQEImymmo97M4azY3WX/nUdg==", "dependencies": { - "version-range": "^4.11.0" + "version-range": "^4.13.0" }, "engines": { "node": ">=4" @@ -12302,9 +12478,9 @@ } }, "node_modules/nexe": { - "version": "4.0.0-rc.2", - "resolved": "https://registry.npmjs.org/nexe/-/nexe-4.0.0-rc.2.tgz", - "integrity": "sha512-icz+gIlYZ4zCrLo8zVChnbwAMB6ffqQKiF4vy/eehWbVkMlHTSNqlIwNmRlAq6dNmJCaKNEoff7nhunsXRSWeA==", + "version": "4.0.0-rc.4", + "resolved": "https://registry.npmjs.org/nexe/-/nexe-4.0.0-rc.4.tgz", + "integrity": "sha512-A135LPN7fdOyEYkm5BB8oEeISMYJM/cD0TysIEhlGc/WsuLBS6moMhk/2Lf65kdrAI+0S4Z1GHtSTGv3uwXfPA==", "dependencies": { "@calebboyd/semaphore": "^1.3.1", "app-builder": "^7.0.4", @@ -14698,12 +14874,12 @@ } }, "node_modules/safe-array-concat": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", - "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.0.tgz", + "integrity": "sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==", "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1", + "call-bind": "^1.0.5", + "get-intrinsic": "^1.2.2", "has-symbols": "^1.0.3", "isarray": "^2.0.5" }, @@ -14734,14 +14910,17 @@ ] }, "node_modules/safe-regex-test": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", - "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.2.tgz", + "integrity": "sha512-83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ==", "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", + "call-bind": "^1.0.5", + "get-intrinsic": "^1.2.2", "is-regex": "^1.1.4" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -16487,9 +16666,9 @@ } }, "node_modules/version-range": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/version-range/-/version-range-4.11.0.tgz", - "integrity": "sha512-h6ZOpIbN1Dk6hfDAmni/lOMncSUcIU1/6XsDc54kQe9/lMzzzv53ovpTr0CbNDJz2GLbmr/yyrQjD8vntyxXxg==", + "version": "4.14.0", + "resolved": "https://registry.npmjs.org/version-range/-/version-range-4.14.0.tgz", + "integrity": "sha512-gjb0ARm9qlcBAonU4zPwkl9ecKkas+tC2CGwFfptTCWWIVTWY1YUbT2zZKsOAF1jR/tNxxyLwwG0cb42XlYcTg==", "engines": { "node": ">=4" }, diff --git a/package.json b/package.json index 2d8b521f1..20fe2696d 100644 --- a/package.json +++ b/package.json @@ -15,11 +15,10 @@ "dependencies": { "@plastichub/core": "^0.2.6", "@plastichub/fs": "^0.13.32", - "@plastichub/osr-cache": "^0.4.4", + "@plastichub/osr-cache": "^0.4.5", "@plastichub/osr-cli-commons": "^0.4.3", - "@plastichub/osr-commons": "file:../osr-commons", "@plastichub/osr-fs-utils": "file:../osr-fs-utils", - "@plastichub/osr-tasks": "^0.4.7", + "@plastichub/osr-tasks": "^0.4.9", "@plastichub/osrl": "^0.5.3", "@types/lodash": "^4.14.148", "@types/node": "^12.12.8",