Skip to content

Support for classic structure style files #23

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

Open
webark wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support for classic structure style files #23

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
11 changes: 10 additions & 1 deletion packages/colocation/lib/base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
const path = require('path');

const funnel = require('broccoli-funnel');
const merge = require('broccoli-merge-trees');

module.exports = class Base {
constructor(options) {
Expand All @@ -18,7 +21,13 @@ module.exports = class Base {
annotation: 'Funnel (ember-cli-styles-colocation grab files addon style files)',
});

return funnel(baseFiles, {
const classicStyles = funnel(tree, {
srcDir: path.join(srcDir, 'styles', 'component-styles'),
destDir,
allowEmpty: true,
});

return funnel(merge([baseFiles, classicStyles], { overwrite: true }), {
include: [`**/*.{${this.extentions},}`],
exclude: [`**/styles/**/*`],
allowEmpty: true,
Expand Down
3 changes: 2 additions & 1 deletion packages/namespace/addon/utils/generate-default-style-namespace-manifest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ function formatFullName(stylePath) {
return stylePath
.replace(/(\/(styles?|index))?\.(css|less|scss|sass|styl)$/, '')
.replace(/.*?\//, '')
.replace(/^components\//, '');
.replace(/^components\//, '')
.replace(/^templates\//, '');
}

export function generateDefaultStyleNamespaceManifest(owner, styleExtensions) {
Expand Down
5 changes: 4 additions & 1 deletion packages/namespace/lib/component-names.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ module.exports = {
path(actualPath) {
const { dir, name } = path.parse(actualPath);

return path.join(dir, name.replace(/(template|component|styles?|index)$/, ''));
return path.join(
dir.replace(/(templates|components)/g, ''),
name.replace(/(template|component|styles?|index)$/g, '')
);
},

class(actualPath, terseClassNames) {
Expand Down
2 changes: 1 addition & 1 deletion packages/namespace/tests/acceptance/classic-structure-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { setupApplicationTest } from 'ember-qunit';

import styleForSetup from 'dummy/tests/setup/style-for';

module.skip('Acceptance | classic structure', function (hooks) {
module('Acceptance | classic structure', function (hooks) {
setupApplicationTest(hooks);
styleForSetup(hooks);

Expand Down
4 changes: 3 additions & 1 deletion packages/namespace/tests/dummy/app/templates/components/classic-structure.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
<span class='classic-structure'></span>
<div class='{{style-namespace}}'>
<span class='classic-structure'></span>
</div>
4 changes: 3 additions & 1 deletion packages/namespace/tests/dummy/app/templates/components/nested/classic-structure-nested.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
<span class='classic-structure-nested'></span>
<div class='{{style-namespace}}'>
<span class='classic-structure-nested'></span>
</div>