From dab9ddbdca5ae579f30758fd56810de9a7294eaf Mon Sep 17 00:00:00 2001 From: Cilibiu Bogdan Date: Thu, 19 Nov 2020 20:06:54 +0200 Subject: [PATCH] [ACA-4026] Register plugins dynamically (#1803) * bump adf * remove $references entries * register plugin dynamically --- package-lock.json | 126 +++++++++--------- package.json | 8 +- .../src/lib/aos-extension.module.ts | 4 +- src/assets/app.extensions.json | 4 +- 4 files changed, 70 insertions(+), 72 deletions(-) diff --git a/package-lock.json b/package-lock.json index be1b577f8..bc97da190 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,33 +40,33 @@ } }, "@alfresco/adf-content-services": { - "version": "4.2.0-d36fd9d5f1435f1798c20820bd6a8cf981a20b6d", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.2.0-d36fd9d5f1435f1798c20820bd6a8cf981a20b6d.tgz", - "integrity": "sha512-tGWXUjCwQqIc+j+obrxUesBNRtwyPFo2fOJ5qf1+AjD0WDC6JtKMnsq0NdP+JOTqa5iaRy/DFIAUS8Cas2GPrw==", + "version": "4.2.0-6ca8f53bab727b80dfd6fe0d5645187cdcb6082e", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.2.0-6ca8f53bab727b80dfd6fe0d5645187cdcb6082e.tgz", + "integrity": "sha512-hVTTwkK9RxyPv6pJSzIkF9t3CdJ+VWdyPWuXHNEkdUqwtKSfP04+1RdFrAie1NVeKTw+jSMvywYrd526p8F6Xw==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-core": { - "version": "4.2.0-d36fd9d5f1435f1798c20820bd6a8cf981a20b6d", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.2.0-d36fd9d5f1435f1798c20820bd6a8cf981a20b6d.tgz", - "integrity": "sha512-IzIRGl2rqCPu6vgJ2r9SVb4fhw6QkVJ1ut+WEBMlaEtJO5j4vKT/4FLCbKWVzcwdnim2lhrZiGUB1pyFPWoZfA==", + "version": "4.2.0-6ca8f53bab727b80dfd6fe0d5645187cdcb6082e", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.2.0-6ca8f53bab727b80dfd6fe0d5645187cdcb6082e.tgz", + "integrity": "sha512-3dbHg4//0mWuxn15LKl0VrGVZiyeQUrf7asJzyPZejgdpqRkkbw9vMQ2yTke3wjv83/Pb4zzBRXGn/Hmn02qGg==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-extensions": { - "version": "4.2.0-d36fd9d5f1435f1798c20820bd6a8cf981a20b6d", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.2.0-d36fd9d5f1435f1798c20820bd6a8cf981a20b6d.tgz", - "integrity": "sha512-MHZl90h/jTQfGeSLM1d2CQTNny4AlatGbUpnlKVWZg8/+gBRxFIjlBRaQ0pwBq7AmV8YE4TROVkHkbrNypWu+Q==", + "version": "4.2.0-6ca8f53bab727b80dfd6fe0d5645187cdcb6082e", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.2.0-6ca8f53bab727b80dfd6fe0d5645187cdcb6082e.tgz", + "integrity": "sha512-aMk8Xq5xYXLTRxp33o6BAco34o51uqVqsrZSvphVbvlGbdL0GfMcG8e+OFRTjIb3opW7AyPkV66i1yfnU8pSig==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-testing": { - "version": "4.2.0-d36fd9d5f1435f1798c20820bd6a8cf981a20b6d", - "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.2.0-d36fd9d5f1435f1798c20820bd6a8cf981a20b6d.tgz", - "integrity": "sha512-7mEv6+Xl7nr/YTJmzF4gSV0Pe9q+NuP4Lc3Rru7P3qSo5yrggQZ/BgfkSoWwp9G9tVyzosNhYYbVO2fJ9syDDw==", + "version": "4.2.0-6ca8f53bab727b80dfd6fe0d5645187cdcb6082e", + "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.2.0-6ca8f53bab727b80dfd6fe0d5645187cdcb6082e.tgz", + "integrity": "sha512-DdElhTIV+q4VPaWNe9UWcTsJdcI9eJEiHNRq+9WcAQPfsU7r+sgAFK17AipOkMgt0XbqJR2CfGmPKX5E+e1/Hg==", "dev": true, "requires": { "tslib": "^2.0.0" @@ -2381,9 +2381,9 @@ "dev": true }, "@types/node": { - "version": "14.14.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz", - "integrity": "sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==", + "version": "14.14.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.8.tgz", + "integrity": "sha512-z/5Yd59dCKI5kbxauAJgw6dLPzW+TNOItNE00PkpzNwUIEwdj/Lsqwq94H5DdYBX7C13aRA0CY32BK76+neEUA==", "dev": true }, "@types/normalize-package-data": { @@ -2455,9 +2455,9 @@ } }, "@types/yargs": { - "version": "15.0.9", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.9.tgz", - "integrity": "sha512-HmU8SeIRhZCWcnRskCs36Q1Q00KBV6Cqh/ora8WN1+22dY07AZdn6Gel8QZ3t26XYPImtcL8WV/eqjhVmMEw4g==", + "version": "15.0.10", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.10.tgz", + "integrity": "sha512-z8PNtlhrj7eJNLmrAivM7rjBESG6JwC5xP3RVk12i/8HVP7Xnx/sEmERnRImyEuUaJfO942X0qMOYsoupaJbZQ==", "dev": true, "requires": { "@types/yargs-parser": "*" @@ -3931,9 +3931,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001157", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz", - "integrity": "sha512-gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA==", + "version": "1.0.30001158", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001158.tgz", + "integrity": "sha512-s5loVYY+yKpuVA3HyW8BarzrtJvwHReuzugQXlv1iR3LKSReoFXRm86mT6hT7PEF5RxW+XQZg+6nYjlywYzQ+g==", "dev": true }, "canonical-path": { @@ -5001,16 +5001,16 @@ "dev": true }, "cspell": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/cspell/-/cspell-4.1.5.tgz", - "integrity": "sha512-KIVZzQAMtSVsYGeFP5ljXPgbMor1jR49sVkSEHH2MdGFegTyMJZEVkgcwu7pTS0VRI+6O2k06/K3AKOJeK4WSg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/cspell/-/cspell-4.2.2.tgz", + "integrity": "sha512-NqObIP0ljFs/f//pA4D8rwqC9XHW2TY3CMNunp0nPQzVk/GanIqTEtMDZEZrVG1wnxHEndUIHlw05+rEYejkQg==", "dev": true, "requires": { "chalk": "^4.1.0", "commander": "^6.1.0", "comment-json": "^4.0.6", - "cspell-glob": "^0.1.21", - "cspell-lib": "^4.3.2", + "cspell-glob": "^0.1.25", + "cspell-lib": "^4.3.6", "fs-extra": "^9.0.1", "gensequence": "^3.1.1", "get-stdin": "^8.0.0", @@ -5354,18 +5354,18 @@ } }, "cspell-glob": { - "version": "0.1.22", - "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-0.1.22.tgz", - "integrity": "sha512-LNBmEBvtRMebESa3sTJ2wKk5vNIRKvmC7ClKJeCD8gNdc3Zar+57CoJg1WvqKoKLFW3HkQkc9BmP2Lay/NpqLw==", + "version": "0.1.25", + "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-0.1.25.tgz", + "integrity": "sha512-/XaSHrGBpMJa+duFz3GKOWfrijrfdHT7a/XGgIcq3cymCSpOH+DPho42sl0jLI/hjM+8yv2m8aEoxRT8yVSnlg==", "dev": true, "requires": { "micromatch": "^4.0.2" } }, "cspell-io": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-4.1.2.tgz", - "integrity": "sha512-FLLojKoCweQPYJBsze9KS9wNI8Cvvp84Zt/pwgNdkiqxPADZEsymIZ8U4xFdL3L+/k+LT2KhJZzxjeTI6/zsNA==", + "version": "4.1.6", + "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-4.1.6.tgz", + "integrity": "sha512-S8Fk1uBrZGt9vcztKQkMIi2qpGT1R0eqTZ+5v5++nZDkryKkix8iTkNldH7cxIvqTQU9Tr7afFI/0RXSEEn8Eg==", "dev": true, "requires": { "iconv-lite": "^0.6.2", @@ -5373,9 +5373,9 @@ } }, "cspell-lib": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-4.3.2.tgz", - "integrity": "sha512-d794ObE18mVblT6DSgvvaFaonkvNv4+HmBnR6IALZxd0AsS8AGxZ33t4o9mgcymiATvAzrZvG0u2zL0/onhNhw==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-4.3.6.tgz", + "integrity": "sha512-Bm7AEdbjy5rNqGdOulTZVV/P6eUweDivYIZss29T3j3dUFu99spG73zGmKVxTddB7RNdb4MsfLwtnZvWXr98IA==", "dev": true, "requires": { "comment-json": "^4.1.0", @@ -5413,9 +5413,9 @@ "cspell-dict-scala": "^1.0.17", "cspell-dict-software-terms": "^1.0.19", "cspell-dict-typescript": "^1.0.12", - "cspell-io": "^4.1.2", - "cspell-trie-lib": "^4.2.2", - "cspell-util-bundle": "^4.1.4", + "cspell-io": "^4.1.6", + "cspell-trie-lib": "^4.2.6", + "cspell-util-bundle": "^4.1.8", "fs-extra": "^9.0.1", "gensequence": "^3.1.1", "minimatch": "^3.0.4", @@ -5468,18 +5468,18 @@ } }, "cspell-trie-lib": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-4.2.2.tgz", - "integrity": "sha512-FKwubuKs7XhFIAZN8Twh4RUSKc1h2X+EHsaSu8Y4E9QIcz5vBKooejCC3HTCgTzARXbX4pw0HazehSDqjraE+g==", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-4.2.6.tgz", + "integrity": "sha512-glf6Yk1PxRxTFpQIkBk5G4ljpGUBzJORJe1yFHuiZ29mY5gHL0D7+i5rULa2dFU/5WJ24SFojHUXd1fLCBjUOQ==", "dev": true, "requires": { "gensequence": "^3.1.1" } }, "cspell-util-bundle": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/cspell-util-bundle/-/cspell-util-bundle-4.1.4.tgz", - "integrity": "sha512-97TZTl3lqrKYVu63mf9FdekbqH6CYHRka4nUbRN0mm9bOv4L68ZE2k/DwcRuqWz7Rrc190oKOWV7USVZutgAeQ==", + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/cspell-util-bundle/-/cspell-util-bundle-4.1.8.tgz", + "integrity": "sha512-Cm9fG7dsdveKEtWAN8TgljhW8OU7OQX4vX3ZFg6o9FQfo6rNoX8nwyxXRq60YjbKNBf1d6/ZSozsqS4vq2uLzQ==", "dev": true }, "css": { @@ -5741,28 +5741,28 @@ "dev": true }, "csso": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/csso/-/csso-4.1.0.tgz", - "integrity": "sha512-h+6w/W1WqXaJA4tb1dk7r5tVbOm97MsKxzwnvOR04UQ6GILroryjMWu3pmCCtL2mLaEStQ0fZgeGiy99mo7iyg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/csso/-/csso-4.1.1.tgz", + "integrity": "sha512-Rvq+e1e0TFB8E8X+8MQjHSY6vtol45s5gxtLI/018UsAn2IBMmwNEZRM/h+HVnAJRHjasLIKKUO3uvoMM28LvA==", "dev": true, "requires": { "css-tree": "^1.0.0" }, "dependencies": { "css-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.1.tgz", - "integrity": "sha512-WroX+2MvsYcRGP8QA0p+rxzOniT/zpAoQ/DTKDSJzh5T3IQKUkFHeIIfgIapm2uaP178GWY3Mime1qbk8GO/tA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.0.tgz", + "integrity": "sha512-SKwwAnwRPotiopzQBpK4o+W6Uu8PA759iWdJ1EXy3zkj+sSUcsdhnhvdv4dy5AtjcX0OGXxS7h73YAMXu8QXBw==", "dev": true, "requires": { - "mdn-data": "2.0.12", + "mdn-data": "2.0.14", "source-map": "^0.6.1" } }, "mdn-data": { - "version": "2.0.12", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.12.tgz", - "integrity": "sha512-ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", + "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", "dev": true }, "source-map": { @@ -6371,9 +6371,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.593", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.593.tgz", - "integrity": "sha512-GvO7G1ZxvffnMvPCr4A7+iQPVuvpyqMrx2VWSERAjG+pHK6tmO9XqYdBfMIq9corRyi4bNImSDEiDvIoDb8HrA==", + "version": "1.3.598", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.598.tgz", + "integrity": "sha512-G5Ztk23/ubLYVPxPXnB1uu105uzIPd4xB/D8ld8x1GaSC9+vU9NZL16nYZya8H77/7CCKKN7dArzJL3pBs8N7A==", "dev": true }, "elliptic": { @@ -11237,9 +11237,9 @@ } }, "node-releases": { - "version": "1.1.66", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.66.tgz", - "integrity": "sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==", + "version": "1.1.67", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz", + "integrity": "sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==", "dev": true }, "node-sass-tilde-importer": { @@ -11252,9 +11252,9 @@ } }, "node-stream-zip": { - "version": "1.11.7", - "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.11.7.tgz", - "integrity": "sha512-tpJYTP3wgNcgCH4dsXC9x+K7No2qNzDRwoTaW9LPm39sA5elxWdSKHcv6j5TIPmjyOcxx9LoEvSdR16mi1Rfdg==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.12.0.tgz", + "integrity": "sha512-HZ3XehqShTFj9gHauRJ3Bri9eiCTOII7/crtXzURtT14NdnOFs9Ia5E82W7z3izVBNx760tqwddxrBJVG52Y1Q==", "dev": true }, "nopt": { diff --git a/package.json b/package.json index 468dd045c..1790adf8a 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,9 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.2.0-d36fd9d5f1435f1798c20820bd6a8cf981a20b6d", - "@alfresco/adf-core": "4.2.0-d36fd9d5f1435f1798c20820bd6a8cf981a20b6d", - "@alfresco/adf-extensions": "4.2.0-d36fd9d5f1435f1798c20820bd6a8cf981a20b6d", + "@alfresco/adf-content-services": "4.2.0-6ca8f53bab727b80dfd6fe0d5645187cdcb6082e", + "@alfresco/adf-core": "4.2.0-6ca8f53bab727b80dfd6fe0d5645187cdcb6082e", + "@alfresco/adf-extensions": "4.2.0-6ca8f53bab727b80dfd6fe0d5645187cdcb6082e", "@alfresco/js-api": "4.2.0-f9c54eaf48fe91e8d4671269cb5d6b8d00445bc0", "@angular/animations": "10.0.4", "@angular/cdk": "^10.0.2", @@ -58,7 +58,7 @@ }, "devDependencies": { "@alfresco/adf-cli": "4.1.0", - "@alfresco/adf-testing": "4.2.0-d36fd9d5f1435f1798c20820bd6a8cf981a20b6d", + "@alfresco/adf-testing": "4.2.0-6ca8f53bab727b80dfd6fe0d5645187cdcb6082e", "@angular-custom-builders/lite-serve": "^0.2.2", "@angular-devkit/build-angular": "~0.1001.4", "@angular-devkit/build-ng-packagr": "~0.1001.3", diff --git a/projects/adf-office-services-ext/src/lib/aos-extension.module.ts b/projects/adf-office-services-ext/src/lib/aos-extension.module.ts index 1b2da35de..84fea9ac9 100644 --- a/projects/adf-office-services-ext/src/lib/aos-extension.module.ts +++ b/projects/adf-office-services-ext/src/lib/aos-extension.module.ts @@ -23,7 +23,7 @@ * along with Alfresco. If not, see . */ -import { ExtensionService } from '@alfresco/adf-extensions'; +import { ExtensionService, provideExtensionConfig } from '@alfresco/adf-extensions'; import { NgModule } from '@angular/core'; import { EffectsModule } from '@ngrx/effects'; @@ -35,7 +35,7 @@ import { TranslationService } from '@alfresco/adf-core'; @NgModule({ imports: [EffectsModule.forFeature([AosEffects])], - providers: [AosEditOnlineService] + providers: [AosEditOnlineService, provideExtensionConfig(['aos.plugin.json'])] }) export class AosExtensionModule { constructor(extensions: ExtensionService, translation: TranslationService) { diff --git a/src/assets/app.extensions.json b/src/assets/app.extensions.json index a7c0d3722..d309ef994 100644 --- a/src/assets/app.extensions.json +++ b/src/assets/app.extensions.json @@ -7,9 +7,7 @@ "$license": "LGPL-3.0", "$runtime": "1.7.0", "$description": "Core application extensions and features", - "$references": [ - "aos.plugin.json" - ], + "$references": [], "rules": [ {