Skip to content

refactor: enable icss only when enabled modules #1103

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
alexander-akait merged 1 commit into from
Jul 13, 2020
Merged

refactor: enable icss only when enabled modules #1103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 17 additions & 16 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,28 @@ export default function loader(content, map, meta) {
const sourceMap = options.sourceMap || false;
const plugins = [];

if (shouldUseModulesPlugins(options.modules, this.resourcePath)) {
plugins.push(...getModulesPlugins(options, this));
}

const exportType = options.onlyLocals ? 'locals' : 'full';
const preRequester = getPreRequester(this);
const urlHandler = (url) =>
stringifyRequest(this, preRequester(options.importLoaders) + url);
const icssResolver = this.getResolve({
mainFields: ['css', 'style', 'main', '...'],
mainFiles: ['index', '...'],
});

plugins.push(
icssParser({
context: this.context,
rootContext: this.rootContext,
resolver: icssResolver,
urlHandler,
})
);
if (shouldUseModulesPlugins(options.modules, this.resourcePath)) {
plugins.push(...getModulesPlugins(options, this));

const icssResolver = this.getResolve({
mainFields: ['css', 'style', 'main', '...'],
mainFiles: ['index', '...'],
});

plugins.push(
icssParser({
context: this.context,
rootContext: this.rootContext,
resolver: icssResolver,
urlHandler,
})
);
}

if (options.import !== false && exportType === 'full') {
const resolver = this.getResolve({
Expand Down
4 changes: 3 additions & 1 deletion test/icss.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ const testCases = fs.readdirSync(testCasesPath);
describe('ICSS', () => {
testCases.forEach((name) => {
it(`show work with the case "${name}"`, async () => {
const compiler = getCompiler(`./icss/tests-cases/${name}/source.js`);
const compiler = getCompiler(`./icss/tests-cases/${name}/source.js`, {
modules: 'global',
});
const stats = await compile(compiler);

expect(
Expand Down