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.

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

Release/4.1.1 #1301

Merged
merged 8 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .cz.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commitizen": {
"name": "cz_customize",
"version": "4.1.0",
"version": "4.1.1",
"gpg_sign": true,
"use_shortcuts": true,
"tag_format": "$major.$minor.$patch$prerelease",
Expand Down
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@

All notable changes to this project will be documented in this file.

## [4.1.1] - 2024-05-23

### 🐛 Bug Fixes

- ***(front)*** Update FE deps, refresh pnpm cache/lockfile, update patch

### 💚 Continuous Integration

- ***(utils)*** Update bump script to echo new version

### ⚙️ Miscellaneous Tasks

- ***(back)*** Upgrade to [email protected]
- ***(backstop)*** Update gh-stg refs
- ***(ci)*** Update RDS CA (#1297)
- ***(front)*** Update deps and patch svelte-highlight

## [4.1.0] - 2024-05-10

### 💡 Features
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions _tf/modules/database/database.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ resource "aws_db_instance" "this" {
username = "strapi"
password = var.db_password
storage_encrypted = false
ca_cert_identifier = "rds-ca-rsa2048-g1"
vpc_security_group_ids = ["${var.db_sg.id}"]
db_subnet_group_name = var.db_subnet_group.id
skip_final_snapshot = var.skip_final_snapshot
Expand Down
1 change: 1 addition & 0 deletions _utils/_scripts/bump.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ cd $DGPATH/../
config="_utils/_cliff/config.toml"
file="CHANGELOG.md"
str=$(cz bump --dry-run | awk '/tag to create: /')
echo $str
curr=$(cz version -p)
ver=${str//tag to create: /}
git cliff -c $config --unreleased --tag $ver --prepend ${file}
Expand Down
14 changes: 7 additions & 7 deletions back/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cms.dgrebb.com",
"version": "4.1.0",
"version": "4.1.1",
"private": true,
"description": "cms.dgrebb.com",
"license": "MIT",
Expand All @@ -15,13 +15,13 @@
"strapi": "strapi"
},
"dependencies": {
"@strapi/plugin-color-picker": "4.24.2",
"@strapi/plugin-i18n": "4.24.2",
"@strapi/plugin-sentry": "4.24.2",
"@strapi/plugin-color-picker": "4.24.3",
"@strapi/plugin-i18n": "4.24.3",
"@strapi/plugin-sentry": "4.24.3",
"@strapi/plugin-seo": "^1.9.8",
"@strapi/plugin-users-permissions": "4.24.2",
"@strapi/provider-upload-aws-s3": "4.24.2",
"@strapi/strapi": "4.24.2",
"@strapi/plugin-users-permissions": "4.24.3",
"@strapi/provider-upload-aws-s3": "4.24.3",
"@strapi/strapi": "4.24.3",
"pg": "^8.11.5",
"react": "^18.0.0",
"react-dom": "^18.0.0",
Expand Down
339 changes: 158 additions & 181 deletions back/pnpm-lock.yaml

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions front/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dgrebb.com",
"version": "4.1.0",
"version": "4.1.1",
"private": true,
"scripts": {
"check": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json --compiler-warnings \"css-unused-selector:ignore\"",
Expand Down Expand Up @@ -38,17 +38,17 @@
"@iconify-json/icomoon-free": "^1.1.8",
"@iconify-json/icon-park-outline": "^1.1.15",
"@iconify-json/mdi": "^1.1.66",
"@iconify-json/ph": "^1.1.12",
"@iconify-json/simple-icons": "^1.1.101",
"@iconify-json/ph": "^1.1.13",
"@iconify-json/simple-icons": "^1.1.102",
"@iconify-json/typcn": "^1.1.9",
"@playwright/test": "^1.43.1",
"@playwright/test": "^1.44.0",
"@sveltejs/adapter-static": "^3.0.1",
"@sveltejs/kit": "^2.5.7",
"@sveltejs/kit": "^2.5.10",
"@sveltejs/vite-plugin-svelte": "^3.1.0",
"autoprefixer": "^10.4.19",
"eslint": "^9.1.1",
"eslint": "^9.3.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-svelte": "^2.38.0",
"eslint-plugin-svelte": "^2.39.0",
"highlight.js": "^11.9.0",
"html-minifier-terser": "^7.2.0",
"marked": "^12.0.2",
Expand All @@ -57,23 +57,23 @@
"postcss": "^8.4.38",
"postcss-import": "^16.1.0",
"postcss-nested": "^6.0.1",
"postcss-nesting": "^12.1.2",
"postcss-nesting": "^12.1.4",
"prettier": "^3.2.5",
"prettier-plugin-css-order": "^2.1.2",
"prettier-plugin-svelte": "^3.2.3",
"rollup-plugin-bundle-stats": "^4.12.2",
"rollup-plugin-visualizer": "^5.12.0",
"slugger": "^1.0.1",
"svelte": "^4.2.15",
"svelte": "^4.2.17",
"svelte-check": "^3.7.1",
"svelte-highlight": "7.6.0",
"svelte-highlight": "7.6.1",
"svelte-meta-tags": "^3.1.2",
"svelte-sitemap": "^2.6.0",
"typescript": "^5.4.5",
"unplugin-icons": "^0.19.0",
"vite": "^5.2.11",
"vite-plugin-progress": "^0.0.7",
"vitest": "^1.5.3"
"vitest": "^1.6.0"
},
"engines": {
"node": ">=16.0.0 <=20.x.x",
Expand All @@ -83,8 +83,8 @@
"type": "module",
"pnpm": {
"patchedDependencies": {
"[email protected]": "patches/[email protected].patch",
"@sveltejs/[email protected]": "patches/@[email protected].patch"
"@sveltejs/[email protected]": "patches/@[email protected].patch",
"[email protected]": "patches/[email protected].patch"
}
}
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/LineNumbers.svelte b/LineNumbers.svelte
index 704976d98f45c0a472355927aed541adc0934806..e79aef99eff32c36b8589523f4049139727856b8 100644
index 18df8880f0c9e765d0644d4aac1ede33daf9d69b..95e21277b53899cc79b75c9a37473e783e8b14ff 100644
--- a/LineNumbers.svelte
+++ b/LineNumbers.svelte
@@ -24,14 +24,32 @@
@@ -24,14 +24,31 @@
$: len_digits = lines.length.toString().length;
$: len = len_digits - MIN_DIGITS < 1 ? MIN_DIGITS : len_digits;
$: width = len * DIGIT_WIDTH;
Expand All @@ -12,7 +12,6 @@ index 704976d98f45c0a472355927aed541adc0934806..e79aef99eff32c36b8589523f4049139
+ const prev = lines[i - 1];
+ return prev !== n - 1;
+ }
+
+ function isHighlightEnd(lines, n) {
+ const i = lines.indexOf(n);
+ const next = lines[i + 1];
Expand All @@ -37,15 +36,15 @@ index 704976d98f45c0a472355927aed541adc0934806..e79aef99eff32c36b8589523f4049139
<td
class:hljs={true}
class:hideBorder
@@ -44,21 +62,9 @@
@@ -44,21 +61,9 @@
<code style:color="var(--line-number-color, currentColor)">
{lineNumber}
</code>
- {#if highlightedLines.includes(i)}
- <div
- class:line-background={true}
- style:background="var(--highlighted-background, {HIGHLIGHTED_BACKGROUND})"
- />
- ></div>
- {/if}
</td>
<td>
Expand All @@ -54,12 +53,12 @@ index 704976d98f45c0a472355927aed541adc0934806..e79aef99eff32c36b8589523f4049139
- <div
- class:line-background={true}
- style:background="var(--highlighted-background, {HIGHLIGHTED_BACKGROUND})"
- />
- ></div>
- {/if}
</td>
</tr>
{/each}
@@ -67,16 +73,10 @@
@@ -67,16 +72,10 @@
</div>

<style>
Expand All @@ -76,7 +75,7 @@ index 704976d98f45c0a472355927aed541adc0934806..e79aef99eff32c36b8589523f4049139
vertical-align: baseline;
}

@@ -86,23 +86,10 @@
@@ -86,23 +85,10 @@
border-spacing: 0;
}

Expand All @@ -100,7 +99,7 @@ index 704976d98f45c0a472355927aed541adc0934806..e79aef99eff32c36b8589523f4049139
td.hljs:not(.hideBorder):after {
content: "";
position: absolute;
@@ -127,26 +114,4 @@
@@ -127,26 +113,4 @@
pre {
z-index: 1;
}
Expand Down
Loading
Loading