Skip to content

Commit e6736e9

Browse files
Tim Lindvalltimlindvall
Tim Lindvall
authored andcommitted
refactor: Default for options.output.
Default to css-blocks.css if not declared. Unifies hardcoded defaults from multiple locations.
1 parent e6a4d94 commit e6736e9

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Diff for: packages/@css-blocks/ember-app/src/broccoli-plugin.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,5 @@ function addSourcemapInfoToOptimizedCss(css: string, sourcemap?: string) {
214214
* @returns - The path for the CSS Blocks compiled content.
215215
*/
216216
function cssBlocksOutputFilename(options: ResolvedCSSBlocksEmberOptions) {
217-
let outputName = options.output || "css-blocks.css";
218-
return `app/styles/${outputName}`;
217+
return `app/styles/${options.output}`;
219218
}

Diff for: packages/@css-blocks/ember-app/src/index.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,8 @@ function buildBroccoliConcatOptions(env: AddonEnvironment): BroccoliConcatOption
259259
* @returns - Default broccoli-concat options, accounting for current env settings.
260260
*/
261261
function buildDefaultBroccoliConcatOptions(env: AddonEnvironment): BroccoliConcatOptions {
262-
const cssBlocksOutputFilename = env.config.output || "css-blocks.css";
263262
return {
264-
inputFiles: [`assets/${cssBlocksOutputFilename}`, `assets/${env.modulePrefix}.css`],
263+
inputFiles: [`assets/${env.config.output}`, `assets/${env.modulePrefix}.css`],
265264
outputFile: `assets/${env.modulePrefix}.css`,
266265
sourceMapConfig: {
267266
enabled: true,

Diff for: packages/@css-blocks/ember-utils/src/options.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export interface CSSBlocksEmberOptions {
6565
}
6666

6767
export interface ResolvedCSSBlocksEmberOptions {
68-
output?: string;
68+
output: string;
6969
aliases: ObjectDictionary<string>;
7070
analysisOpts: AnalysisOptions;
7171
parserOpts: ParserOptions;
@@ -99,5 +99,7 @@ export function getConfig(root: string, isProduction: boolean, options: CSSBlock
9999
if (options.output !== undefined && typeof options.output !== "string") {
100100
throw new Error(`Invalid css-blocks options in 'ember-cli-build.js': Output must be a string. Instead received ${options.output}.`);
101101
}
102+
options.output = options.output || "css-blocks.css";
103+
102104
return <ResolvedCSSBlocksEmberOptions>options;
103105
}

0 commit comments

Comments
 (0)