Visitar URL original
Compile widget after382 by ryanwoldatwork · Pull Request #1549 · GSA/touchpoints · GitHub
Skip to content

Compile widget after382 #1549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanwoldatwork merged 4 commits into from
Aug 22, 2024
Merged

Compile widget after382 #1549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8af9b11
update npm packages
ryanwoldatwork Aug 16, 2024
5a6803e
npx gulp compileWidgetSass
ryanwoldatwork Aug 16, 2024
73ea1c2
run npx gulp updateUswds
ryanwoldatwork Aug 16, 2024
a9fbfe2
update
ryanwoldatwork Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/javascripts/uswds-init.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/assets/javascripts/uswds-init.min.js.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 18 additions & 18 deletions app/assets/javascripts/uswds.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/assets/javascripts/uswds.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions app/assets/stylesheets/uswds-styles.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/assets/stylesheets/uswds-styles.css.map
View file
Open in desktop

Large diffs are not rendered by default.

127 changes: 0 additions & 127 deletions app/views/components/widget/_widget-uswds-styles.css.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2721,133 +2721,6 @@
display:block;
font-weight:700;
}
.fba-modal-dialog .grid-row{
display:flex;
flex-wrap:wrap;
box-sizing:border-box;
}
.fba-modal-dialog .grid-row.grid-gap-1{
margin-left:-0.25rem;
margin-right:-0.25rem;
}
.fba-modal-dialog .grid-row.grid-gap-1 > *{
box-sizing:border-box;
padding-left:0.25rem;
padding-right:0.25rem;
}
.fba-modal-dialog .grid-row.grid-gap-2{
margin-left:-0.5rem;
margin-right:-0.5rem;
}
.fba-modal-dialog .grid-row.grid-gap-2 > *{
box-sizing:border-box;
padding-left:0.5rem;
padding-right:0.5rem;
}
.fba-modal-dialog .grid-row.grid-gap-4{
margin-left:-1rem;
margin-right:-1rem;
}
.fba-modal-dialog .grid-row.grid-gap-4 > *{
box-sizing:border-box;
padding-left:1rem;
padding-right:1rem;
}
@media all and (min-width: 30em){
.fba-modal-dialog .grid-row.mobile-lg\:grid-gap-2{
margin-left:-0.5rem;
margin-right:-0.5rem;
}
.fba-modal-dialog .grid-row.mobile-lg\:grid-gap-2 > *{
box-sizing:border-box;
padding-left:0.5rem;
padding-right:0.5rem;
}
}
.fba-modal-dialog .grid-gap{
margin-left:-0.5rem;
margin-right:-0.5rem;
}
.fba-modal-dialog .grid-gap > *{
box-sizing:border-box;
padding-left:0.5rem;
padding-right:0.5rem;
}
@media all and (min-width: 64em){
.fba-modal-dialog .grid-gap{
margin-left:-1rem;
margin-right:-1rem;
}
.fba-modal-dialog .grid-gap > *{
box-sizing:border-box;
padding-left:1rem;
padding-right:1rem;
}
}
.fba-modal-dialog [class*=grid-col]{
position:relative;
width:100%;
box-sizing:border-box;
}
.fba-modal-dialog .grid-col-auto{
box-sizing:border-box;
flex:0 1 auto;
width:auto;
max-width:100%;
}
@media all and (min-width: 30em){
.fba-modal-dialog .mobile-lg\:grid-col-auto{
box-sizing:border-box;
flex:0 1 auto;
width:auto;
max-width:100%;
}
.fba-modal-dialog .mobile-lg\:grid-col-4{
box-sizing:border-box;
flex:0 1 auto;
width:33.3333333333%;
}
.fba-modal-dialog .mobile-lg\:grid-col-6{
box-sizing:border-box;
flex:0 1 auto;
width:50%;
}
.fba-modal-dialog .mobile-lg\:grid-col-8{
box-sizing:border-box;
flex:0 1 auto;
width:66.6666666667%;
}
.fba-modal-dialog .mobile-lg\:grid-col-12{
box-sizing:border-box;
flex:0 1 auto;
width:100%;
}
}
@media all and (min-width: 40em){
.fba-modal-dialog .tablet\:grid-col-4{
box-sizing:border-box;
flex:0 1 auto;
width:33.3333333333%;
}
.fba-modal-dialog .tablet\:grid-col-8{
box-sizing:border-box;
flex:0 1 auto;
width:66.6666666667%;
}
}
@media all and (min-width: 64em){
.fba-modal-dialog .desktop\:grid-col-auto{
box-sizing:border-box;
flex:0 1 auto;
width:auto;
max-width:100%;
}
.fba-modal-dialog .desktop\:grid-col-3{
box-sizing:border-box;
flex:0 1 auto;
width:25%;
}
}
.fba-modal-dialog .usa-footer{
box-sizing:border-box;
font-family:Source Sans Pro Web, Helvetica Neue, Helvetica, Roboto, Arial, sans-serif;
Expand Down
11 changes: 7 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
},
"devDependencies": {
"@babel/core": "^7.25.2",
"@babel/preset-env": "^7.25.2",
"@babel/preset-env": "^7.25.3",
"@uswds/compile": "^1.1.0",
"@uswds/uswds": "3.8.0",
"@uswds/uswds": "3.8.2",
"aliasify": "^2.1.0",
"autoprefixer": "^10.4.19",
"autoprefixer": "^10.4.20",
"babelify": "^10.0.0",
"browserify": "^17.0.0",
"gulp": "^5.0.0",
Expand All @@ -17,7 +17,10 @@
"gulp-rename": "^2.0.0",
"gulp-replace": "^1.1.4",
"gulp-sass": "^5.1.0",
"postcss-discard-comments": "^7.0.1",
"postcss-discard-comments": "^7.0.2",
"vinyl-source-stream": "^2.0.0"
},
"scripts": {
"updateUswds": "yarn upgrade @uswds/uswds --latest --exact; npx gulp updateUswds; npx gulp buildWidgetAssets"
}
}
113 changes: 76 additions & 37 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,13 +232,20 @@
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.0.tgz#9fdc9237504d797b6e7b8f66e78ea7f570d256ad"
integrity sha512-CzdIU9jdP0dg7HdyB+bHvDJGagUv+qtzZt5rYCWwW6tITNqV9odjp6Qu41gkG0ca5UfdDUWrKkiAnHHdGRnOrA==

"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.0":
version "7.25.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.0.tgz#328275f22d809b962978d998c6eba22a233ac8aa"
integrity sha512-dG0aApncVQwAUJa8tP1VHTnmU67BeIQvKafd3raEx315H54FfkZSz3B/TT+33ZQAjatGJA79gZqTtqL5QZUKXw==
"@babel/parser@^7.25.3":
version "7.25.3"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.3.tgz#91fb126768d944966263f0657ab222a642b82065"
integrity sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==
dependencies:
"@babel/types" "^7.25.2"

"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.3":
version "7.25.3"
resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz#dca427b45a6c0f5c095a1c639dfe2476a3daba7f"
integrity sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==
dependencies:
"@babel/helper-plugin-utils" "^7.24.8"
"@babel/traverse" "^7.25.0"
"@babel/traverse" "^7.25.3"

"@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.25.0":
version "7.25.0"
Expand Down Expand Up @@ -796,16 +803,16 @@
"@babel/helper-create-regexp-features-plugin" "^7.24.7"
"@babel/helper-plugin-utils" "^7.24.7"

"@babel/preset-env@^7.25.2":
version "7.25.2"
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.25.2.tgz#15918e9d050c4713a2ab8fa2fa82514eaf16676e"
integrity sha512-Y2Vkwy3ITW4id9c6KXshVV/x5yCGK7VdJmKkzOzNsDZMojRKfSA/033rRbLqlRozmhRXCejxWHLSJOg/wUHfzw==
"@babel/preset-env@^7.25.3":
version "7.25.3"
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.25.3.tgz#0bf4769d84ac51d1073ab4a86f00f30a3a83c67c"
integrity sha512-QsYW7UeAaXvLPX9tdVliMJE7MD7M6MLYVTovRTIwhoYQVFHR1rM4wO8wqAezYi3/BpSD+NzVCZ69R6smWiIi8g==
dependencies:
"@babel/compat-data" "^7.25.2"
"@babel/helper-compilation-targets" "^7.25.2"
"@babel/helper-plugin-utils" "^7.24.8"
"@babel/helper-validator-option" "^7.24.8"
"@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.0"
"@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.3"
"@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.25.0"
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.25.0"
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.7"
Expand Down Expand Up @@ -928,6 +935,19 @@
debug "^4.3.1"
globals "^11.1.0"

"@babel/traverse@^7.25.3":
version "7.25.3"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.3.tgz#f1b901951c83eda2f3e29450ce92743783373490"
integrity sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==
dependencies:
"@babel/code-frame" "^7.24.7"
"@babel/generator" "^7.25.0"
"@babel/parser" "^7.25.3"
"@babel/template" "^7.25.0"
"@babel/types" "^7.25.2"
debug "^4.3.1"
globals "^11.1.0"

"@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.4.4":
version "7.25.2"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.2.tgz#55fb231f7dc958cd69ea141a4c2997e819646125"
Expand Down Expand Up @@ -1069,12 +1089,11 @@
postcss-csso "6.0.1"
sass-embedded "1.69.5"

"@uswds/uswds@3.8.0":
version "3.8.0"
resolved "https://registry.yarnpkg.com/@uswds/uswds/-/uswds-3.8.0.tgz#dba0b0b38182053779276f9ae6809474bd31d548"
integrity sha512-rMwCXe/u4HGkfskvS1Iuabapi/EXku3ChaIFW7y/dUhc7R1TXQhbbfp8YXEjmXPF0yqJnv9T08WPgS0fQqWZ8w==
"@uswds/uswds@3.8.2":
version "3.8.2"
resolved "https://registry.yarnpkg.com/@uswds/uswds/-/uswds-3.8.2.tgz#230668293c33f6866995ba9d03d6f42aba251336"
integrity sha512-8sTx/GqlbTwSIK+0AFOGrYdaW1rKVB7Bp0+v9AMVt3I5vPK7CL0+I6vlclSf3U7ysJZeTTdkNS8q89sIAeL+AA==
dependencies:
classlist-polyfill "1.2.0"
object-assign "4.1.1"
receptor "1.0.0"
resolve-id-refs "0.1.0"
Expand Down Expand Up @@ -1347,16 +1366,16 @@ autoprefixer@10.4.16:
picocolors "^1.0.0"
postcss-value-parser "^4.2.0"

autoprefixer@^10.4.19:
version "10.4.19"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.19.tgz#ad25a856e82ee9d7898c59583c1afeb3fa65f89f"
integrity sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==
autoprefixer@^10.4.20:
version "10.4.20"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.20.tgz#5caec14d43976ef42e32dcb4bd62878e96be5b3b"
integrity sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==
dependencies:
browserslist "^4.23.0"
caniuse-lite "^1.0.30001599"
browserslist "^4.23.3"
caniuse-lite "^1.0.30001646"
fraction.js "^4.3.7"
normalize-range "^0.1.2"
picocolors "^1.0.0"
picocolors "^1.0.1"
postcss-value-parser "^4.2.0"

available-typed-arrays@^1.0.7:
Expand Down Expand Up @@ -1697,6 +1716,16 @@ browserslist@^4.23.0, browserslist@^4.23.1:
node-releases "^2.0.14"
update-browserslist-db "^1.1.0"

browserslist@^4.23.3:
version "4.23.3"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800"
integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==
dependencies:
caniuse-lite "^1.0.30001646"
electron-to-chromium "^1.5.4"
node-releases "^2.0.18"
update-browserslist-db "^1.1.0"

buffer-builder@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/buffer-builder/-/buffer-builder-0.2.0.tgz#3322cd307d8296dab1f604618593b261a3fade8f"
Expand Down Expand Up @@ -1779,11 +1808,16 @@ caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001587:
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001621.tgz#4adcb443c8b9c8303e04498318f987616b8fea2e"
integrity sha512-+NLXZiviFFKX0fk8Piwv3PfLPGtRqJeq2TiNoUff/qB5KJgwecJTvCXDpmlyP/eCI/GUEmp/h/y5j0yckiiZrA==

caniuse-lite@^1.0.30001599, caniuse-lite@^1.0.30001640:
caniuse-lite@^1.0.30001640:
version "1.0.30001643"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz#9c004caef315de9452ab970c3da71085f8241dbd"
integrity sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==

caniuse-lite@^1.0.30001646:
version "1.0.30001651"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz#52de59529e8b02b1aedcaaf5c05d9e23c0c28138"
integrity sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==

chalk@^2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
Expand Down Expand Up @@ -1878,11 +1912,6 @@ class-utils@^0.3.5:
isobject "^3.0.0"
static-extend "^0.1.1"

classlist-polyfill@1.2.0:
version "1.2.0"
resolved "https://registry.npmjs.org/classlist-polyfill/-/classlist-polyfill-1.2.0.tgz"
integrity sha512-GzIjNdcEtH4ieA2S8NmrSxv7DfEV5fmixQeyTmqmRmRJPGpRBaSnA2a0VrCjyT8iW8JjEdMbKzDotAJf+ajgaQ==

clean-stack@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
Expand Down Expand Up @@ -2424,6 +2453,11 @@ electron-to-chromium@^1.4.820:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.832.tgz#d25882ce0a9237577b039bffa124ecef1822003b"
integrity sha512-cTen3SB0H2SGU7x467NRe1eVcQgcuS6jckKfWJHia2eo0cHIGOqHoAxevIYZD4eRHcWjkvFzo93bi3vJ9W+1lA==

electron-to-chromium@^1.5.4:
version "1.5.8"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.8.tgz#0a3225b305212f347be48f159a3c0a117d5e9801"
integrity sha512-4Nx0gP2tPNBLTrFxBMHpkQbtn2hidPVr/+/FTtcCiBYTucqc70zRyVZiOLj17Ui3wTO7SQ1/N+hkHYzJjBzt6A==

element-closest@^2.0.1:
version "2.0.2"
resolved "https://registry.npmjs.org/element-closest/-/element-closest-2.0.2.tgz"
Expand Down Expand Up @@ -4123,6 +4157,11 @@ node-releases@^2.0.14:
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==

node-releases@^2.0.18:
version "2.0.18"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==

normalize-package-data@^2.3.2:
version "2.5.0"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
Expand Down Expand Up @@ -4488,12 +4527,12 @@ postcss-csso@6.0.1:
dependencies:
csso "^5.0.5"

postcss-discard-comments@^7.0.1:
version "7.0.1"
resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-7.0.1.tgz#00b01c5a99e95f97927b0ba12a1c422ab90bf55f"
integrity sha512-GVrQxUOhmle1W6jX2SvNLt4kmN+JYhV7mzI6BMnkAWR9DtVvg8e67rrV0NfdWhn7x1zxvzdWkMBPdBDCls+uwQ==
postcss-discard-comments@^7.0.2:
version "7.0.2"
resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-7.0.2.tgz#b402b2957a1ecefc77a44062ea6563190eaa8903"
integrity sha512-/Hje9Ls1IYcB9duELO/AyDUJI6aQVY3h5Rj1ziXgaLYCTi1iVBLnjg/TS0D6NszR/kDG6I86OwLmAYe+bvJjiQ==
dependencies:
postcss-selector-parser "^6.1.0"
postcss-selector-parser "^6.1.1"

postcss-load-config@^3.0.0:
version "3.1.4"
Expand All @@ -4511,10 +4550,10 @@ postcss-load-config@^5.0.0:
lilconfig "^3.1.1"
yaml "^2.4.2"

postcss-selector-parser@^6.1.0:
version "6.1.1"
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz#5be94b277b8955904476a2400260002ce6c56e38"
integrity sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==
postcss-selector-parser@^6.1.1:
version "6.1.2"
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de"
integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==
dependencies:
cssesc "^3.0.0"
util-deprecate "^1.0.2"
Expand Down