From da80bdcb53037b93aba98dd7fc8616862adad093 Mon Sep 17 00:00:00 2001 From: Lucas Pose Date: Tue, 26 Jul 2022 17:50:09 -0300 Subject: [PATCH 1/7] fix dependency --- app/index.html | 2 +- bower.json | 13 +++++++++---- karma.conf.js | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/index.html b/app/index.html index 49210729f..a5bf1011e 100644 --- a/app/index.html +++ b/app/index.html @@ -97,7 +97,7 @@ - + diff --git a/bower.json b/bower.json index b5f9af949..eebe1f8cb 100644 --- a/bower.json +++ b/bower.json @@ -12,7 +12,7 @@ "angular-ui-tree": "2.1.5", "api-console": "mulesoft/api-console#v3.0.34", "es5-shim": "~2.3.0", - "file-saver.js": "~1.20150304.1", + "file-saver.js": "https://github.com/eligrey/FileSaver.js.git#2.0.4", "font-awesome": "~4.0.3", "json-schema-ref-parser": "xaka/json-schema-ref-parser#v2.2.1", "jszip": "~2.0.0", @@ -21,10 +21,15 @@ "js-polyfills": "0.1.42" }, "devDependencies": { - "angular-mocks": ">=1.2.0 <1.4.0", - "sinonjs": "~1.7.1" + "sinonjs": "~1.7.1", + "angular-mocks": ">=1.2.0 <1.4.0" }, "resolutions": { "angular": "~1.3.17" + }, + "overrides": { + "file-saver.js": { + "main": "dist/FileSaver.js" + } } -} +} \ No newline at end of file diff --git a/karma.conf.js b/karma.conf.js index 4db6b22dd..f8a964f91 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -49,7 +49,7 @@ module.exports = function(config) { 'bower_components/angular-marked/angular-marked.js', 'bower_components/angular-highlightjs/angular-highlightjs.js', 'bower_components/api-console/dist/scripts/api-console.js', - 'bower_components/file-saver.js/FileSaver.js', + 'bower_components/file-saver.js/dist/FileSaver.js', 'bower_components/json-schema-ref-parser/dist/ref-parser.js', 'bower_components/angular-mocks/angular-mocks.js', From ab3221617cb8b18e55fe0ae40f126b82828b8bb6 Mon Sep 17 00:00:00 2001 From: Lucas Pose Date: Wed, 27 Jul 2022 11:33:27 -0300 Subject: [PATCH 2/7] fix api console --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index eebe1f8cb..5b5c65dcb 100644 --- a/bower.json +++ b/bower.json @@ -10,7 +10,7 @@ "angular": "~1.3.17", "angular-bootstrap": ">=0.11.0 <0.14.0", "angular-ui-tree": "2.1.5", - "api-console": "mulesoft/api-console#v3.0.34", + "api-console": "https://github.com/mulesoft/api-console.git#v3.0.34", "es5-shim": "~2.3.0", "file-saver.js": "https://github.com/eligrey/FileSaver.js.git#2.0.4", "font-awesome": "~4.0.3", From 76a662cc97c2f475e3073720d7fa203e1906997d Mon Sep 17 00:00:00 2001 From: Lucas Pose Date: Wed, 27 Jul 2022 11:39:46 -0300 Subject: [PATCH 3/7] Fix json-schema-ref-parser dependency --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 5b5c65dcb..d8ab98685 100644 --- a/bower.json +++ b/bower.json @@ -14,7 +14,7 @@ "es5-shim": "~2.3.0", "file-saver.js": "https://github.com/eligrey/FileSaver.js.git#2.0.4", "font-awesome": "~4.0.3", - "json-schema-ref-parser": "xaka/json-schema-ref-parser#v2.2.1", + "json-schema-ref-parser": "https://github.com/xaka/json-schema-ref-parser.git#v2.2.1", "jszip": "~2.0.0", "promise-polyfill": "~6.0.2", "crypto-js": "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/crypto-js/CryptoJS%20v3.1.2.zip", From f365272a9c8366533b66c0a70eea7b72b8a30ada Mon Sep 17 00:00:00 2001 From: Lucas Pose Date: Wed, 27 Jul 2022 11:41:40 -0300 Subject: [PATCH 4/7] fix --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index d8ab98685..2ed7e4426 100644 --- a/bower.json +++ b/bower.json @@ -12,7 +12,7 @@ "angular-ui-tree": "2.1.5", "api-console": "https://github.com/mulesoft/api-console.git#v3.0.34", "es5-shim": "~2.3.0", - "file-saver.js": "https://github.com/eligrey/FileSaver.js.git#2.0.4", + "file-saver.js": "https://github.com/eligrey/FileSaver.js.git", "font-awesome": "~4.0.3", "json-schema-ref-parser": "https://github.com/xaka/json-schema-ref-parser.git#v2.2.1", "jszip": "~2.0.0", From 4ddbad0c0f94c273430ffc848892bdc4bd38f748 Mon Sep 17 00:00:00 2001 From: Lucas Pose Date: Wed, 27 Jul 2022 11:45:15 -0300 Subject: [PATCH 5/7] fix dependency --- bower.json | 1 - 1 file changed, 1 deletion(-) diff --git a/bower.json b/bower.json index 2ed7e4426..84624649c 100644 --- a/bower.json +++ b/bower.json @@ -21,7 +21,6 @@ "js-polyfills": "0.1.42" }, "devDependencies": { - "sinonjs": "~1.7.1", "angular-mocks": ">=1.2.0 <1.4.0" }, "resolutions": { From b1215fc13354ae4bd941c22d002902a675df69a1 Mon Sep 17 00:00:00 2001 From: Lucas Pose Date: Wed, 27 Jul 2022 12:09:54 -0300 Subject: [PATCH 6/7] fix file saver --- bower.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/bower.json b/bower.json index 84624649c..874322d05 100644 --- a/bower.json +++ b/bower.json @@ -12,7 +12,8 @@ "angular-ui-tree": "2.1.5", "api-console": "https://github.com/mulesoft/api-console.git#v3.0.34", "es5-shim": "~2.3.0", - "file-saver.js": "https://github.com/eligrey/FileSaver.js.git", + "file-saver.js": "https://github.com/eligrey/FileSaver.js.git#v2.0.4", + "FileSaver": "https://github.com/eligrey/FileSaver.js.git#683f689326c231002164621dc8a6451df4e86e8a", "font-awesome": "~4.0.3", "json-schema-ref-parser": "https://github.com/xaka/json-schema-ref-parser.git#v2.2.1", "jszip": "~2.0.0", @@ -25,10 +26,5 @@ }, "resolutions": { "angular": "~1.3.17" - }, - "overrides": { - "file-saver.js": { - "main": "dist/FileSaver.js" - } } } \ No newline at end of file From 70f30cb8ac8c4800d503519f6baab35c478fbcaa Mon Sep 17 00:00:00 2001 From: Lucas Pose Date: Wed, 27 Jul 2022 12:11:17 -0300 Subject: [PATCH 7/7] fix other dependency --- bower.json | 1 + 1 file changed, 1 insertion(+) diff --git a/bower.json b/bower.json index 874322d05..a7309ada7 100644 --- a/bower.json +++ b/bower.json @@ -14,6 +14,7 @@ "es5-shim": "~2.3.0", "file-saver.js": "https://github.com/eligrey/FileSaver.js.git#v2.0.4", "FileSaver": "https://github.com/eligrey/FileSaver.js.git#683f689326c231002164621dc8a6451df4e86e8a", + "vkbeautify": "https://github.com/vkiryukhin/vkBeautify.git#ecfc3b9e2b911ad8ebd49600c4089aca30619f29", "font-awesome": "~4.0.3", "json-schema-ref-parser": "https://github.com/xaka/json-schema-ref-parser.git#v2.2.1", "jszip": "~2.0.0",