diff --git a/.browserslistrc b/.browserslistrc index 5a9b70c..e3a3317 100644 --- a/.browserslistrc +++ b/.browserslistrc @@ -1,5 +1,4 @@ # Supported browsers -> 2% +> 0.2% last 2 versions -IE 11 not dead diff --git a/.github/actions/compile-assets/action.yml b/.github/actions/compile-assets/action.yml index 0d10dd9..b5c7873 100644 --- a/.github/actions/compile-assets/action.yml +++ b/.github/actions/compile-assets/action.yml @@ -25,7 +25,6 @@ runs: path: | public/assets app/assets/builds - app/javascript/generated - name: Precompile assets env: @@ -49,4 +48,3 @@ runs: path: | public/assets app/assets/builds - app/javascript/generated diff --git a/.gitignore b/.gitignore index 87e4612..3bf3a87 100644 --- a/.gitignore +++ b/.gitignore @@ -61,7 +61,7 @@ doc/compliance/oscal/.trestle/cache doc/compliance/oscal/ssp-render/continuous_monitoring_ssp.* # Generated by i18n-js -/app/javascript/generated +/app/javascript/i18n/translations.json # Terraform .terraform.lock.hcl diff --git a/app/javascript/application.js b/app/javascript/application.js index 04d1e2c..34d8534 100644 --- a/app/javascript/application.js +++ b/app/javascript/application.js @@ -2,6 +2,6 @@ import "@uswds/uswds" -import { i18n } from './utils/i18n'; +import { i18n } from './i18n'; console.log(i18n.t('shared.banner.official_site')); diff --git a/app/javascript/utils/i18n.js b/app/javascript/i18n/index.js similarity index 79% rename from app/javascript/utils/i18n.js rename to app/javascript/i18n/index.js index 382d51f..7134b26 100644 --- a/app/javascript/utils/i18n.js +++ b/app/javascript/i18n/index.js @@ -1,5 +1,5 @@ import { I18n } from 'i18n-js'; -import translations from '../generated/translations.json'; +import translations from './translations.json'; const userLocale = document.documentElement.lang; diff --git a/config/esbuild-targets.txt b/config/esbuild-targets.txt index e23044d..2f4d620 100644 --- a/config/esbuild-targets.txt +++ b/config/esbuild-targets.txt @@ -1 +1 @@ -chrome130,edge130,firefox132,ios18.1,opera113,safari18.1 +chrome109,edge130,firefox115,ios11,opera113,safari16.6 diff --git a/config/i18n-js.yml b/config/i18n-js.yml index e2205f9..d0ebd00 100644 --- a/config/i18n-js.yml +++ b/config/i18n-js.yml @@ -1,4 +1,4 @@ translations: - - file: "app/javascript/generated/translations.json" + - file: "app/javascript/i18n/translations.json" patterns: - "*" diff --git a/package.json b/package.json index 78446bf..5e4a51f 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "dependencies": { "@uswds/uswds": "^3.8.1", - "i18n-js": "^4.5.0", + "i18n-js": "^4.5.1", "sass": "^1.83.1" }, "scripts": { diff --git a/yarn.lock b/yarn.lock index 2c06d1e..5d69d72 100644 --- a/yarn.lock +++ b/yarn.lock @@ -676,7 +676,7 @@ https-proxy-agent@^5.0.0: agent-base "6" debug "4" -i18n-js@^4.5.0: +i18n-js@^4.5.1: version "4.5.1" resolved "https://registry.yarnpkg.com/i18n-js/-/i18n-js-4.5.1.tgz#12ea3d6333552ff75be0904ea50705f5a263d172" integrity sha512-n7jojFj1WC0tztgr0I8jqTXuIlY1xNzXnC3mjKX/YjJhimdM+jXM8vOmn9d3xQFNC6qDHJ4ovhdrGXrRXLIGkA==