From 784a28632976b7681e18a6f5dca338a520ef3a4c Mon Sep 17 00:00:00 2001 From: Pierre Burgy Date: Wed, 10 May 2017 14:45:32 +0200 Subject: [PATCH] Improve generators for scss files --- .../public/internals/generators/component/es6.js.hbs | 2 +- .../public/internals/generators/component/index.js | 6 +++--- .../public/internals/generators/component/stateless.js.hbs | 2 +- .../component/{styles.css.hbs => styles.scss.hbs} | 0 .../public/internals/generators/container/index.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename packages/strapi-plugin-content-manager/public/internals/generators/component/{styles.css.hbs => styles.scss.hbs} (100%) diff --git a/packages/strapi-plugin-content-manager/public/internals/generators/component/es6.js.hbs b/packages/strapi-plugin-content-manager/public/internals/generators/component/es6.js.hbs index 5a8b1ce481..f94b3cd6bc 100644 --- a/packages/strapi-plugin-content-manager/public/internals/generators/component/es6.js.hbs +++ b/packages/strapi-plugin-content-manager/public/internals/generators/component/es6.js.hbs @@ -11,7 +11,7 @@ import { FormattedMessage } from 'react-intl'; import messages from './messages'; {{/if}} {{#if wantCSS}} -import styles from './styles.css'; +import styles from './styles.scss'; {{/if}} class {{ properCase name }} extends React.Component { // eslint-disable-line react/prefer-stateless-function diff --git a/packages/strapi-plugin-content-manager/public/internals/generators/component/index.js b/packages/strapi-plugin-content-manager/public/internals/generators/component/index.js index 3c0d80d094..5e230c9761 100644 --- a/packages/strapi-plugin-content-manager/public/internals/generators/component/index.js +++ b/packages/strapi-plugin-content-manager/public/internals/generators/component/index.js @@ -49,12 +49,12 @@ module.exports = { abortOnFail: true, }]; - // If they want a CSS file, add styles.css + // If they want a SCSS file, add styles.scss if (data.wantCSS) { actions.push({ type: 'add', - path: '../../app/components/{{properCase name}}/styles.css', - templateFile: './component/styles.css.hbs', + path: '../../app/components/{{properCase name}}/styles.scss', + templateFile: './component/styles.scss.hbs', abortOnFail: true, }); } diff --git a/packages/strapi-plugin-content-manager/public/internals/generators/component/stateless.js.hbs b/packages/strapi-plugin-content-manager/public/internals/generators/component/stateless.js.hbs index 7ff8824f8a..2184b2ae2b 100644 --- a/packages/strapi-plugin-content-manager/public/internals/generators/component/stateless.js.hbs +++ b/packages/strapi-plugin-content-manager/public/internals/generators/component/stateless.js.hbs @@ -12,7 +12,7 @@ import messages from './messages'; {{/if}} {{#if wantCSS}} -import styles from './styles.css'; +import styles from './styles.scss'; {{/if}} function {{ properCase name }}() { diff --git a/packages/strapi-plugin-content-manager/public/internals/generators/component/styles.css.hbs b/packages/strapi-plugin-content-manager/public/internals/generators/component/styles.scss.hbs similarity index 100% rename from packages/strapi-plugin-content-manager/public/internals/generators/component/styles.css.hbs rename to packages/strapi-plugin-content-manager/public/internals/generators/component/styles.scss.hbs diff --git a/packages/strapi-plugin-content-manager/public/internals/generators/container/index.js b/packages/strapi-plugin-content-manager/public/internals/generators/container/index.js index a47a434470..1f860eb589 100644 --- a/packages/strapi-plugin-content-manager/public/internals/generators/container/index.js +++ b/packages/strapi-plugin-content-manager/public/internals/generators/container/index.js @@ -58,7 +58,7 @@ module.exports = { abortOnFail: true, }]; - // If they want a CSS file, add styles.css + // If they want a SCSS file, add styles.scss if (data.wantCSS) { actions.push({ type: 'add',