From bf0389dfcae6e4edf003580fc088f1ffb067e80a Mon Sep 17 00:00:00 2001 From: feoche Date: Wed, 10 May 2023 16:34:16 +0200 Subject: [PATCH] fix(generator): remove duplicate import + prepend import in file Signed-off-by: feoche --- packages/tools/generator/component/saofile.js | 9 +-------- .../template/theming/component-theming-size.scss | 6 +++--- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/packages/tools/generator/component/saofile.js b/packages/tools/generator/component/saofile.js index b2157727de..9c33408808 100644 --- a/packages/tools/generator/component/saofile.js +++ b/packages/tools/generator/component/saofile.js @@ -166,7 +166,7 @@ module.exports = { type: 'modify', files: `${config.outDir}/${config.odsThemingPath}/ods-size-definitions.scss`, handler(data) { - return data + `@import './${config.corePrefix}-theming-size.${templateData.name}.scss';` + return `@import './${config.corePrefix}-theming-size.${templateData.name}';` + data; } }, @@ -192,13 +192,6 @@ module.exports = { patterns: { 'theming/component-theming-size.scss': `${config.outDir}/${config.odsThemingPath}/${config.corePrefix}-theming-size.${templateData.name}.scss`, } - }, - { - type: 'modify', - files: `${config.outDir}/${config.odsThemingPath}/ods-size-definitions.scss`, - handler(data) { - return data + `@import './${config.corePrefix}-theming-size.${templateData.name}.scss';` - } } ]; }, diff --git a/packages/tools/generator/component/template/theming/component-theming-size.scss b/packages/tools/generator/component/template/theming/component-theming-size.scss index b03284b51b..361075e8a6 100644 --- a/packages/tools/generator/component/template/theming/component-theming-size.scss +++ b/packages/tools/generator/component/template/theming/component-theming-size.scss @@ -1,14 +1,14 @@ /// @access private -//@function ods-get-<% componentName %>-size-properties($size-name) { +//@function ods-get-<%= name %>-size-properties($size-name) { // @return ( // // ) //} /// @access private -//@function ods-get-<% componentName %>-component-size-definition() { +//@function ods-get-<%= name %>-component-size-definition() { // @return ( -// md: ods-get-<% componentName %>-size-properties(md) +// md: ods-get-<%= name %>-size-properties(md) // ); //}