Skip to content

Add SVG optimization lint to build #307

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
aduth merged 2 commits into from
Mar 25, 2022
Merged

Add SVG optimization lint to build #307

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
e715271
Optimize SVG images
aduth Mar 25, 2022
e5937e3
Add SVG optimization lint
aduth Mar 25, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- Remove duplicate styles. ([#301](https://github.com/18F/identity-style-guide/pull/301))
- Reconcile redundant focus styles with U.S. Web Design System. ([#302](https://github.com/18F/identity-style-guide/pull/302))
- Remove documentation site styles from design system artifact. ([#305](https://github.com/18F/identity-style-guide/pull/305))
- Reduce size of SVG images. ([#307](https://github.com/18F/identity-style-guide/pull/307))

### Dependencies

Expand Down
22 changes: 15 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ MAKEFLAGS += --jobs=6
TMP_DIR = ./tmp
OUTPUT_DIR = ./dist
PACKAGE_DIR = ./build
NODE_BIN = ./node_modules/.bin

# Federalist builds overwrite the output directory.
ifdef SITE_PREFIX
Expand All @@ -14,7 +15,7 @@ start-docs:
bundle exec jekyll serve --watch

start-assets: build-fonts build-images
NODE_ENV=development ./node_modules/.bin/gulp watch
NODE_ENV=development $(NODE_BIN)/gulp watch

validate-gemfile-lock: Gemfile Gemfile.lock
@echo "Validating Gemfile.lock..."
Expand All @@ -28,9 +29,16 @@ validate-package-lock: package.json package-lock.json

validate-lockfiles: validate-gemfile-lock validate-package-lock

lint: build-package
./node_modules/.bin/gulp lint
make validate-lockfiles
optimize-svg:
$(NODE_BIN)/svgo --config svgo.config.js -f src/img

optimize-assets: optimize-svg

lint-optimized-assets: optimize-assets
(! git diff --name-only | grep "\.svg$$") || (echo "Error: Optimize assets using 'make optimize_assets'"; exit 1)

lint: build-package validate-lockfiles lint-optimized-assets
$(NODE_BIN)/gulp lint

build: build-docs build-assets build-package

Expand All @@ -40,13 +48,13 @@ build-docs:
build-assets: build-sass-and-js build-fonts build-images copy-scss

build-package:
./node_modules/.bin/gulp build-package
$(NODE_BIN)/gulp build-package

build-sass-and-js:
NODE_ENV=production \
DISABLE_NOTIFIER=true \
OUTPUT_DIR=$(OUTPUT_DIR) \
./node_modules/.bin/gulp build
$(NODE_BIN)/gulp build

build-fonts:
mkdir -p $(OUTPUT_DIR)/assets/fonts
Expand All @@ -58,7 +66,7 @@ build-images:
cp -r src/img $(OUTPUT_DIR)/assets

copy-scss:
./node_modules/.bin/gulp copy-scss
$(NODE_BIN)/gulp copy-scss

test: build
npm exec jest
Expand Down
Loading