From 8305c29ea945be297ba78dc19347dd24982480de Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Wed, 12 Apr 2023 14:54:22 +0200 Subject: [PATCH 1/2] Add Volto declarative theme support --- package.json | 4 ++-- razzle.extend.js | 22 ---------------------- src/theme/main.scss | 4 ++-- 3 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 razzle.extend.js diff --git a/package.json b/package.json index 2a8fa493..487ec344 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "stylelint-config-sass-guidelines": "9.0.1", "stylelint-prettier": "1.1.2" }, - "dependencies": { - "react-aria": "^3.21.0" + "peerDependencies": { + "@plone/volto": "^16.20.0 || ^17.0.0-alpha.4" } } diff --git a/razzle.extend.js b/razzle.extend.js deleted file mode 100644 index 829d8420..00000000 --- a/razzle.extend.js +++ /dev/null @@ -1,22 +0,0 @@ -const plugins = (defaultPlugins) => { - if (!defaultPlugins.includes('scss')) { - return defaultPlugins.concat(['scss']); - } else { - return defaultPlugins; - } -}; -const modify = (config, { target, dev }, webpack) => { - const themeConfigPath = `${__dirname}/src/theme/theme.config`; - config.resolve.alias['../../theme.config$'] = themeConfigPath; - config.resolve.alias['../../theme.config'] = themeConfigPath; - - const customThemePath = `${__dirname}/src/theme/custom`; - config.resolve.alias['themeCustomizations'] = customThemePath; - - return config; -}; - -module.exports = { - plugins, - modify, -}; diff --git a/src/theme/main.scss b/src/theme/main.scss index d5d223fe..8316faae 100644 --- a/src/theme/main.scss +++ b/src/theme/main.scss @@ -1,5 +1,5 @@ @import 'variables'; -@import 'themeCustomizations/variables'; +@import 'addonsThemeCustomizationsVariables'; @import 'typography'; @import 'utils'; @import 'layout'; @@ -21,6 +21,6 @@ @import 'temp'; -@import 'themeCustomizations/main'; +@import 'addonsThemeCustomizationsMain'; /* No CSS beyond this point */ From 5c243017555e0a76767b37fd1a3bcca2f1f9818e Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Wed, 12 Apr 2023 14:55:23 +0200 Subject: [PATCH 2/2] Changelog --- news/73.feature | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/73.feature diff --git a/news/73.feature b/news/73.feature new file mode 100644 index 00000000..a18dc717 --- /dev/null +++ b/news/73.feature @@ -0,0 +1 @@ +Add declarative theme support @sneridagh