diff --git a/angular.json b/angular.json index ed6e607c7..5ef705724 100644 --- a/angular.json +++ b/angular.json @@ -133,6 +133,7 @@ "src/styles.scss", "src/assets/scss/grid.scss" ], + "scripts": ["src/assets/local-dev-environment.js"], "fileReplacements": [ { "replace": "src/environments/environment.ts", diff --git a/scripts/postbuild.ts b/scripts/postbuild.ts index 97fefc674..77eb50520 100644 --- a/scripts/postbuild.ts +++ b/scripts/postbuild.ts @@ -8,7 +8,6 @@ import { import { getOptionsObjet, save } from './utils' import { renameSync, readFileSync } from 'fs' import { createShareAssetsFolder } from './moveToShareFolder.postbuild' -import { replaceEnvPlaceholder } from './runtime-environment-setter.postbuild' const glob = require('glob') // Run updates on index.html files across languages @@ -17,7 +16,6 @@ glob .forEach((file) => { const options = getOptionsObjet(file) let data = readFileSync(file, 'utf8') - data = replaceEnvPlaceholder(data) // data = uniqueLength(data, options) DISABLED unique leght for now, as migth not be required anymore data = buildInfo(data, options) // data = newRelic(data, options) TEMPORALLY DISABLE NEW RELIC diff --git a/scripts/runtime-environment-setter.dev-runtime.ts b/scripts/runtime-environment-setter.dev-runtime.ts index 57a0d78b0..f95cb7316 100644 --- a/scripts/runtime-environment-setter.dev-runtime.ts +++ b/scripts/runtime-environment-setter.dev-runtime.ts @@ -5,10 +5,9 @@ import { runtimeEnvironmentScript } from './utils' function main() { // Create the script content const scriptContent = `//DO NOT MODIFY THIS environment file directly, to updat this file. -//To update environments please update the files under "/Users/l.mendoza/code/orcid-angular/src/environments" +//To update environments please update the files under "/src/environments" ${runtimeEnvironmentScript()}` - // Write the file. For example, dist/local-dev-environment.js const outputPath = path.resolve( __dirname, '../src/assets/local-dev-environment.js' diff --git a/scripts/runtime-environment-setter.postbuild.ts b/scripts/runtime-environment-setter.postbuild.ts deleted file mode 100644 index 4934cb588..000000000 --- a/scripts/runtime-environment-setter.postbuild.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { runtimeEnvironmentScript } from './utils' - -/** - * Receives an HTML string, replaces the [ENVIRONMENT_VARAIBLES_PLACEHOLDER] - * with a ` - - // 3. Replace the placeholder in the HTML - const placeholderBlockRegex = - /([\s\S]*?)/ - - const updatedHtml = htmlContent.replace(placeholderBlockRegex, scriptTag) - - // 4. Return the updated HTML - return updatedHtml -} diff --git a/src/app/cdk/platform-info/browserlist.regexp.ts b/src/app/cdk/platform-info/browserlist.regexp.ts index 545a90290..bf8c4aa5c 100644 --- a/src/app/cdk/platform-info/browserlist.regexp.ts +++ b/src/app/cdk/platform-info/browserlist.regexp.ts @@ -1,3 +1,2 @@ // 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+|17[_.]0|17[_.]([1-9]|\d{2,})|(1[8-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+|17\.0|17\.([1-9]|\d{2,})|(1[8-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+|17[_.]0|17[_.]([1-9]|\d{2,})|(1[8-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+|17\.0|17\.([1-9]|\d{2,})|(1[8-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/index.html b/src/index.html index ae15a26f4..d1bf6bcb1 100644 --- a/src/index.html +++ b/src/index.html @@ -11,10 +11,6 @@ - - - -