From 2904b4658500b77a6c976e7cbd738ef5d7c602ab Mon Sep 17 00:00:00 2001 From: feoche Date: Wed, 10 May 2023 16:34:16 +0200 Subject: [PATCH 1/3] fix(generator): remove duplicate import + prepend import in file Signed-off-by: feoche --- packages/tools/generator/component/saofile.js | 9 +-------- .../osds-component/styles/osds-component.size.scss | 1 + .../template/theming/component-theming-size.scss | 6 +++--- 3 files changed, 5 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/stencil/src/components/osds-component/styles/osds-component.size.scss b/packages/tools/generator/component/template/stencil/src/components/osds-component/styles/osds-component.size.scss index 0385fced5c..56b7054746 100644 --- a/packages/tools/generator/component/template/stencil/src/components/osds-component/styles/osds-component.size.scss +++ b/packages/tools/generator/component/template/stencil/src/components/osds-component/styles/osds-component.size.scss @@ -1,4 +1,5 @@ @import './osds-<%= name %>.mixins'; +@import '~@ovhcloud/ods-theming/size/ods-component-size'; // Main CSS mixin for sizes @mixin osds-<%= name %>-theme-size() { 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) // ); //} From d4892496bf61eb978e35f0abd1a3150fb625632b Mon Sep 17 00:00:00 2001 From: Francois Eoche Date: Thu, 11 May 2023 09:57:57 +0200 Subject: [PATCH 2/3] fix(generator): missing tsconfig.test.json Signed-off-by: Francois Eoche --- packages/tools/generator/component/saofile.js | 1 + .../generator/component/template/stencil/tsconfig.test.json | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 packages/tools/generator/component/template/stencil/tsconfig.test.json diff --git a/packages/tools/generator/component/saofile.js b/packages/tools/generator/component/saofile.js index 9c33408808..9f742cc3e4 100644 --- a/packages/tools/generator/component/saofile.js +++ b/packages/tools/generator/component/saofile.js @@ -110,6 +110,7 @@ module.exports = { 'stencil/tsconfig.dev.json': `${config.outDir}/${config.odsStencilPath}/${templateData.name}/tsconfig.dev.json`, 'stencil/tsconfig.json': `${config.outDir}/${config.odsStencilPath}/${templateData.name}/tsconfig.json`, 'stencil/tsconfig.prod.json': `${config.outDir}/${config.odsStencilPath}/${templateData.name}/tsconfig.prod.json`, + 'stencil/tsconfig.test.json': `${config.outDir}/${config.odsStencilPath}/${templateData.name}/tsconfig.test.json`, 'stencil/typedoc.json': `${config.outDir}/${config.odsStencilPath}/${templateData.name}/typedoc.json`, // Sources 'stencil/src/global.dev.ts': `${config.outDir}/${config.odsStencilPath}/${templateData.name}/src/global.dev.ts`, diff --git a/packages/tools/generator/component/template/stencil/tsconfig.test.json b/packages/tools/generator/component/template/stencil/tsconfig.test.json new file mode 100644 index 0000000000..2981dd3671 --- /dev/null +++ b/packages/tools/generator/component/template/stencil/tsconfig.test.json @@ -0,0 +1,6 @@ +{ + "extends": "../tsconfig.test.json", + "include": [ + "src" + ] +} From b1b8546c4ea896df531492264ab99d4fce303b86 Mon Sep 17 00:00:00 2001 From: Francois Eoche Date: Thu, 11 May 2023 11:14:09 +0200 Subject: [PATCH 3/3] fix(generator): add component in tsconfig.test.json Signed-off-by: Francois Eoche --- packages/tools/generator/component/saofile.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/tools/generator/component/saofile.js b/packages/tools/generator/component/saofile.js index 9f742cc3e4..52e33d082a 100644 --- a/packages/tools/generator/component/saofile.js +++ b/packages/tools/generator/component/saofile.js @@ -163,6 +163,15 @@ module.exports = { return data; } }, + { + type: 'modify', + files: `${config.outDir}/${config.odsStencilPath}/tsconfig.components.test.json`, + handler(data) { + data.include.push(`${templateData.name}/src`); + data.include = data.include.sort(); + return data; + } + }, { type: 'modify', files: `${config.outDir}/${config.odsThemingPath}/ods-size-definitions.scss`,