public inbox for [email protected]
help / color / mirror / Atom feed[pgAdmin][patch] Fix build error occuring after updating sass-resources-loader package
3+ messages / 2 participants
[nested] [flat]
* [pgAdmin][patch] Fix build error occuring after updating sass-resources-loader package
@ 2021-04-15 10:05 Aditya Toshniwal <[email protected]>
2021-04-15 10:11 ` Re: [pgAdmin][patch] Fix build error occuring after updating sass-resources-loader package Aditya Toshniwal <[email protected]>
0 siblings, 1 reply; 3+ messages in thread
From: Aditya Toshniwal @ 2021-04-15 10:05 UTC (permalink / raw)
To: pgadmin-hackers
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"
^ permalink raw reply [nested|flat] 3+ messages in thread
* Re: [pgAdmin][patch] Fix build error occuring after updating sass-resources-loader package
2021-04-15 10:05 [pgAdmin][patch] Fix build error occuring after updating sass-resources-loader package Aditya Toshniwal <[email protected]>
@ 2021-04-15 10:11 ` Aditya Toshniwal <[email protected]>
2021-04-15 11:13 ` Re: [pgAdmin][patch] Fix build error occuring after updating sass-resources-loader package Akshay Joshi <[email protected]>
0 siblings, 1 reply; 3+ messages in thread
From: Aditya Toshniwal @ 2021-04-15 10:11 UTC (permalink / raw)
To: pgadmin-hackers
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"
^ permalink raw reply [nested|flat] 3+ messages in thread
* Re: [pgAdmin][patch] Fix build error occuring after updating sass-resources-loader package
2021-04-15 10:05 [pgAdmin][patch] Fix build error occuring after updating sass-resources-loader package Aditya Toshniwal <[email protected]>
2021-04-15 10:11 ` Re: [pgAdmin][patch] Fix build error occuring after updating sass-resources-loader package Aditya Toshniwal <[email protected]>
@ 2021-04-15 11:13 ` Akshay Joshi <[email protected]>
0 siblings, 0 replies; 3+ messages in thread
From: Akshay Joshi @ 2021-04-15 11:13 UTC (permalink / raw)
To: Aditya Toshniwal <[email protected]>; +Cc: pgadmin-hackers
Thanks, patch applied.
On Thu, Apr 15, 2021 at 3:41 PM Aditya Toshniwal <
[email protected]> wrote:
> 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"
>
--
*Thanks & Regards*
*Akshay Joshi*
*pgAdmin Hacker | Principal Software Architect*
*EDB Postgres <http://edbpostgres.com>*
*Mobile: +91 976-788-8246*
^ permalink raw reply [nested|flat] 3+ messages in thread
end of thread, other threads:[~2021-04-15 11:13 UTC | newest]
Thread overview: 3+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2021-04-15 10:05 [pgAdmin][patch] Fix build error occuring after updating sass-resources-loader package Aditya Toshniwal <[email protected]>
2021-04-15 10:11 ` Aditya Toshniwal <[email protected]>
2021-04-15 11:13 ` Akshay Joshi <[email protected]>
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox