Skip to content

Add support for ember-cli 6 #44

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
boris-petrov wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add support for ember-cli 6 #44

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
bb78479
Fix using a deprecated property
boris-petrov Oct 25, 2024
b160698
Add support for `ember-cli` 6
boris-petrov Dec 1, 2024
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
2 changes: 1 addition & 1 deletion packages/namespace/lib/namespace-helper-ast.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function addArguments(builders) {
}

function addNamespaceArguments(node, moduleName, builders) {
if (node.path.original !== 'style-namespace') return;
if (Object.prototype.hasOwnProperty.call(node.path, 'value') || node.path.original !== 'style-namespace') return;

const allArguments = getArguments(moduleName);
const neededArguments = allArguments.filter(
Expand Down
2 changes: 1 addition & 1 deletion packages/preprocessor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module.exports = {

const options = this._options(app);
const preprocessors = Object.assign({}, options.preprocessors);
registry.add('css', new Preprocessor(preprocessors));
registry.add('css', new Preprocessor(preprocessors, options.outputPaths));
},

name: require('./package').name,
Expand Down
6 changes: 4 additions & 2 deletions packages/preprocessor/lib/preprocessor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ const merge = require('broccoli-merge-trees');
const witeFile = require('broccoli-file-creator');

module.exports = class Preprocessors {
constructor(preprocessors) {
constructor(preprocessors, outputPaths) {
this.preprocessors = preprocessors;
this.outputPaths = outputPaths;
this.ext = this.extensions;
}

Expand All @@ -26,7 +27,8 @@ module.exports = class Preprocessors {
toTree(node, inputPath, outputPath, options) {
const styles = [];

for (const [project, outFile] of Object.entries(options.outputPaths)) {
// the `??` is for `ember-cli` 5 compatibility
for (const [project, outFile] of Object.entries(this.outputPaths ?? options.outputPaths)) {
styles.push(
this.preprocess({
node,
Expand Down
Loading