From bf47e4b79b4e84f5abfd066323641af5f05f6852 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke <787658+mfranzke@users.noreply.github.com> Date: Mon, 24 Oct 2022 14:44:40 +0200 Subject: [PATCH 1/3] docs: further documentation on the SCSS load path (#109) * Update getStarted.adoc * Update migrationGuide.adoc --- docs/getStarted.adoc | 2 ++ docs/migrationGuide.adoc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docs/getStarted.adoc b/docs/getStarted.adoc index 75a8a1d216f..56e0df3ab6a 100644 --- a/docs/getStarted.adoc +++ b/docs/getStarted.adoc @@ -58,6 +58,8 @@ This should add a new entry to your `package.json` file: @import "@db-ui/core/sources/css/enterprise/db-ui-core"; ---- +### SCSS: `node_modules include path / load path + Please keep in mind, that you would need to set your `include path` also known as `load path` depending on your setup for the sass compiler to find the correct `node_modules` folder, e.g. like the following (this is similar to how other frameworks and libraries like link:https://github.com/twbs/bootstrap-npm-starter/blob/main/package.json#L18[Bootstrap] are handling this): #### link:https://npmjs.com/sass[`sass` compiler] diff --git a/docs/migrationGuide.adoc b/docs/migrationGuide.adoc index 52308c18d73..5187fac09f5 100644 --- a/docs/migrationGuide.adoc +++ b/docs/migrationGuide.adoc @@ -12,6 +12,8 @@ Especially the following aspects have changed through the various different rele Please note that we've switched from the deprecated link:https://www.npmjs.com/package/node-sass[`node-sass`] compiler to its successor link:https://www.npmjs.com/package/sass[`sass`]. As `sass` doesn't support the tilde (`~`) reference to your `node_modules` folder out of the box and there even also doesn't seem to be a general solution out there, we've removed that one, so that in case you're using our SCSS sources directly, you would need to provide your `node_modules` folder as a load path or include path (e.g. `--load-path=node_modules` on the `sass` CLI usage). +You need to set the load path / include path depending on your SCSS compiler as described within our link:getStarted.adoc#scss-node_modules-include-path--load-path[getting started] + Additionally we've deprecated the `@db-ui/core/sources/css/enterprise/db-ui-core-include` SCSS endpoint – please either `@import` the file `@db-ui/core/sources/css/rollup.assets-paths` or `@db-ui/core/sources/css/webpack.assets-paths` depending on your bundler, previous to `@import`ing `@db-ui/core/sources/css/enterprise/db-ui-core` directly from now on. ==== SCSS Helper functions From a16eda1400560ef949ee155177bd5b6d7b5ca49b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 22:32:45 +0200 Subject: [PATCH 2/3] build(deps): bump trufflesecurity/trufflehog from 3.14.0 to 3.15.0 (#112) Bumps [trufflesecurity/trufflehog](https://github.com/trufflesecurity/trufflehog) from 3.14.0 to 3.15.0. - [Release notes](https://github.com/trufflesecurity/trufflehog/releases) - [Changelog](https://github.com/trufflesecurity/trufflehog/blob/main/.goreleaser.yml) - [Commits](https://github.com/trufflesecurity/trufflehog/compare/v3.14.0...v3.15.0) --- updated-dependencies: - dependency-name: trufflesecurity/trufflehog dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/00-scan-secrets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/00-scan-secrets.yml b/.github/workflows/00-scan-secrets.yml index b44fbd9233d..725e6a1dfe5 100644 --- a/.github/workflows/00-scan-secrets.yml +++ b/.github/workflows/00-scan-secrets.yml @@ -18,7 +18,7 @@ jobs: id: extract_branch - name: 🐷 TruffleHog OSS - uses: trufflesecurity/trufflehog@v3.14.0 + uses: trufflesecurity/trufflehog@v3.15.0 with: path: ./ base: ${{ steps.extract_branch.outputs.branch }} From 1a9d8905e1d392fab3f50cef254a236b0d25c10b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 20:37:13 +0000 Subject: [PATCH 3/3] build(deps-dev): bump html-validate from 7.6.0 to 7.7.0 (#113) Bumps [html-validate](https://gitlab.com/html-validate/html-validate) from 7.6.0 to 7.7.0. - [Release notes](https://gitlab.com/html-validate/html-validate/tags) - [Changelog](https://gitlab.com/html-validate/html-validate/blob/master/CHANGELOG.md) - [Commits](https://gitlab.com/html-validate/html-validate/compare/v7.6.0...v7.7.0) --- updated-dependencies: - dependency-name: html-validate dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index c40ec09d176..090bddb1b1e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "dialog-polyfill": "^0.5.6", "dotenv": "^16.0.3", "find-versions-cli": "^4.0.0", - "html-validate": "^7.6.0", + "html-validate": "^7.7.0", "html5-boilerplate": "^8.0.0", "husky": "^8.0.1", "iframe-resizer": "^4.3.2", @@ -7988,9 +7988,9 @@ } }, "node_modules/html-validate": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-7.6.0.tgz", - "integrity": "sha512-6Ib433N0/ou2/0oLjfUmFjaAVFW8KKU/fOBBhrZXNuPcYCUsZExAD3xOqKl1bp5ANHb4PItXEK9vcKL/L7Da0Q==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-7.7.0.tgz", + "integrity": "sha512-8/abZs9ta2gkbNcBNh3ciSkUBop6kb4GNmnxsgHSS9VF2AN71h0JddufmsHeZHovgJwXhkEkaouK0NUG99He9w==", "dev": true, "dependencies": { "@babel/code-frame": "^7.10.0", @@ -22673,9 +22673,9 @@ "dev": true }, "html-validate": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-7.6.0.tgz", - "integrity": "sha512-6Ib433N0/ou2/0oLjfUmFjaAVFW8KKU/fOBBhrZXNuPcYCUsZExAD3xOqKl1bp5ANHb4PItXEK9vcKL/L7Da0Q==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-7.7.0.tgz", + "integrity": "sha512-8/abZs9ta2gkbNcBNh3ciSkUBop6kb4GNmnxsgHSS9VF2AN71h0JddufmsHeZHovgJwXhkEkaouK0NUG99He9w==", "dev": true, "requires": { "@babel/code-frame": "^7.10.0", diff --git a/package.json b/package.json index f7e2c2e1861..e58729260bd 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "dialog-polyfill": "^0.5.6", "dotenv": "^16.0.3", "find-versions-cli": "^4.0.0", - "html-validate": "^7.6.0", + "html-validate": "^7.7.0", "html5-boilerplate": "^8.0.0", "husky": "^8.0.1", "iframe-resizer": "^4.3.2",