From 5690a648424a7dc29a7ae2d25b9a818f929cc28f Mon Sep 17 00:00:00 2001 From: Maurizio Vitale Date: Wed, 9 Jan 2019 18:06:27 +0000 Subject: [PATCH] Remove the reference of the old js-api and use the one under the @alfresco (#4128) --- lib/content-services/package.json | 2 +- lib/core/package.json | 2 +- lib/extensions/package.json | 2 +- lib/insights/package.json | 2 +- lib/process-services-cloud/package.json | 2 +- lib/process-services/package.json | 2 +- lib/tsconfig.json | 6 +----- scripts/update-version.sh | 16 ++++++++-------- 8 files changed, 15 insertions(+), 19 deletions(-) diff --git a/lib/content-services/package.json b/lib/content-services/package.json index 091b4dae73..617a38d241 100644 --- a/lib/content-services/package.json +++ b/lib/content-services/package.json @@ -25,7 +25,7 @@ "@angular/platform-browser": ">=7.0.3", "@angular/platform-browser-dynamic": ">=7.0.3", "@angular/router": ">=7.0.3", - "alfresco-js-api": ">=2.7.0-beta5", + "@alfresco/js-api": "3.0.0-delta18", "rxjs": ">=6.2.2", "@alfresco/adf-core": ">=2.7.0-beta5", "@ngx-translate/core": ">=11.0.0", diff --git a/lib/core/package.json b/lib/core/package.json index 057a332753..07b1201fc7 100644 --- a/lib/core/package.json +++ b/lib/core/package.json @@ -27,7 +27,7 @@ "@angular/router": ">=7.0.3", "@mat-datetimepicker/core": ">=2.0.1", "@mat-datetimepicker/moment": ">=2.0.1", - "alfresco-js-api": ">=2.7.0-beta5", + "@alfresco/js-api": "3.0.0-delta18", "rxjs": ">=6.2.2", "@ngx-translate/core": ">=11.0.0", "core-js": ">=2.5.4", diff --git a/lib/extensions/package.json b/lib/extensions/package.json index e76e793282..2ed7da8340 100644 --- a/lib/extensions/package.json +++ b/lib/extensions/package.json @@ -16,6 +16,6 @@ "@angular/common": "^6.0.0", "@angular/core": "^6.0.0", "@angular/http": "^6.1.4", - "alfresco-js-api": ">=2.7.0-beta5" + "@alfresco/js-api": "3.0.0-delta18" } } diff --git a/lib/insights/package.json b/lib/insights/package.json index be228963cf..aca24cf69f 100644 --- a/lib/insights/package.json +++ b/lib/insights/package.json @@ -25,7 +25,7 @@ "@angular/platform-browser": ">=7.0.3", "@angular/platform-browser-dynamic": ">=7.0.3", "@angular/router": ">=7.0.3", - "alfresco-js-api": ">=2.7.0-beta5", + "@alfresco/js-api": "3.0.0-delta18", "rxjs": ">=6.2.2", "@alfresco/adf-core": ">=2.7.0-beta5", "@alfresco/adf-content-services": ">=2.7.0-beta5", diff --git a/lib/process-services-cloud/package.json b/lib/process-services-cloud/package.json index f88cea6eab..84f13d82a2 100644 --- a/lib/process-services-cloud/package.json +++ b/lib/process-services-cloud/package.json @@ -14,6 +14,6 @@ "peerDependencies": { "@angular/common": "^6.0.0-rc.0 || ^6.0.0", "@angular/core": "^6.0.0-rc.0 || ^6.0.0", - "alfresco-js-api": ">=2.7.0-beta5" + "@alfresco/js-api": "3.0.0-delta18" } } diff --git a/lib/process-services/package.json b/lib/process-services/package.json index 66afb548e4..3f61370ddd 100644 --- a/lib/process-services/package.json +++ b/lib/process-services/package.json @@ -25,7 +25,7 @@ "@angular/platform-browser": ">=7.0.3", "@angular/platform-browser-dynamic": ">=7.0.3", "@angular/router": ">=7.0.3", - "alfresco-js-api": ">=2.7.0-beta5", + "@alfresco/js-api": "3.0.0-delta18", "rxjs": ">=6.2.2", "@alfresco/adf-core": ">=2.7.0-beta5", "@alfresco/adf-content-services": ">=2.7.0-beta5", diff --git a/lib/tsconfig.json b/lib/tsconfig.json index c44e063da3..29ba508103 100644 --- a/lib/tsconfig.json +++ b/lib/tsconfig.json @@ -26,11 +26,7 @@ "@alfresco/adf-content-services": ["./content-services/"], "@alfresco/adf-extensions": ["./extensions/"], "@alfresco/adf-core": ["./core/"], - "@alfresco/adf-insights": ["./analytics"], - "@alfresco/js-api": ["../node_modules/alfresco-js-api/"], - "@angular/*": ["../node_modules/@angular/*"], - "@mat-datetimepicker/*": ["../node_modules/@mat-datetimepicker/*"], - "rxjs/*": ["../node_modules/rxjs/*"] + "@alfresco/adf-insights": ["./analytics"] }, "lib": [ "es2016", diff --git a/scripts/update-version.sh b/scripts/update-version.sh index 0100ae401d..2b1c259fb3 100755 --- a/scripts/update-version.sh +++ b/scripts/update-version.sh @@ -51,7 +51,7 @@ last_alpha_mode() { echo "====== version lib ${VERSION} =====" DIFFERENT_JS_API=true - VERSION_JS_API=$(npm view alfresco-js-api@alpha version) + VERSION_JS_API=$(npm view @alfresco/js-api@alpha version) echo "====== version js-api ${DIFFERENT_JS_API} =====" } @@ -63,7 +63,7 @@ next_alpha_mode() { echo "====== version lib ${VERSION} =====" DIFFERENT_JS_API=true - VERSION_JS_API=$(npm view alfresco-js-api@alpha version) + VERSION_JS_API=$(npm view @alfresco/js-api@alpha version) echo "====== version js-api ${DIFFERENT_JS_API} =====" } @@ -75,7 +75,7 @@ next_beta_mode() { echo "====== version lib ${VERSION} =====" DIFFERENT_JS_API=true - VERSION_JS_API=$(npm view alfresco-js-api@beta version) + VERSION_JS_API=$(npm view @alfresco/js-api@beta version) echo "====== version js-api ${DIFFERENT_JS_API} =====" } @@ -87,7 +87,7 @@ last_beta_mode() { echo "====== version lib ${VERSION} =====" DIFFERENT_JS_API=true - VERSION_JS_API=$(npm view alfresco-js-api@beta version) + VERSION_JS_API=$(npm view @alfresco/js-api@beta version) echo "====== version js-api ${DIFFERENT_JS_API} =====" } @@ -152,9 +152,9 @@ update_total_build_dependency_version(){ } update_total_build_dependency_js_version(){ - echo "====== UPDATE DEPENDENCY VERSION alfresco-js-api total build to ~${1} in ${DESTDIR}======" + echo "====== UPDATE DEPENDENCY VERSION @alfresco/js-api total build to ~${1} in ${DESTDIR}======" DESTDIR="$DIR/../" - PACKAGETOCHANGE="alfresco-js-api" + PACKAGETOCHANGE="@alfresco/js-api" sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \".*\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g" ${DESTDIR}/package.json sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"~.*\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g" ${DESTDIR}/package.json @@ -168,10 +168,10 @@ update_total_build_dependency_js_version(){ } update_component_js_version(){ - echo "====== UPDATE DEPENDENCY VERSION of alfresco-js-api in ${1} to ${2} ======" + echo "====== UPDATE DEPENDENCY VERSION of @alfresco/js-api in ${1} to ${2} ======" DESTDIR="$DIR/../lib/${1}" - PACKAGETOCHANGE="alfresco-js-api" + PACKAGETOCHANGE="@alfresco/js-api" sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \".*\"/\"${PACKAGETOCHANGE}\": \"${2}\"/g" ${DESTDIR}/package.json sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"~.*\"/\"${PACKAGETOCHANGE}\": \"${2}\"/g" ${DESTDIR}/package.json