From 93ed9f81de75336b4a23d52dc1fc307121f2c348 Mon Sep 17 00:00:00 2001 From: Katie Mazaitis Date: Thu, 30 Mar 2023 15:00:27 -0400 Subject: [PATCH 1/2] Revert "chore(deps): bump uikit from 3.15.17 to 3.16.13" --- netlify.toml | 1 + package-lock.json | 26 +++++++++++++++++++------- package.json | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/netlify.toml b/netlify.toml index f96ca3cfb..1aa3fa9e1 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,4 +1,5 @@ [build] +ignore = "git log -1 --pretty=%B | grep dependabot" publish = "public" command = "npm ci && hugo --gc --minify -b $DEPLOY_PRIME_URL" diff --git a/package-lock.json b/package-lock.json index 857bec95c..a2b29fab7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@fortawesome/fontawesome-free": "^6.2.1", "highlight.js": "^11.7.0", "katex": "^0.16.4", - "uikit": "^3.16.13", + "uikit": "^3.15.17", "www-covidcast": "https://github.com/cmu-delphi/www-covidcast/releases/download/v3.2.4/www-covidcast-3.2.4.tgz", "www-covidcast-classic": "https://github.com/cmu-delphi/www-covidcast-classic/releases/download/v2.6.5/www-covidcast-classic-2.6.5.tgz", "www-epivis": "https://github.com/cmu-delphi/www-epivis/releases/download/v2.0.3/www-epivis-2.0.3.tgz" @@ -2847,9 +2847,9 @@ } }, "node_modules/uikit": { - "version": "3.16.13", - "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.16.13.tgz", - "integrity": "sha512-v5CpeWYkMMJvSiJqzNLwrCN9O7y27sJDv08Ri7fHEyUm7U4nW/z70NBxLiflqCNRb1Bbj5YNjgyUuRg0AlXVxw==" + "version": "3.15.17", + "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.15.17.tgz", + "integrity": "sha512-WGZosS2P9rShonmAldc1NsW5AyICguY964eVPeuferdbK6gVH1ab+WyGGkE4m5hUPXZ6m/EVUC0EeHkBrHPq0A==" }, "node_modules/ulid": { "version": "2.3.0", @@ -3001,6 +3001,11 @@ "uikit": "^3.15.5" } }, + "node_modules/www-epivis/node_modules/uikit": { + "version": "3.15.7", + "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.15.7.tgz", + "integrity": "sha512-DBDTfg6vMrFrL6+IhJ+3tkhw6QTr5EgsAuyP6+1xmNGIYqUUYqTnNgL4HlYvzKhHX/fQCNG8JvftbD+ELhzUFg==" + }, "node_modules/xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", @@ -5062,9 +5067,9 @@ "dev": true }, "uikit": { - "version": "3.16.13", - "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.16.13.tgz", - "integrity": "sha512-v5CpeWYkMMJvSiJqzNLwrCN9O7y27sJDv08Ri7fHEyUm7U4nW/z70NBxLiflqCNRb1Bbj5YNjgyUuRg0AlXVxw==" + "version": "3.15.17", + "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.15.17.tgz", + "integrity": "sha512-WGZosS2P9rShonmAldc1NsW5AyICguY964eVPeuferdbK6gVH1ab+WyGGkE4m5hUPXZ6m/EVUC0EeHkBrHPq0A==" }, "ulid": { "version": "2.3.0", @@ -5182,6 +5187,13 @@ "integrity": "sha512-zkqK7/3a2/R0PwaJwWIm35SulcGJ58qF8yS2xSr5SOBDT7zExGmBO+vrRx2j90pKbGUyYIYI503QKh175jiTAg==", "requires": { "uikit": "^3.15.5" + }, + "dependencies": { + "uikit": { + "version": "3.15.7", + "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.15.7.tgz", + "integrity": "sha512-DBDTfg6vMrFrL6+IhJ+3tkhw6QTr5EgsAuyP6+1xmNGIYqUUYqTnNgL4HlYvzKhHX/fQCNG8JvftbD+ELhzUFg==" + } } }, "xtend": { diff --git a/package.json b/package.json index b368b9be4..ad4a056da 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@fortawesome/fontawesome-free": "^6.2.1", "highlight.js": "^11.7.0", "katex": "^0.16.4", - "uikit": "^3.16.13", + "uikit": "^3.15.17", "www-covidcast": "https://github.com/cmu-delphi/www-covidcast/releases/download/v3.2.4/www-covidcast-3.2.4.tgz", "www-covidcast-classic": "https://github.com/cmu-delphi/www-covidcast-classic/releases/download/v2.6.5/www-covidcast-classic-2.6.5.tgz", "www-epivis": "https://github.com/cmu-delphi/www-epivis/releases/download/v2.0.3/www-epivis-2.0.3.tgz" From 3b9f3334f7cb04b2bf5f1d05806ace17d80bd071 Mon Sep 17 00:00:00 2001 From: Katie Mazaitis Date: Thu, 30 Mar 2023 15:02:24 -0400 Subject: [PATCH 2/2] Keep preview builds --- netlify.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 1aa3fa9e1..f96ca3cfb 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,5 +1,4 @@ [build] -ignore = "git log -1 --pretty=%B | grep dependabot" publish = "public" command = "npm ci && hugo --gc --minify -b $DEPLOY_PRIME_URL"