Skip to content
Permalink
Browse files

fix: New release of broccoli-plugin added a conflicting property.

Closes #358.
  • Loading branch information
chriseppstein committed Dec 11, 2019
1 parent e931e63 commit c090750606e269e7f7afe4332671715117d319ee
Showing with 38 additions and 6 deletions.
  1. +1 −1 packages/@css-blocks/broccoli/package.json
  2. +4 −4 packages/@css-blocks/broccoli/src/Analyze.ts
  3. +33 −1 yarn.lock
@@ -44,7 +44,7 @@
"@opticss/template-api": "^0.6.3",
"broccoli-funnel": "^2.0.1",
"broccoli-merge-trees": "^3.0.0",
"broccoli-plugin": "^3.0.0",
"broccoli-plugin": "^3.1.0",
"colors": "^1.2.1",
"debug": "^4.1.1",
"fs-extra": "^8.0.0",
@@ -32,7 +32,7 @@ export class CSSBlocksAnalyze extends BroccoliPlugin {

private analyzer: Analyzer<keyof TemplateTypes>;
private entries: string[];
private output: string;
private outputFileName: string;
private transport: Transport;
private optimizationOptions: Partial<OptiCSSOptions>;
private previousInput: FSTree = new FSTree();
@@ -51,7 +51,7 @@ export class CSSBlocksAnalyze extends BroccoliPlugin {
});
this.transport = transport;
this.entries = options.entry.slice(0);
this.output = options.output || "css-blocks.css";
this.outputFileName = options.output || "css-blocks.css";
this.optimizationOptions = options.optimization || {};
this.analyzer = options.analyzer;
this.transport.css = this.transport.css ? this.transport.css : "";
@@ -107,7 +107,7 @@ export class CSSBlocksAnalyze extends BroccoliPlugin {
for (let block of blocks) {
if (block.stylesheet) {
let root = blockCompiler.compile(block, block.stylesheet, this.analyzer);
let result = root.toResult({ to: this.output, map: { inline: false, annotation: false } });
let result = root.toResult({ to: this.outputFileName, map: { inline: false, annotation: false } });
let filesystemPath = options.importer.filesystemPath(block.identifier, options);
let filename = filesystemPath || options.importer.debugIdentifier(block.identifier, options);

@@ -134,7 +134,7 @@ export class CSSBlocksAnalyze extends BroccoliPlugin {
this.analyzer.eachAnalysis((a) => optimizer.addAnalysis(a.forOptimizer(options)));

// Run optimization and compute StyleMapping.
let optimized = await optimizer.optimize(this.output);
let optimized = await optimizer.optimize(this.outputFileName);
let styleMapping = new StyleMapping<keyof TemplateTypes>(optimized.styleMapping, blocks, options, this.analyzer.analyses());

// Attach all computed data to our magic shared memory transport object...
@@ -4918,7 +4918,7 @@ broccoli-module-unification-reexporter@^1.0.0:
mkdirp "^0.5.1"
walk-sync "^0.3.2"

broccoli-node-api@^1.6.0:
broccoli-node-api@^1.6.0, broccoli-node-api@^1.7.0:
version "1.7.0"
resolved "https://registry.npmjs.org/broccoli-node-api/-/broccoli-node-api-1.7.0.tgz#391aa6edecd2a42c63c111b4162956b2fa288cb6"
integrity sha512-QIqLSVJWJUVOhclmkmypJJH9u9s/aWH4+FH6Q6Ju5l+Io4dtwqdPUNmDfw40o6sxhbZHhqGujDJuHTML1wG8Yw==
@@ -4933,6 +4933,13 @@ broccoli-node-info@^2.1.0:
resolved "https://registry.npmjs.org/broccoli-node-info/-/broccoli-node-info-2.1.0.tgz#ca84560e8570ff78565bea1699866ddbf58ad644"
integrity sha512-l6qDuboJThHfRVVWQVaTs++bFdrFTP0gJXgsWenczc1PavRVUmL1Eyb2swTAXXMpDOnr2zhNOBLx4w9AxkqbPQ==

broccoli-output-wrapper@^2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/broccoli-output-wrapper/-/broccoli-output-wrapper-2.0.0.tgz#f1e0b9b2f259a67fd41a380141c3c20b096828e6"
integrity sha512-V/ozejo+snzNf75i/a6iTmp71k+rlvqjE3+jYfimuMwR1tjNNRdtfno+NGNQB2An9bIAeqZnKhMDurAznHAdtA==
dependencies:
heimdalljs-logger "^0.1.10"

broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0, broccoli-persistent-filter@^1.2.13, broccoli-persistent-filter@^1.3.1, broccoli-persistent-filter@^1.4.3:
version "1.4.6"
resolved "https://registry.npmjs.org/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.6.tgz#80762d19000880a77da33c34373299c0f6a3e615"
@@ -5013,6 +5020,19 @@ broccoli-plugin@^3.0.0:
rimraf "^2.3.4"
symlink-or-copy "^1.1.8"

broccoli-plugin@^3.1.0:
version "3.1.0"
resolved "https://registry.npmjs.org/broccoli-plugin/-/broccoli-plugin-3.1.0.tgz#54ba6dd90a42ec3db5624063292610e326b1e542"
integrity sha512-7w7FP8WJYjLvb0eaw27LO678TGGaom++49O1VYIuzjhXjK5kn2+AMlDm7CaUFw4F7CLGoVQeZ84d8gICMJa4lA==
dependencies:
broccoli-node-api "^1.6.0"
broccoli-output-wrapper "^2.0.0"
fs-merger "^3.0.1"
promise-map-series "^0.2.1"
quick-temp "^0.1.3"
rimraf "^2.3.4"
symlink-or-copy "^1.1.8"

broccoli-rollup@^1.2.0:
version "1.3.0"
resolved "https://registry.npmjs.org/broccoli-rollup/-/broccoli-rollup-1.3.0.tgz#43a0a7798555bab54217009eb470a4ff5a056df0"
@@ -9468,6 +9488,18 @@ fs-extra@^8.0.0, fs-extra@^8.0.1, fs-extra@^8.1.0:
jsonfile "^4.0.0"
universalify "^0.1.0"

fs-merger@^3.0.1:
version "3.0.1"
resolved "https://registry.npmjs.org/fs-merger/-/fs-merger-3.0.1.tgz#4fba891e1ac83ce1ea4261b91fee475aaf628cb2"
integrity sha512-0DDF7GDMm4roej5N6Z7ZNC2y2VdZdYQtHm32wWluSONyxUMqIAWyD73v0S12GkqO416BGqSHr2tjU4hmIlbylw==
dependencies:
broccoli-node-api "^1.7.0"
broccoli-node-info "^2.1.0"
fs-extra "^8.0.1"
fs-tree-diff "^2.0.1"
rimraf "^2.6.3"
walk-sync "^2.0.2"

fs-minipass@^1.2.5:
version "1.2.7"
resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"

0 comments on commit c090750

Please sign in to comment.
You can’t perform that action at this time.