patch extract-zip

OpenTOSCA · Jun 30, 2023 · 5a94d30 · 5a94d30
1 parent f6b73b0
commit 5a94d30
Show file tree

Hide file tree

Showing 10 changed files with 200 additions and 178 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -11,9 +11,11 @@
 *.tar   filter=lfs diff=lfs merge=lfs -text
 *.zip   filter=lfs diff=lfs merge=lfs -text
 *.xz    filter=lfs diff=lfs merge=lfs -text
-*.jar    filter=lfs diff=lfs merge=lfs -text
+*.jar   filter=lfs diff=lfs merge=lfs -text
 
 *.jpg  binary
 *.gif  binary
 *.png  binary
 *.jpeg binary
+
+docs/cmds/mkdocs text eol=lf
diff --git a/docs/cmds/licenses/template.ejs b/docs/cmds/licenses/template.ejs
@@ -15,5 +15,9 @@ We ensure, that only the licenses <%- "MIT;Apache-2.0;Python-2.0;BSD-2-Clause;BS
 <% }) -%>
 <% }) %>
 
-Note, the release of [[email protected]](https://www.npmjs.com/package/dreamopt){target=_blank} has no license.
-However, the project is according to the author licensed under MIT.
+There are several issues.
+We fixed some of them by patching the dependencies using [`patch-package`](https://github.com/ds300/patch-package){target=_blank}.
+
+1. The release of [[email protected]](https://www.npmjs.com/package/dreamopt){target=_blank} has no license.
+However, the project is according to the author licensed under MIT as stated in [#2](https://github.com/andreyvit/dreamopt.js/issues/2){target=_blank}.
+1. We moved the dependency [@types/yauzl](https://www.npmjs.com/package/@types/yauzl){target=_blank} at [[email protected]](https://github.com/maxogden/extract-zip){target=_blank} to the development dependencies.
diff --git a/docs/cmds/puml/generate.sh b/docs/cmds/puml/generate.sh
@@ -6,16 +6,16 @@ cd "$(dirname "$0")"
 cd ../../../
 
 # Default way to execute vintner is using ts-node which takes long
-VINTNER_CLI="yarn cli"
+VINTNER="yarn cli"
 
 # Optimize executing vintner by using node
 # Note, this might not be the latest build, e.g., when executed locally
-if [ -f "build/cli/index.js" ]; then
-    VINTNER_CLI="yarn vintner"
+if [ -f "build-docs/src/cli/index.js" ]; then
+    VINTNER="node build-docs/src/cli/index.js"
 fi
 
-$VINTNER_CLI template puml topology --path docs/docs/sofdcar/guides/location/service-template.yaml
-$VINTNER_CLI template puml topology --path docs/docs/sofdcar/guides/zone/service-template.yaml
+$VINTNER template puml topology --path docs/docs/sofdcar/guides/location/service-template.yaml
+$VINTNER template puml topology --path docs/docs/sofdcar/guides/zone/service-template.yaml
 
-$VINTNER_CLI template puml types --path docs/docs/sofdcar/tosca-sofdcar-profile-core.yaml
-$VINTNER_CLI template puml types --path docs/docs/sofdcar/tosca-sofdcar-profile-extended.yaml
+$VINTNER template puml types --path docs/docs/sofdcar/tosca-sofdcar-profile-core.yaml
+$VINTNER template puml types --path docs/docs/sofdcar/tosca-sofdcar-profile-extended.yaml
diff --git a/docs/docs/assets/documents/licenses.csv b/docs/docs/assets/documents/licenses.csv
@@ -1,7 +1,5 @@
 name,version,license,url
 @ewoudenberg/difflib,0.1.0,PSF,https://github.com/ewoudenberg/difflib.js
-@types/node,18.15.11,MIT,https://github.com/DefinitelyTyped/DefinitelyTyped
-@types/yauzl,2.10.0,MIT,https://github.com/DefinitelyTyped/DefinitelyTyped
 accepts,1.3.8,MIT,https://github.com/jshttp/accepts
 ansi-styles,4.3.0,MIT,https://github.com/chalk/ansi-styles
 archiver,5.3.1,MIT,https://github.com/archiverjs/node-archiver
@@ -118,8 +116,6 @@ path-is-absolute,1.0.1,MIT,https://github.com/sindresorhus/path-is-absolute
 path-scurry,1.7.0,BlueOak-1.0.0,https://github.com/isaacs/path-walker
 path-to-regexp,0.1.7,MIT,https://github.com/component/path-to-regexp
 pend,1.2.0,MIT,https://github.com/andrewrk/node-pend
-prettier,2.8.7,MIT,https://github.com/prettier/prettier
-prettier-plugin-organize-imports,3.2.2,MIT,https://github.com/simonhaenisch/prettier-plugin-organize-imports
 process-nextick-args,2.0.1,MIT,https://github.com/calvinmetcalf/process-nextick-args
 proxy-addr,2.0.7,MIT,https://github.com/jshttp/proxy-addr
 pump,3.0.0,MIT,https://github.com/mafintosh/pump
@@ -145,7 +141,6 @@ tar-stream,2.2.0,MIT,https://github.com/mafintosh/tar-stream
 toidentifier,1.0.1,MIT,https://github.com/component/toidentifier
 tslib,2.5.0,0BSD,https://github.com/Microsoft/tslib
 type-is,1.6.18,MIT,https://github.com/jshttp/type-is
-typescript,5.0.4,Apache-2.0,https://github.com/Microsoft/TypeScript
 underscore,1.13.6,MIT,https://github.com/jashkenas/underscore
 universalify,2.0.0,MIT,https://github.com/RyanZim/universalify
 unpipe,1.0.0,MIT,https://github.com/stream-utils/unpipe

diff --git a/docs/docs/dependencies.md b/docs/docs/dependencies.md
diff --git a/docs/docs/development/index.md b/docs/docs/development/index.md
@@ -356,6 +356,7 @@ Therefore, make changes to the package inside `node_modules`, then run the follo
 yarn patch-package ${package-name}
 ```
 
+If you need to patch the `package.json`, then append the option `--option 'nothing'` as stated in [#311](https://github.com/ds300/patch-package/issues/311){target=_blank}.
 
 ## Build
 

diff --git a/docs/docs/variability4tosca/specification/index.md b/docs/docs/variability4tosca/specification/index.md
@@ -9,7 +9,7 @@ title: Specification
 This document specifies Variability4TOSCA which extends
 [TOSCA Simple Profile in YAML Version 1.3](https://docs.oasis-open.org/tosca/TOSCA-Simple-Profile-YAML/v1.3/os/TOSCA-Simple-Profile-YAML-v1.3-os.html){target=_blank}
 with conditional elements to model deployment variability.
-This includes conditional node templates, relationship templates, properties, artifacts, groups, policies, types, and inputs.
+This includes conditional node templates, relationship templates, properties, artifacts, groups, policies, types, inputs, and imports.
 In the following, we discuss the differences and the [processes to resolve the variability](#processing).
 The specification is under active development and is not backwards compatible with any previous versions.
 

diff --git a/docs/docs/variability4tosca/tests/introduction.md b/docs/docs/variability4tosca/tests/introduction.md
@@ -2,13 +2,17 @@
 title: Introduction
 ---
 
+--8<-- "enumerate.html"
+
 # Variability4TOSCA Conformance Test Suite 1.0 Release Candidate
 
 {{ autogenerated_notice('yarn docs:generate:tests:variability') }}
 
 This document specifies the conformance test suite for the Variability4TOSCA specification which can be used to evaluate Variability4TOSCA implementations.
 The specification is under active development and is not backwards compatible with any previous versions.
 
+## Conformance Tests
+
 Each test is described on a separate page.
 The description includes typically a variable service template, variability inputs,
 expected errors, expected variability-resolved service template and so on along with an explanation about the expected

diff --git a/package.json b/package.json
@@ -27,7 +27,6 @@
         "node-cron": "^3.0.2",
         "ohm-js": "16.4.0",
         "papaparse": "^5.4.1",
-        "prettier-plugin-organize-imports": "^3.2.2",
         "regression": "^2.0.1",
         "stats-lite": "^2.2.0",
         "systeminformation": "^5.17.12",
@@ -77,6 +76,7 @@
         "pkg": "^5.8.1",
         "postinstall-postinstall": "^2.1.0",
         "prettier": "^2.8.7",
+        "prettier-plugin-organize-imports": "^3.2.2",
         "puppeteer": "^20.7.3",
         "semver": "^7.5.2",
         "sync-directory": "^6.0.4",

diff --git a/patches/extract-zip+2.0.1.patch b/patches/extract-zip+2.0.1.patch
@@ -0,0 +1,16 @@
+diff --git a/node_modules/extract-zip/package.json b/node_modules/extract-zip/package.json
+index f59a35a..d2f0737 100644
+--- a/node_modules/extract-zip/package.json
++++ b/node_modules/extract-zip/package.json
+@@ -36,10 +36,8 @@
+     "get-stream": "^5.1.0",
+     "yauzl": "^2.10.0"
+   },
+-  "optionalDependencies": {
+-    "@types/yauzl": "^2.9.1"
+-  },
+   "devDependencies": {
++    "@types/yauzl": "^2.9.1",
+     "@typescript-eslint/eslint-plugin": "^3.2.0",
+     "@typescript-eslint/parser": "^3.2.0",
+     "ava": "^3.5.1",