From e5a33817162688762baf29c16665a9199aa8dc52 Mon Sep 17 00:00:00 2001 From: leomendoza123 Date: Tue, 24 Oct 2023 19:25:38 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A4=96=20GITHUB=20ACTIONS=20format=5F?= =?UTF-8?q?prettier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/cdk/platform-info/browserlist.regexp.ts | 3 ++- src/environments/environment.int.ts | 2 +- src/environments/environment.local-with-proxy.ts | 2 +- src/environments/environment.local.ts | 2 +- src/environments/environment.production.ts | 4 +--- src/environments/environment.qa.ts | 2 +- src/environments/environment.sandbox.ts | 2 +- src/environments/subdomain.adapter.ts | 4 ++-- 8 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/app/cdk/platform-info/browserlist.regexp.ts b/src/app/cdk/platform-info/browserlist.regexp.ts index 954be17405..dd011b22dc 100644 --- a/src/app/cdk/platform-info/browserlist.regexp.ts +++ b/src/app/cdk/platform-info/browserlist.regexp.ts @@ -1,2 +1,3 @@ // tslint:disable-next-line: max-line-length -export const BROWSERLIST_REGEXP = /((CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(13[_.]4|13[_.]([5-9]|\d{2,})|13[_.]7|13[_.]([8-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})[_.]\d+|14[_.]0|14[_.]([1-9]|\d{2,})|14[_.]4|14[_.]([5-9]|\d{2,})|14[_.]8|14[_.](9|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})[_.]\d+|15[_.]0|15[_.]([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})[_.]\d+|16[_.]0|16[_.]([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})[_.]\d+)(?:[_.]\d+)?)|((?:Chrome).*OPR\/(74|(7[5-9]|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Edge\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))(?:\.\d+)?)|((Chromium|Chrome)\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))\.\d+(?:\.\d+)?)|(Version\/(13\.1|13\.([2-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})\.\d+|14\.0|14\.([1-9]|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})\.\d+|15\.0|15\.([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})\.\d+|16\.0|16\.([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})\.\d+)(?:\.\d+)? Safari\/)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+(pre|[ab]\d+[a-z]*)?)/ +export const BROWSERLIST_REGEXP = + /((CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(13[_.]4|13[_.]([5-9]|\d{2,})|13[_.]7|13[_.]([8-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})[_.]\d+|14[_.]0|14[_.]([1-9]|\d{2,})|14[_.]4|14[_.]([5-9]|\d{2,})|14[_.]8|14[_.](9|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})[_.]\d+|15[_.]0|15[_.]([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})[_.]\d+|16[_.]0|16[_.]([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})[_.]\d+)(?:[_.]\d+)?)|((?:Chrome).*OPR\/(74|(7[5-9]|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Edge\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))(?:\.\d+)?)|((Chromium|Chrome)\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))\.\d+(?:\.\d+)?)|(Version\/(13\.1|13\.([2-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})\.\d+|14\.0|14\.([1-9]|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})\.\d+|15\.0|15\.([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})\.\d+|16\.0|16\.([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})\.\d+)(?:\.\d+)? Safari\/)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+(pre|[ab]\d+[a-z]*)?)/ diff --git a/src/environments/environment.int.ts b/src/environments/environment.int.ts index 4e542c6135..49d2e65006 100644 --- a/src/environments/environment.int.ts +++ b/src/environments/environment.int.ts @@ -1,4 +1,4 @@ -import { getSubDomain } from "./subdomain.adapter"; +import { getSubDomain } from './subdomain.adapter' export const environment = { production: true, diff --git a/src/environments/environment.local-with-proxy.ts b/src/environments/environment.local-with-proxy.ts index b5dead85ca..ec201e1c78 100644 --- a/src/environments/environment.local-with-proxy.ts +++ b/src/environments/environment.local-with-proxy.ts @@ -1,4 +1,4 @@ -import { getSubDomain } from "./subdomain.adapter"; +import { getSubDomain } from './subdomain.adapter' export const environment = { production: false, diff --git a/src/environments/environment.local.ts b/src/environments/environment.local.ts index c3cf15c096..d109184029 100644 --- a/src/environments/environment.local.ts +++ b/src/environments/environment.local.ts @@ -1,4 +1,4 @@ -import { getSubDomain } from "./subdomain.adapter"; +import { getSubDomain } from './subdomain.adapter' export const environment = { production: false, diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts index 3b53af8963..af6ac537bf 100644 --- a/src/environments/environment.production.ts +++ b/src/environments/environment.production.ts @@ -1,4 +1,4 @@ -import { getSubDomain } from "./subdomain.adapter"; +import { getSubDomain } from './subdomain.adapter' export const environment = { production: true, @@ -36,5 +36,3 @@ export const environment = { }, proxyMode: false, } - - diff --git a/src/environments/environment.qa.ts b/src/environments/environment.qa.ts index ec88f0e58c..46deea00ec 100644 --- a/src/environments/environment.qa.ts +++ b/src/environments/environment.qa.ts @@ -1,4 +1,4 @@ -import { getSubDomain } from "./subdomain.adapter"; +import { getSubDomain } from './subdomain.adapter' export const environment = { production: true, diff --git a/src/environments/environment.sandbox.ts b/src/environments/environment.sandbox.ts index 459a254f6e..c285a176ec 100644 --- a/src/environments/environment.sandbox.ts +++ b/src/environments/environment.sandbox.ts @@ -1,4 +1,4 @@ -import { getSubDomain } from "./subdomain.adapter"; +import { getSubDomain } from './subdomain.adapter' export const environment = { production: true, diff --git a/src/environments/subdomain.adapter.ts b/src/environments/subdomain.adapter.ts index 6dac065eee..c0d3e60aee 100644 --- a/src/environments/subdomain.adapter.ts +++ b/src/environments/subdomain.adapter.ts @@ -1,4 +1,4 @@ export function getSubDomain() { - const subdomain = window.location.hostname.split('.').slice(0, -2).join('.'); - return subdomain? subdomain+'.':'' + const subdomain = window.location.hostname.split('.').slice(0, -2).join('.') + return subdomain ? subdomain + '.' : '' } From 14870178ca43fb0fdf6aa44453be1ab516f07558 Mon Sep 17 00:00:00 2001 From: github actions Date: Tue, 24 Oct 2023 19:42:19 +0000 Subject: [PATCH 2/2] v2.44.0 changelog update --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce5b929c4a..273ed2eff8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## v2.44.0 - 2023-10-24 + +[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.43.5...v2.44.0) + +- [#2083](https://github.com/ORCID/orcid-angular/pull/2083): feature/dynamic-sub-domains + ## v2.43.5 - 2023-10-20 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.43.4...v2.43.5)