Skip to content

Commit 7cbc70a

Browse files
jleveuglejleveugle
jleveugle
authored and
jleveugle
committed
refactor: bump all packages to @ovh-ux/manager-core@^5.0.0
BREAKING CHANGE: Until theses packages has a dependency to @ovh-ux/manager-core@^5.0.0, the host project needs to import @ovh-ux/manager-config Before: yarn add @ovh-ux/manager-core Now: yarn add @ovh-ux/manager-config yarn add @ovh-ux/manager-core
1 parent 928a6f4 commit 7cbc70a

File tree

15 files changed

+38
-41
lines changed

15 files changed

+38
-41
lines changed

‎packages/manager/apps/freefax/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"test:e2e": "lerna exec --scope @ovh-ux/manager-freefax-app -- node \\$LERNA_ROOT_PATH/scripts/webpack-cypress"
1414
},
1515
"dependencies": {
16-
"@ovh-ux/manager-core": "^4.0.0",
16+
"@ovh-ux/manager-config": "^0.1.0-alpha.0",
17+
"@ovh-ux/manager-core": "^4.0.0 || >= 5.0.0-alpha.0 <= 5.0.0",
1718
"@ovh-ux/manager-freefax": "^4.0.0",
1819
"@ovh-ux/manager-telecom-styles": "^2.0.2",
1920
"@ovh-ux/ng-ovh-api-wrappers": "^3.0.0",
@@ -45,4 +46,4 @@
4546
"ovh-manager-webfont": "^1.0.2",
4647
"webpack-merge": "^4.1.4"
4748
}
48-
}
49+
}

‎packages/manager/apps/layout-ovh/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"start:watch": "lerna exec --stream --parallel --scope='@ovh-ux/manager-layout-ovh' --include-filtered-dependencies -- yarn run dev:watch"
1414
},
1515
"dependencies": {
16-
"@ovh-ux/manager-core": "^4.0.1",
16+
"@ovh-ux/manager-config": "^0.1.0-alpha.0",
17+
"@ovh-ux/manager-core": "^4.0.0 || >= 5.0.0-alpha.0 <= 5.0.0",
1718
"@ovh-ux/manager-freefax": "^4.0.0",
1819
"@ovh-ux/manager-overthebox": "^3.0.0",
1920
"@ovh-ux/manager-sms": "^5.0.0",
@@ -83,4 +84,4 @@
8384
"@ovh-ux/manager-webpack-config": "^3.0.1",
8485
"webpack-merge": "^4.1.4"
8586
}
86-
}
87+
}

‎packages/manager/apps/layout-ovh/src/navbar/navbar-notification.service.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ export default class NavbarNotificationService {
99
$q,
1010
$translate,
1111
OvhApiNotificationAapi,
12-
TARGET,
12+
coreConfig,
1313
) {
1414
this.$interval = $interval;
1515
this.$q = $q;
1616
this.$translate = $translate;
1717
this.OvhApiNotificationAapi = OvhApiNotificationAapi;
18-
this.TARGET = TARGET;
18+
this.coreConfig = coreConfig;
1919

2020
this.NOTIFICATION_REFRESH_TIME = 60000;
2121
}
@@ -24,7 +24,7 @@ export default class NavbarNotificationService {
2424
return this.$translate.refresh()
2525
.then(() => this.OvhApiNotificationAapi.query({
2626
lang: this.$translate.preferredLanguage(),
27-
target: this.TARGET,
27+
target: this.coreConfig.getRegion(),
2828
}).$promise
2929
.catch((error) => {
3030
throw error;

‎packages/manager/apps/layout-ovh/src/navbar/navbar.service.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default class ManagerNavbarService {
1616
CORE_REDIRECT_URLS,
1717
SessionService,
1818
ssoAuthentication,
19-
TARGET,
19+
coreConfig,
2020
TranslateService,
2121
CORE_URLS,
2222
) {
@@ -31,7 +31,7 @@ export default class ManagerNavbarService {
3131

3232
this.sessionService = SessionService;
3333
this.ssoAuthentication = ssoAuthentication;
34-
this.TARGET = TARGET;
34+
this.coreConfig = coreConfig;
3535
this.translateService = TranslateService;
3636
this.URLS = CORE_URLS;
3737
}
@@ -86,7 +86,7 @@ export default class ManagerNavbarService {
8686
});
8787

8888
// Telephony (External)
89-
if (this.TARGET !== 'US') {
89+
if (this.coreConfig.getRegion() !== 'US') {
9090
assistanceMenu.push({
9191
title: this.$translate.instant('navbar_support_telephony_contact'),
9292
url: this.URLS.support_contact[locale] || this.URLS.support_contact.FR,
@@ -145,11 +145,11 @@ export default class ManagerNavbarService {
145145
title: this.$translate.instant('navbar_account_security'),
146146
url: this.REDIRECT_URLS.userSecurity,
147147
},
148-
(this.TARGET === 'EU' || this.TARGET === 'CA') && {
148+
(this.coreConfig.getRegion() === 'EU' || this.coreConfig.getRegion() === 'CA') && {
149149
title: this.$translate.instant('navbar_account_emails'),
150150
url: this.REDIRECT_URLS.userEmails,
151151
},
152-
(this.TARGET === 'EU') && {
152+
(this.coreConfig.getRegion() === 'EU') && {
153153
title: this.$translate.instant('navbar_account_subscriptions'),
154154
url: this.REDIRECT_URLS.userSubscriptions,
155155
}, {
@@ -176,7 +176,7 @@ export default class ManagerNavbarService {
176176
},
177177

178178
// Services
179-
(this.TARGET === 'EU' || this.TARGET === 'CA') && (!currentUser.isEnterprise ? {
179+
(this.coreConfig.getRegion() === 'EU' || this.coreConfig.getRegion() === 'CA') && (!currentUser.isEnterprise ? {
180180
name: 'user.services',
181181
title: this.$translate.instant('navbar_renew'),
182182
url: this.REDIRECT_URLS.services,
@@ -201,18 +201,18 @@ export default class ManagerNavbarService {
201201
title: this.$translate.instant('navbar_means_mean'),
202202
url: this.REDIRECT_URLS.paymentMeans,
203203
},
204-
(this.TARGET === 'EU' || this.TARGET === 'CA') && {
204+
(this.coreConfig.getRegion() === 'EU' || this.coreConfig.getRegion() === 'CA') && {
205205
title: this.$translate.instant('navbar_means_ovhaccount'),
206206
url: this.REDIRECT_URLS.ovhAccount,
207207
},
208-
(this.TARGET === 'EU' || this.TARGET === 'CA') && {
208+
(this.coreConfig.getRegion() === 'EU' || this.coreConfig.getRegion() === 'CA') && {
209209
title: this.$translate.instant('navbar_means_vouchers'),
210210
url: this.REDIRECT_URLS.billingVouchers,
211211
}, {
212212
title: this.$translate.instant('navbar_means_refunds'),
213213
url: this.REDIRECT_URLS.billingRefunds,
214214
},
215-
(this.TARGET === 'EU') && {
215+
(this.coreConfig.getRegion() === 'EU') && {
216216
title: this.$translate.instant('navbar_means_fidelity'),
217217
url: this.REDIRECT_URLS.billingFidelity,
218218
}, {
@@ -222,13 +222,13 @@ export default class ManagerNavbarService {
222222
},
223223

224224
// Orders
225-
(!currentUser.isEnterprise && this.TARGET === 'EU' && currentUser.ovhSubsidiary === 'FR') && {
225+
(!currentUser.isEnterprise && this.coreConfig.getRegion() === 'EU' && currentUser.ovhSubsidiary === 'FR') && {
226226
title: this.$translate.instant('navbar_orders'),
227227
url: this.REDIRECT_URLS.orders,
228228
},
229229

230230
// Contacts
231-
(this.TARGET === 'EU') && {
231+
(this.coreConfig.getRegion() === 'EU') && {
232232
title: this.$translate.instant('navbar_contacts'),
233233
url: this.REDIRECT_URLS.contacts,
234234
},
@@ -277,7 +277,7 @@ export default class ManagerNavbarService {
277277
}
278278

279279
getManagersNames() {
280-
switch (this.TARGET) {
280+
switch (this.coreConfig.getRegion()) {
281281
case 'EU': {
282282
if (this.locale === 'FR') {
283283
return ['portal', 'gamma', 'partners'];

‎packages/manager/apps/overthebox/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"test:e2e": "lerna exec --scope @ovh-ux/manager-overthebox-app -- node \\$LERNA_ROOT_PATH/scripts/webpack-cypress"
1414
},
1515
"dependencies": {
16-
"@ovh-ux/manager-core": "^4.0.0",
16+
"@ovh-ux/manager-config": "^0.1.0-alpha.0",
17+
"@ovh-ux/manager-core": "^4.0.0 || >= 5.0.0-alpha.0 <= 5.0.0",
1718
"@ovh-ux/manager-overthebox": "^3.0.0",
1819
"@ovh-ux/manager-telecom-styles": "^2.0.2",
1920
"@ovh-ux/ng-ovh-api-wrappers": "^3.0.0",
@@ -38,4 +39,4 @@
3839
"ovh-manager-webfont": "^1.0.2",
3940
"webpack-merge": "^4.1.4"
4041
}
41-
}
42+
}

‎packages/manager/apps/sms/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"start:watch": "lerna exec --stream --parallel --scope='@ovh-ux/manager-sms-app' --include-filtered-dependencies -- yarn run dev:watch"
1212
},
1313
"dependencies": {
14-
"@ovh-ux/manager-core": "^4.0.1",
14+
"@ovh-ux/manager-config": "^0.1.0-alpha.0",
15+
"@ovh-ux/manager-core": "^4.0.0 || >= 5.0.0-alpha.0 <= 5.0.0",
1516
"@ovh-ux/manager-sms": "^5.0.0",
1617
"@ovh-ux/manager-telecom-styles": "^2.0.2",
1718
"@ovh-ux/ng-at-internet": "^4.0.0",
@@ -37,4 +38,4 @@
3738
"ovh-manager-webfont": "^1.0.2",
3839
"webpack-merge": "^4.1.4"
3940
}
40-
}
41+
}

‎packages/manager/apps/telecom-dashboard/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"start:watch": "lerna exec --stream --parallel --scope='@ovh-ux/manager-telecom-dashboard-app' --include-filtered-dependencies -- yarn run dev:watch"
1212
},
1313
"dependencies": {
14-
"@ovh-ux/manager-core": "^4.0.1",
14+
"@ovh-ux/manager-config": "^0.1.0-alpha.0",
15+
"@ovh-ux/manager-core": "^4.0.0 || >= 5.0.0-alpha.0 <= 5.0.0",
1516
"@ovh-ux/manager-telecom-dashboard": "^3.0.0",
1617
"@ovh-ux/manager-telecom-styles": "^2.0.2",
1718
"@ovh-ux/ng-at-internet": "^4.0.0",
@@ -31,4 +32,4 @@
3132
"@ovh-ux/manager-webpack-config": "^3.0.1",
3233
"webpack-merge": "^4.1.4"
3334
}
34-
}
35+
}

‎packages/manager/apps/telecom-task/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"test:e2e": "lerna exec --scope @ovh-ux/manager-telecom-task-app -- node \\$LERNA_ROOT_PATH/scripts/webpack-cypress"
1414
},
1515
"dependencies": {
16-
"@ovh-ux/manager-core": "^4.0.0",
16+
"@ovh-ux/manager-config": "^0.1.0-alpha.0",
17+
"@ovh-ux/manager-core": "^4.0.0 || >= 5.0.0-alpha.0 <= 5.0.0",
1718
"@ovh-ux/manager-telecom-styles": "^2.0.2",
1819
"@ovh-ux/manager-telecom-task": "^3.0.0",
1920
"@ovh-ux/ng-ovh-telecom-universe-components": "^3.0.0",
@@ -35,4 +36,4 @@
3536
"eslint-plugin-cypress": "^2.1.3",
3637
"webpack-merge": "^4.1.4"
3738
}
38-
}
39+
}

‎packages/manager/modules/freefax/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"@ovh-ux/component-rollup-config": "5.0.0-beta.5"
3131
},
3232
"peerDependencies": {
33-
"@ovh-ux/manager-core": "^4.0.0",
33+
"@ovh-ux/manager-core": "^4.0.0 || >= 5.0.0-alpha.0 <= 5.0.0",
3434
"@ovh-ux/manager-telecom-styles": "^2.0.2",
3535
"@ovh-ux/ng-ovh-contracts": "^3.0.0-beta.3",
3636
"@ovh-ux/ng-ovh-telecom-universe-components": "^3.0.0",

‎packages/manager/modules/overthebox/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"@ovh-ux/component-rollup-config": "5.0.0-beta.5"
3131
},
3232
"peerDependencies": {
33-
"@ovh-ux/manager-core": "^4.0.0",
33+
"@ovh-ux/manager-core": "^4.0.0 || >= 5.0.0-alpha.0 <= 5.0.0",
3434
"@ovh-ux/manager-telecom-styles": "^2.0.2",
3535
"@ovh-ux/ng-ovh-contracts": "^3.0.0-beta.3",
3636
"@ovh-ux/ng-ovh-telecom-universe-components": "^3.0.0",

0 commit comments

Comments
 (0)