Skip to content

Update getCSSModuleLocalIdent to support Sass #4391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 8, 2018
Merged

Update getCSSModuleLocalIdent to support Sass #4391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45c1421
Update getCSSModuleLocalIdent to support Sass
arianon May 1, 2018
952fcbb
Fix Sass/SCSS index module tests
arianon May 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/react-dev-utils/getCSSModuleLocalIdent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ module.exports = function getLocalIdent(
localName,
options
) {
// Use the filename or folder name, based on some uses the index.js / index.module.css project style
const fileNameOrFolder = context.resourcePath.endsWith('index.module.css')
// Use the filename or folder name, based on some uses the index.js / index.module.(css|scss|sass) project style
const fileNameOrFolder = context.resourcePath.match(
/index\.module\.(css|scss|sass)$/
)
? '[folder]'
: '[name]';
// Create a hash based on a the file location and class name. Will be unique across a project, and close to globally unique.
Expand Down
10 changes: 10 additions & 0 deletions packages/react-scripts/fixtures/kitchensink/integration/webpack.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ describe('Integration', () => {
).to.match(
/.+scss-styles_scssModulesInclusion.+\{background:.+;color:.+}/
);
expect(
doc.getElementsByTagName('style')[1].textContent.replace(/\s/g, '')
).to.match(
/.+assets_scssModulesIndexInclusion.+\{background:.+;color:.+}/
);
});

it('sass inclusion', async () => {
Expand All @@ -68,6 +73,11 @@ describe('Integration', () => {
).to.match(
/.+sass-styles_sassModulesInclusion.+\{background:.+;color:.+}/
);
expect(
doc.getElementsByTagName('style')[1].textContent.replace(/\s/g, '')
).to.match(
/.+assets_sassModulesIndexInclusion.+\{background:.+;color:.+}/
);
});

it('graphql files inclusion', async () => {
Expand Down
8 changes: 7 additions & 1 deletion packages/react-scripts/fixtures/kitchensink/src/features/webpack/SassModulesInclusion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@

import React from 'react';
import styles from './assets/sass-styles.module.sass';
import indexStyles from './assets/index.module.sass';

export default () => (
<p className={styles.sassModulesInclusion}>SASS Modules are working!</p>
<div>
<p className={styles.sassModulesInclusion}>SASS Modules are working!</p>
<p className={indexStyles.sassModulesIndexInclusion}>
SASS Modules with index are working!
</p>
</div>
);
8 changes: 7 additions & 1 deletion packages/react-scripts/fixtures/kitchensink/src/features/webpack/ScssModulesInclusion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@

import React from 'react';
import styles from './assets/scss-styles.module.scss';
import indexStyles from './assets/index.module.scss';

export default () => (
<p className={styles.scssModulesInclusion}>SCSS Modules are working!</p>
<div>
<p className={styles.scssModulesInclusion}>SCSS Modules are working!</p>
<p className={indexStyles.scssModulesIndexInclusion}>
SCSS Modules with index are working!
</p>
</div>
);
4 changes: 4 additions & 0 deletions packages/react-scripts/fixtures/kitchensink/src/features/webpack/assets/index.module.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.sassModulesIndexInclusion
background: darkblue
color: lightblue

4 changes: 4 additions & 0 deletions packages/react-scripts/fixtures/kitchensink/src/features/webpack/assets/index.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.scssModulesIndexInclusion {
background: darkblue;
color: lightblue;
}