public inbox for [email protected]
help / color / mirror / Atom feedFrom: Aditya Toshniwal <[email protected]>
To: pgadmin-hackers <[email protected]>
Subject: Re: [pgAdmin][patch] Fix build error occuring after updating sass-resources-loader package
Date: Thu, 15 Apr 2021 15:41:10 +0530
Message-ID: <CAM9w-_k0xozUFyQTz4BOxfPuvN9spKSgkL04GN5y_SWyDZ_V+A@mail.gmail.com> (raw)
In-Reply-To: <CAM9w-_mS-22hyFgVK_noQ2mL5XsR1tNEnhccwmdtV-r0czH-cQ@mail.gmail.com>
References: <CAM9w-_mS-22hyFgVK_noQ2mL5XsR1tNEnhccwmdtV-r0czH-cQ@mail.gmail.com>
PFA patch.
On Thu, Apr 15, 2021 at 3:35 PM Aditya Toshniwal <
[email protected]> wrote:
> Hi Hackers,
>
> Attached patches fixes build errors which are occurring after updating
> sass-resources-loader package.
>
> --
> Thanks,
> Aditya Toshniwal
> pgAdmin hacker | Sr. Software Engineer | *edbpostgres.com*
> <http://edbpostgres.com;
> "Don't Complain about Heat, Plant a TREE"
>
--
Thanks,
Aditya Toshniwal
pgAdmin hacker | Sr. Software Engineer | *edbpostgres.com*
<http://edbpostgres.com;
"Don't Complain about Heat, Plant a TREE"
Attachments:
[application/octet-stream] sass_resource.patch (1.8K, 3-sass_resource.patch)
download | inline diff:
diff --git a/web/package.json b/web/package.json
index 3befc9aed..b37d19753 100644
--- a/web/package.json
+++ b/web/package.json
@@ -56,7 +56,7 @@
"resolve-url-loader": "^3.1.2",
"sass": "^1.24.4",
"sass-loader": "^11.0.0",
- "sass-resources-loader": "^2.0.0",
+ "sass-resources-loader": "^2.2.1",
"style-loader": "^2.0.0",
"stylis": "^4.0.7",
"terser-webpack-plugin": "^5.1.1",
diff --git a/web/webpack.config.js b/web/webpack.config.js
index e81ffc01a..e906a567c 100644
--- a/web/webpack.config.js
+++ b/web/webpack.config.js
@@ -229,7 +229,6 @@ var themeCssRules = function(theme_name) {
options: {
resources: function(_theme_name){
let ret_res = [
- './pgadmin/static/scss/resources/' + _theme_name + '/_theme.variables.scss',
'./pgadmin/static/scss/resources/pgadmin.resources.scss',
];
if(_theme_name!='standard') {
diff --git a/web/yarn.lock b/web/yarn.lock
index 1d3462c5a..9d0bc5520 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -8004,10 +8004,10 @@ sass-loader@^11.0.0:
klona "^2.0.4"
neo-async "^2.6.2"
-sass-resources-loader@^2.0.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/sass-resources-loader/-/sass-resources-loader-2.1.1.tgz#a231b7c4e326d9c8d141909c901233bef9453151"
- integrity sha512-/KrD5mEBTj3ZQ49thKSThhpv1OFhc82JbWA0bmv9yANRuPIlQrydNpZG82jdy4pEWY0QcQTGyd5OmCb3xVeZsw==
+sass-resources-loader@^2.2.1:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/sass-resources-loader/-/sass-resources-loader-2.2.1.tgz#d7dbc36ccb25b2d8ffa508b1b8630b987df1e5c3"
+ integrity sha512-WlofxbWOVnxad874IHZdWbP9eW1pbyqsTJKBsMbeB+YELvLSrZQNDTpH70s6F19BwtanR3NEFnyGwJ9WyotJTQ==
dependencies:
async "^3.2.0"
chalk "^4.1.0"
view thread (3+ messages) latest in thread
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: [email protected]
Cc: [email protected]
Subject: Re: [pgAdmin][patch] Fix build error occuring after updating sass-resources-loader package
In-Reply-To: <CAM9w-_k0xozUFyQTz4BOxfPuvN9spKSgkL04GN5y_SWyDZ_V+A@mail.gmail.com>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox