Skip to content

Commit

Permalink
refactor(styles): rename to make processor clear
Browse files Browse the repository at this point in the history
There is a CSS Modules spec for native import of CSS files through the ES 2015 module system. There is also a CSS Modules preprocessor, which is not related to that spec. This commit renames things to make clear the support for the preprocessor. The actual CSS Modules spec is automatically supported via the Shadow DOM styles support.
  • Loading branch information
EisenbergEffect committed Aug 14, 2019
1 parent 9b36a8e commit d703dcf
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
14 changes: 7 additions & 7 deletions packages/__tests__/runtime-html/styles.spec.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
import { DI, PLATFORM, Registration } from '@aurelia/kernel';
import { CustomAttribute, INode } from '@aurelia/runtime';
import { AdoptedStyleSheetsStyles, CSSModulesRegistry, ShadowDOMRegistry, StyleConfiguration } from '@aurelia/runtime-html';
import { AdoptedStyleSheetsStyles, CSSModulesProcessorRegistry, ShadowDOMRegistry, StyleConfiguration } from '@aurelia/runtime-html';
import { assert } from '@aurelia/testing';

describe.only('styles', () => {
describe('CSS Modules', () => {
describe('styles', () => {
describe('CSS Modules Processor', () => {
it('config adds correct registry for css', () => {
const container = DI.createContainer();

container.register(
StyleConfiguration.cssModules()
StyleConfiguration.cssModulesProcessor()
);

const registry = container.get('.css');
assert.instanceOf(registry, CSSModulesRegistry);
assert.instanceOf(registry, CSSModulesProcessorRegistry);
});

it('registry overrides class attribute', () => {
const element = { className: '' };
const container = DI.createContainer();
container.register(Registration.instance(INode, element));
const registry = new CSSModulesRegistry();
const registry = new CSSModulesProcessorRegistry();
const cssModulesLookup = {};

registry.register(container, cssModulesLookup);
Expand All @@ -39,7 +39,7 @@ describe.only('styles', () => {
'baz': 'qux'
};

const registry = new CSSModulesRegistry();
const registry = new CSSModulesProcessorRegistry();
registry.register(container, cssModulesLookup);

const attr = container.get(CustomAttribute.keyFrom('class')) as any;
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime-html/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ export {
IShadowDOMConfiguration
} from './styles/style-configuration';
export {
CSSModulesRegistry
CSSModulesProcessorRegistry
} from './styles/css-modules-registry';
export {
ShadowDOMRegistry
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime-html/src/styles/css-modules-registry.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { IContainer } from '@aurelia/kernel';
import { bindable, customAttribute, INode } from '@aurelia/runtime';

export class CSSModulesRegistry {
export class CSSModulesProcessorRegistry {
public register(container: IContainer, ...params: (Record<string, string>)[]) {
const classLookup = Object.assign({}, ...params) as Record<string, string>;

Expand Down
6 changes: 3 additions & 3 deletions packages/runtime-html/src/styles/style-configuration.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { IContainer, IRegistry, Registration } from '@aurelia/kernel';
import { CSSModulesRegistry } from './css-modules-registry';
import { CSSModulesProcessorRegistry } from './css-modules-registry';
import { ShadowDOMRegistry, ShadowDOMStylesFactory } from './shadow-dom-registry';
import {
AdoptedStyleSheetsStyles,
Expand All @@ -19,11 +19,11 @@ export function styles(...styles: any[]) {
}

export const StyleConfiguration = {
cssModules(): IRegistry {
cssModulesProcessor(): IRegistry {
return {
register(container: IContainer) {
container.register(
Registration.singleton(ext, CSSModulesRegistry)
Registration.singleton(ext, CSSModulesProcessorRegistry)
);
}
};
Expand Down

0 comments on commit d703dcf

Please sign in to comment.