Skip to content

Commit 6a6b133

Browse files
authored
Merge pull request #83 from uswds/release-1.1.0
USWDS Compile 1.1.0
2 parents f5267eb + fd99d15 commit 6a6b133

File tree

9 files changed

+513
-455
lines changed

9 files changed

+513
-455
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Bug Report 🐞
22
description: Report a bug and help USWDS Compile improve.
33
title: "USWDS-Compile - Bug: [YOUR TITLE]"
4-
labels: ['Type: Bug','Status: Triage','Needs: Confirmation']
4+
labels: ['Type: Bug','Needs: Confirmation']
55
body:
66
- type: textarea
77
id: problem

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Feature Request 💡
22
description: Suggest a new idea for USWDS Compile.
33
title: 'USWDS-Compile - Feature: [YOUR TITLE]'
4-
labels: ['Type: Feature Request','Status: Triage']
4+
labels: ['Type: Feature Request']
55
body:
66
- type: markdown
77
attributes:
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Label issues
2+
on:
3+
issues:
4+
types:
5+
- opened
6+
jobs:
7+
label_issues:
8+
runs-on: ubuntu-latest
9+
permissions:
10+
issues: write
11+
steps:
12+
- uses: actions/github-script@v6
13+
with:
14+
script: |
15+
github.rest.issues.addLabels({
16+
issue_number: context.issue.number,
17+
owner: context.repo.owner,
18+
repo: context.repo.repo,
19+
labels: ["Status: Triage"]
20+
})

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16
1+
20

.tool-versions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nodejs 20.9.0

README.md

Lines changed: 62 additions & 53 deletions
Large diffs are not rendered by default.

gulpfile.js

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
const autoprefixer = require("autoprefixer");
22
const csso = require("postcss-csso");
33
const { src, dest, series, parallel, watch } = require("gulp");
4+
const path = require("path");
45
const postcss = require("gulp-postcss");
56
const replace = require("gulp-replace");
67
const sass = require("gulp-sass")(require("sass-embedded"));
@@ -150,13 +151,18 @@ function logVersion() {
150151
return Promise.resolve("logged version");
151152
}
152153

153-
function buildSass() {
154-
let uswdsPath = "uswds";
154+
function getUswdsVersion() {
155+
let uswdsPackage = "uswds";
155156
if (settings.version === 3) {
156-
uswdsPath = "@uswds/uswds";
157+
uswdsPackage = "@uswds/uswds";
157158
}
159+
const packagePath = path.join(path.dirname(require.resolve(uswdsPackage)), '../../');
160+
const version = require(`${packagePath}/package.json`).version;
161+
return version;
162+
}
158163

159-
const pkg = require(`../../${uswdsPath}/package.json`).version;
164+
function buildSass() {
165+
const pkg = getUswdsVersion();
160166

161167
log(colors.blue, `Compiling with USWDS ${pkg}`);
162168
const buildSettings = {
@@ -183,7 +189,10 @@ function buildSass() {
183189
return src([`${paths.dist.theme}/*.scss`.replace("//", "/")])
184190
.pipe(sourcemaps.init({ largeFile: true }))
185191
.pipe(
186-
sass({ includePaths: buildSettings.includes }).on("error", handleError)
192+
sass({
193+
outputStyle: "compressed",
194+
includePaths: buildSettings.includes,
195+
}).on("error", handleError)
187196
)
188197
.pipe(replace(/\buswds @version\b/g, `based on uswds v${pkg}`))
189198
.pipe(postcss(buildSettings.plugins))

0 commit comments

Comments
 (0)