Skip to content
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

style(sass): upgrade gulp-sass to use new sass js api and use quietDeps #1125

Merged
merged 2 commits into from
Jan 29, 2025
Merged

style(sass): upgrade gulp-sass to use new sass js api and use quietDeps #1125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ea6dbd
style(sass): upgrade gulp-sass to use new sass js api and use quietDeps
chrispymm Jan 29, 2025
bb58317
fixup! style(sass): upgrade gulp-sass to use new sass js api and use …
chrispymm Jan 29, 2025
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 docs/assets/stylesheets/govuk-frontend.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ $govuk-assets-path: "../" !default;
$govuk-global-styles: false;

// GOV.UK Frontend
@import "node_modules/govuk-frontend/dist/govuk/all";
@import "node_modules/govuk-frontend/dist/govuk/index";
chrispymm marked this conversation as resolved.
Show resolved Hide resolved
7 changes: 6 additions & 1 deletion gulp/build-styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@ const sass = require('gulp-sass')(require('sass'))
gulp.task('build:css', () => {
return gulp
.src('gulp/dist-scss/*.scss')
.pipe(sass())
.pipe(
sass({
loadPaths: ['./'],
quietDeps: true
})
)
.pipe(postcss([autoprefixer, cssnano]))
.pipe(
rename((path) => ({
Expand Down
7 changes: 6 additions & 1 deletion gulp/dist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ gulp.task('dist:javascript', () => {
gulp.task('dist:css', () => {
return gulp
.src('gulp/dist-scss/*.scss')
.pipe(sass())
.pipe(
sass({
loadPaths: ['./'],
quietDeps: true
})
)
.pipe(postcss([autoprefixer, cssnano]))
.pipe(
rename((path) => ({
Expand Down
6 changes: 4 additions & 2 deletions gulp/docs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ gulp.task('docs:styles', () => {
.src('docs/assets/stylesheets/*.scss')
.pipe(
sass({
outputStyle: process.env.ENV == 'dev' ? 'expanded' : 'compressed'
loadPaths: ['./'],
style: process.env.ENV === 'dev' ? 'expanded' : 'compressed',
quietDeps: true
})
)
.pipe(gulp.dest('public/assets/stylesheets/'))
Expand All @@ -62,7 +64,7 @@ gulp.task('docs:scripts', () => {
esbuild({
outfile: `all.js`,
target: 'es6',
minify: process.env.ENV != 'dev',
minify: process.env.ENV !== 'dev',
bundle: true
})
)
Expand Down
9 changes: 4 additions & 5 deletions package-lock.json
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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"gulp-rename": "^2.0.0",
"gulp-rev": "^9.0.0",
"gulp-rev-rewrite": "^5.0.0",
"gulp-sass": "^5.0.0",
"gulp-sass": "^6.0.0",
colinrotherham marked this conversation as resolved.
Show resolved Hide resolved
"gulp-uglify": "^3.0.2",
"gulp-zip": "^6.0.0",
"highlight.js": "^11.0.0",
Expand Down