From 1c86b4e4a4f0e843194f20ba979e826f7699e371 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 11 Sep 2018 22:47:14 +0100 Subject: [PATCH] [ACA-1803] upgrade to ADF 2.6.0 alpha (#624) --- angular.json | 10 ++++------ package-lock.json | 26 +++++++++++++------------- package.json | 8 ++++---- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/angular.json b/angular.json index efbbedfcf..845fb2db8 100644 --- a/angular.json +++ b/angular.json @@ -68,10 +68,9 @@ "src/styles.scss" ], "scripts": [ - "node_modules/pdfjs-dist/build/pdf.js", - "node_modules/pdfjs-dist/lib/shared/compatibility.js", - "node_modules/pdfjs-dist/web/pdf_viewer.js", - "node_modules/moment/min/moment.min.js" + "node_modules/pdfjs-dist/build/pdf.js", + "node_modules/pdfjs-dist/web/pdf_viewer.js", + "node_modules/moment/min/moment.min.js" ] }, "configurations": { @@ -129,7 +128,6 @@ "tsConfig": "src/tsconfig.spec.json", "scripts": [ "node_modules/pdfjs-dist/build/pdf.js", - "node_modules/pdfjs-dist/lib/shared/compatibility.js", "node_modules/pdfjs-dist/web/pdf_viewer.js", "node_modules/moment/min/moment.min.js" ], @@ -159,7 +157,7 @@ "output": "/assets" }, { - "glob": "pdf.worker.js", + "glob": "pdf.worker.min.js", "input": "node_modules/pdfjs-dist/build", "output": "/" } diff --git a/package-lock.json b/package-lock.json index b6c181d70..7fa447ee0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,17 +5,17 @@ "requires": true, "dependencies": { "@alfresco/adf-content-services": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.5.0.tgz", - "integrity": "sha512-c2flI+A99YDP7BZ7lIWMC6JFqsWp5RC81BpZBKXBRw6R8YsJwbBwi9iZu+HZHQe6927THBMxDQX1uXT21ct7FA==", + "version": "2.6.0-d037a16d3c4215522a5f786e18ea0c8f018ecb25", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.6.0-d037a16d3c4215522a5f786e18ea0c8f018ecb25.tgz", + "integrity": "sha512-4f0ANwvwlciNK4MPe2wNQ012/vE9XPa3uA63Cx1VvaIuqJPttJpV/hDSIt/rAA+X//SSqGOjlaqIw2NU4btA9g==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-core": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.5.0.tgz", - "integrity": "sha512-ifjjT1H+dOiiFumDs8tY427HQ87VcL5wErcEkPb+hvW3DSf7czRohFyzRwCADNBEYeY4fqt/bIu35y+K2G738g==", + "version": "2.6.0-d037a16d3c4215522a5f786e18ea0c8f018ecb25", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.6.0-d037a16d3c4215522a5f786e18ea0c8f018ecb25.tgz", + "integrity": "sha512-hPQVtmIiQXkwuJQz8HfsnZkG3frC/NU5xUXN6LMXMjJcu3yNDkuNunFaxLU4d2Z5Zb8UDAWUwgfsIeSBpD6aJA==", "requires": { "tslib": "^1.9.0" } @@ -2856,9 +2856,9 @@ "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=" }, "alfresco-js-api": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.5.0.tgz", - "integrity": "sha512-0DwSpofMsyLHs3kyPwl+2JvIOUmTpPeJkBF5cIXO/T6+hst9ZYKQRQLxcoCnuk6Ng43MN14NHawtKJH6jE2wyg==", + "version": "2.6.0-c87428564306f710159976b0d740a07a94326cf1", + "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.6.0-c87428564306f710159976b0d740a07a94326cf1.tgz", + "integrity": "sha512-OPt75wllx+vjI0RgwbVdvUa4gs+UthJUS4iVaS8PhyXhXNxEHMuv2bKGH48cSolQbNH7kaurxqi80yl8b9kw3A==", "requires": { "event-emitter": "0.3.4", "superagent": "3.8.2" @@ -11276,12 +11276,12 @@ } }, "pdfjs-dist": { - "version": "2.0.303", - "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.0.303.tgz", - "integrity": "sha1-jABTDyQihmA7/L/dLukXwYK51EE=", + "version": "2.0.489", + "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.0.489.tgz", + "integrity": "sha1-Y+VLKSqGeQpFRpfrRNQ0e4+/rSc=", "requires": { "node-ensure": "^0.0.0", - "worker-loader": "^1.1.0" + "worker-loader": "^1.1.1" } }, "performance-now": { diff --git a/package.json b/package.json index cae435f7a..8ea7562ed 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,8 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "2.5.0", - "@alfresco/adf-core": "2.5.0", + "@alfresco/adf-content-services": "2.6.0-d037a16d3c4215522a5f786e18ea0c8f018ecb25", + "@alfresco/adf-core": "2.6.0-d037a16d3c4215522a5f786e18ea0c8f018ecb25", "@angular/animations": "6.1.7", "@angular/cdk": "^6.4.7", "@angular/common": "6.1.7", @@ -50,14 +50,14 @@ "@ngrx/store-devtools": "^6.1.0", "@ngstack/code-editor": "^0.4.3", "@ngx-translate/core": "^10.0.2", - "alfresco-js-api": "2.5.0", + "alfresco-js-api": "2.6.0-c87428564306f710159976b0d740a07a94326cf1", "core-js": "^2.5.7", "hammerjs": "2.0.8", "minimatch-browser": "^1.0.0", "moment": "^2.22.2", "moment-es6": "1.0.0", "monaco-editor": "^0.14.2", - "pdfjs-dist": "2.0.303", + "pdfjs-dist": "^2.0.489", "rxjs": "^6.3.2", "showdown": "^1.8.6", "web-animations-js": "2.3.1",