From a178d58405ebcc9a1f974b0ad719f270344909b6 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Mon, 8 May 2023 11:48:57 -0400 Subject: [PATCH 1/2] Upgrade 18f/identity-build-sass to 1.2.0 Why? - As verification that the improvements implemented in https://github.com/18F/identity-idp/pull/8346 are valid when used in an external project - To give developers implementing by copy-paste reference a good reference to copy from --- package-lock.json | 41 ++++++++++++++++++++++++++++++++++------- package.json | 4 ++-- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 094824760..6a9167854 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "SEE LICENSE IN LICENSE", "dependencies": { - "@18f/identity-build-sass": "^1.1.0", + "@18f/identity-build-sass": "^1.2.0", "@18f/identity-design-system": "^7.0.1", "@babel/core": "^7.12.9", "@babel/preset-env": "^7.12.7", @@ -91,10 +91,12 @@ } }, "node_modules/@18f/identity-build-sass": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@18f/identity-build-sass/-/identity-build-sass-1.1.0.tgz", - "integrity": "sha512-nJeNQB+8tiQsvc6oh7UON1EsRK1MTuc9n5bMS9MIS2Mxa6mKkZDSGBdSR2TINAEdgQLlLlDOziRNTez4Um29jg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@18f/identity-build-sass/-/identity-build-sass-1.2.0.tgz", + "integrity": "sha512-0YKDX4qPMkBzqyIAmKLzt6rI0AvzuQrB/x9vxBZkE+6gMhEFhrQvwsHVAwILY5XDzTU+L/dEsbDeRsZH3HPFBA==", "dependencies": { + "@aduth/is-dependency": "^1.0.0", + "@pkgjs/parseargs": "^0.11.0", "browserslist": "^4.21.5", "chokidar": "^3.5.3", "lightningcss": "^1.16.1", @@ -116,6 +118,11 @@ "npm": ">6" } }, + "node_modules/@aduth/is-dependency": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@aduth/is-dependency/-/is-dependency-1.0.0.tgz", + "integrity": "sha512-1CJwTd6B6XDb6HETcHMwjRmQLQi2FgjM1rYUO6wf1yizKVPC9V66vmvVCtgePMzWmhsLqdhOPLWt+fNvG46FoA==" + }, "node_modules/@axe-core/puppeteer": { "version": "4.5.1", "resolved": "https://registry.npmjs.org/@axe-core/puppeteer/-/puppeteer-4.5.1.tgz", @@ -2224,6 +2231,14 @@ "node": ">= 8" } }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "engines": { + "node": ">=14" + } + }, "node_modules/@sinclair/typebox": { "version": "0.25.24", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz", @@ -12558,10 +12573,12 @@ } }, "@18f/identity-build-sass": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@18f/identity-build-sass/-/identity-build-sass-1.1.0.tgz", - "integrity": "sha512-nJeNQB+8tiQsvc6oh7UON1EsRK1MTuc9n5bMS9MIS2Mxa6mKkZDSGBdSR2TINAEdgQLlLlDOziRNTez4Um29jg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@18f/identity-build-sass/-/identity-build-sass-1.2.0.tgz", + "integrity": "sha512-0YKDX4qPMkBzqyIAmKLzt6rI0AvzuQrB/x9vxBZkE+6gMhEFhrQvwsHVAwILY5XDzTU+L/dEsbDeRsZH3HPFBA==", "requires": { + "@aduth/is-dependency": "^1.0.0", + "@pkgjs/parseargs": "^0.11.0", "browserslist": "^4.21.5", "chokidar": "^3.5.3", "lightningcss": "^1.16.1", @@ -12576,6 +12593,11 @@ "@uswds/uswds": "^3.4.1" } }, + "@aduth/is-dependency": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@aduth/is-dependency/-/is-dependency-1.0.0.tgz", + "integrity": "sha512-1CJwTd6B6XDb6HETcHMwjRmQLQi2FgjM1rYUO6wf1yizKVPC9V66vmvVCtgePMzWmhsLqdhOPLWt+fNvG46FoA==" + }, "@axe-core/puppeteer": { "version": "4.5.1", "resolved": "https://registry.npmjs.org/@axe-core/puppeteer/-/puppeteer-4.5.1.tgz", @@ -14206,6 +14228,11 @@ "fastq": "^1.6.0" } }, + "@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==" + }, "@sinclair/typebox": { "version": "0.25.24", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz", diff --git a/package.json b/package.json index 3dc436684..fbc5d6db0 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "login.gov static site", "scripts": { "prebuild:css": "mkdir -p _site/assets/css", - "build:css": "build-sass assets/scss/*.scss --load-path=node_modules/@18f/identity-design-system/packages --out-dir=_site/assets/css", + "build:css": "build-sass assets/scss/*.scss --out-dir=_site/assets/css", "watch:css": "npm run build:css -- --watch", "build:js": "webpack --config webpack.config.js", "watch:js": "webpack -w --config webpack.config.js", @@ -55,7 +55,7 @@ "vnu-jar": "^21.10.12" }, "dependencies": { - "@18f/identity-build-sass": "^1.1.0", + "@18f/identity-build-sass": "^1.2.0", "@18f/identity-design-system": "^7.0.1", "@babel/core": "^7.12.9", "@babel/preset-env": "^7.12.7", From 2c11cecae60957f2fc24c63af70fe6a4981acf75 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Mon, 26 Jun 2023 10:10:53 -0400 Subject: [PATCH 2/2] Bump build-sass to 1.3.0 --- assets/scss/{main.css.scss => main.scss} | 0 package-lock.json | 14 +++++++------- package.json | 3 +-- 3 files changed, 8 insertions(+), 9 deletions(-) rename assets/scss/{main.css.scss => main.scss} (100%) diff --git a/assets/scss/main.css.scss b/assets/scss/main.scss similarity index 100% rename from assets/scss/main.css.scss rename to assets/scss/main.scss diff --git a/package-lock.json b/package-lock.json index 6a9167854..c06f5161f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "SEE LICENSE IN LICENSE", "dependencies": { - "@18f/identity-build-sass": "^1.2.0", + "@18f/identity-build-sass": "^1.3.0", "@18f/identity-design-system": "^7.0.1", "@babel/core": "^7.12.9", "@babel/preset-env": "^7.12.7", @@ -91,9 +91,9 @@ } }, "node_modules/@18f/identity-build-sass": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@18f/identity-build-sass/-/identity-build-sass-1.2.0.tgz", - "integrity": "sha512-0YKDX4qPMkBzqyIAmKLzt6rI0AvzuQrB/x9vxBZkE+6gMhEFhrQvwsHVAwILY5XDzTU+L/dEsbDeRsZH3HPFBA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@18f/identity-build-sass/-/identity-build-sass-1.3.0.tgz", + "integrity": "sha512-2spqLCrMSrhJYI2utQg2vvD9QokPt7bkJ+j9co34A9eXKmiAqBYZO2lhKnpy484rgIhzTiA2ljna7nJUNrTexA==", "dependencies": { "@aduth/is-dependency": "^1.0.0", "@pkgjs/parseargs": "^0.11.0", @@ -12573,9 +12573,9 @@ } }, "@18f/identity-build-sass": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@18f/identity-build-sass/-/identity-build-sass-1.2.0.tgz", - "integrity": "sha512-0YKDX4qPMkBzqyIAmKLzt6rI0AvzuQrB/x9vxBZkE+6gMhEFhrQvwsHVAwILY5XDzTU+L/dEsbDeRsZH3HPFBA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@18f/identity-build-sass/-/identity-build-sass-1.3.0.tgz", + "integrity": "sha512-2spqLCrMSrhJYI2utQg2vvD9QokPt7bkJ+j9co34A9eXKmiAqBYZO2lhKnpy484rgIhzTiA2ljna7nJUNrTexA==", "requires": { "@aduth/is-dependency": "^1.0.0", "@pkgjs/parseargs": "^0.11.0", diff --git a/package.json b/package.json index fbc5d6db0..f16941475 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,6 @@ "version": "1.0.0", "description": "login.gov static site", "scripts": { - "prebuild:css": "mkdir -p _site/assets/css", "build:css": "build-sass assets/scss/*.scss --out-dir=_site/assets/css", "watch:css": "npm run build:css -- --watch", "build:js": "webpack --config webpack.config.js", @@ -55,7 +54,7 @@ "vnu-jar": "^21.10.12" }, "dependencies": { - "@18f/identity-build-sass": "^1.2.0", + "@18f/identity-build-sass": "^1.3.0", "@18f/identity-design-system": "^7.0.1", "@babel/core": "^7.12.9", "@babel/preset-env": "^7.12.7",