Skip to content

Commit 9e818a7

Browse files
committed
Update store dependency.
1 parent 50f591c commit 9e818a7

File tree

8 files changed

+69
-29
lines changed

8 files changed

+69
-29
lines changed

@shanzhai/minify-html-plugin/index.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { zipContentStore } from "@shanzhai/zip-content-store";
55
import { DeleteFromKeyedStoreStep } from "@shanzhai/delete-from-keyed-store-step";
66
import { KeyedStoreGetInput } from "@shanzhai/keyed-store-get-input";
77
import { KeyedStoreSetOutput } from "@shanzhai/keyed-store-set-output";
8+
import { WrapInObjectOutput } from "@shanzhai/wrap-in-object-output";
89

910
const minifyHtmlPlugin: Plugin<{
1011
readonly minifyHtml: KeyedStoreTrigger;
@@ -21,7 +22,10 @@ const minifyHtmlPlugin: Plugin<{
2122
return new MinifyHtmlStep(
2223
key,
2324
new KeyedStoreGetInput(htmlSourceStore, key),
24-
new KeyedStoreSetOutput(zipContentStore, key)
25+
new WrapInObjectOutput(
26+
key,
27+
new KeyedStoreSetOutput(zipContentStore, key)
28+
)
2529
);
2630
},
2731
},

@shanzhai/minify-html-plugin/package-lock.json

Lines changed: 23 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

@shanzhai/minify-html-plugin/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@shanzhai/minify-html-plugin",
33
"description": "A Shanzhai plugin which minifies HTML from the source store.",
4-
"version": "0.0.10",
4+
"version": "0.0.11",
55
"engines": {
66
"node": ">=17.6.0"
77
},
@@ -25,16 +25,17 @@
2525
"@shanzhai/delete-from-keyed-store-step": "0.0.4",
2626
"@shanzhai/keyed-store-get-input": "0.0.4",
2727
"@shanzhai/keyed-store-set-output": "0.0.4",
28-
"@shanzhai/minify-html-step": "0.0.11"
28+
"@shanzhai/minify-html-step": "0.0.11",
29+
"@shanzhai/wrap-in-object-output": "0.0.5"
2930
},
3031
"devDependencies": {
3132
"@shanzhai/interfaces": "0.0.24",
3233
"@shanzhai/html-source-store": "0.0.7",
33-
"@shanzhai/zip-content-store": "0.0.5"
34+
"@shanzhai/zip-content-store": "0.0.6"
3435
},
3536
"peerDependencies": {
3637
"@shanzhai/html-source-store": "0.0.7",
37-
"@shanzhai/zip-content-store": "0.0.5"
38+
"@shanzhai/zip-content-store": "0.0.6"
3839
},
3940
"types": "index.d.ts",
4041
"shanzhaiPlugin": [

@shanzhai/minify-html-plugin/unit.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { DeleteFromKeyedStoreStep } from "@shanzhai/delete-from-keyed-store-step
66
import { KeyedStoreGetInput } from "@shanzhai/keyed-store-get-input";
77
import { KeyedStoreSetOutput } from "@shanzhai/keyed-store-set-output";
88
import minifyHtmlPlugin = require(".");
9+
import { WrapInObjectOutput } from "@shanzhai/wrap-in-object-output";
910

1011
describe(`minify-html-plugin`, () => {
1112
it(`is triggered by the HTML source store`, () => {
@@ -46,7 +47,10 @@ describe(`minify-html-plugin`, () => {
4647
new MinifyHtmlStep(
4748
`Test Key`,
4849
new KeyedStoreGetInput(htmlSourceStore, `Test Key`),
49-
new KeyedStoreSetOutput(zipContentStore, `Test Key`)
50+
new WrapInObjectOutput(
51+
`Test Key`,
52+
new KeyedStoreSetOutput(zipContentStore, `Test Key`)
53+
)
5054
)
5155
);
5256
});

@shanzhai/zip-plugin/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { zipStore } from "@shanzhai/zip-store";
44
import { ZipStep } from "@shanzhai/zip-step";
55
import { KeyedStoreGetAllInput } from "@shanzhai/keyed-store-get-all-input";
66
import { UnkeyedStoreSetOutput } from "@shanzhai/unkeyed-store-set-output";
7+
import { MergeObjectInput } from "@shanzhai/merge-object-input";
78

89
const zipPlugin: Plugin<{
910
readonly zip: StoreAggregateTrigger;
@@ -15,7 +16,7 @@ const zipPlugin: Plugin<{
1516
invalidated(): Step {
1617
return new ZipStep(
1718
`Zip`,
18-
new KeyedStoreGetAllInput(zipContentStore),
19+
new MergeObjectInput(new KeyedStoreGetAllInput(zipContentStore)),
1920
new UnkeyedStoreSetOutput(zipStore)
2021
);
2122
},

@shanzhai/zip-plugin/package-lock.json

Lines changed: 22 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

@shanzhai/zip-plugin/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@shanzhai/zip-plugin",
33
"description": "A Shanzhai plugin which zips the generated content.",
4-
"version": "0.0.11",
4+
"version": "0.0.12",
55
"engines": {
66
"node": ">=17.6.0"
77
},
@@ -24,15 +24,16 @@
2424
"dependencies": {
2525
"@shanzhai/keyed-store-get-all-input": "0.0.4",
2626
"@shanzhai/unkeyed-store-set-output": "0.0.4",
27-
"@shanzhai/zip-step": "0.0.10"
27+
"@shanzhai/zip-step": "0.0.10",
28+
"@shanzhai/merge-object-input": "0.0.9"
2829
},
2930
"devDependencies": {
3031
"@shanzhai/interfaces": "0.0.24",
31-
"@shanzhai/zip-content-store": "0.0.5",
32+
"@shanzhai/zip-content-store": "0.0.6",
3233
"@shanzhai/zip-store": "0.0.5"
3334
},
3435
"peerDependencies": {
35-
"@shanzhai/zip-content-store": "0.0.5",
36+
"@shanzhai/zip-content-store": "0.0.6",
3637
"@shanzhai/zip-store": "0.0.5"
3738
},
3839
"types": "index.d.ts",

@shanzhai/zip-plugin/unit.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { zipStore } from "@shanzhai/zip-store";
44
import { ZipStep } from "@shanzhai/zip-step";
55
import { KeyedStoreGetAllInput } from "@shanzhai/keyed-store-get-all-input";
66
import { UnkeyedStoreSetOutput } from "@shanzhai/unkeyed-store-set-output";
7+
import { MergeObjectInput } from "@shanzhai/merge-object-input";
78
import zipPlugin = require(".");
89

910
describe(`zip-plugin`, () => {
@@ -22,7 +23,7 @@ describe(`zip-plugin`, () => {
2223
expect(step).toEqual(
2324
new ZipStep(
2425
`Zip`,
25-
new KeyedStoreGetAllInput(zipContentStore),
26+
new MergeObjectInput(new KeyedStoreGetAllInput(zipContentStore)),
2627
new UnkeyedStoreSetOutput(zipStore)
2728
)
2829
);

0 commit comments

Comments
 (0)