@plaudit/pnpm-plugin-plaudit-config 1.12.1 → 1.13.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
5
5
  The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
6
6
  and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7
7
 
8
+ ## [1.13.0] - 2026-06-05
9
+ ### Added
10
+ - A patch for `postcss-ordered-values` to make `list-style` work with "functions"
11
+
12
+ ## [1.12.2] - 2026-05-28
13
+ ### Fixed
14
+ - The `@wordpress/dependency-extraction-webpack-plugin` patch not handling the same module being imported in different ways across multiple files
15
+
8
16
  ## [1.12.1] - 2026-05-27
9
17
  ### Fixed
10
18
  - My code not accounting for PNPM's buggy peerDependencies handling
package/dist/pnpmfile.mjs CHANGED
@@ -5,8 +5,8 @@ import { reactDependencies } from "./shared.mjs";
5
5
  * A map of "<package id>[@<version identifier>]" -> "file in the 'patches' folder" pairs
6
6
  */
7
7
  const activePatches = {
8
- // "webpack@5.*": "webpack.patch"
9
- "@wordpress/dependency-extraction-webpack-plugin@6.*": "@wordpress__dependency-extraction-webpack-plugin.patch"
8
+ "@wordpress/dependency-extraction-webpack-plugin@6.*": "@wordpress__dependency-extraction-webpack-plugin.patch",
9
+ "postcss-ordered-values": "postcss-ordered-values.patch"
10
10
  };
11
11
  const globalForcePinDependenciesRegex = false; ///^@wordpress\//;
12
12
  const dependencyKeys = ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies'];
@@ -1 +1 @@
1
- {"version":3,"file":"pnpmfile.mjs","sourceRoot":"","sources":["../src/pnpmfile.mts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pnpmfile.mjs","sourceRoot":"","sources":["../src/pnpmfile.mts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@plaudit/pnpm-plugin-plaudit-config",
3
- "version": "1.12.1",
3
+ "version": "1.13.0",
4
4
  "license": "SEE LICENSE IN LICENSE.md",
5
5
  "exports": {
6
6
  ".": "./dist/lib.mjs"
@@ -17,8 +17,8 @@
17
17
  ],
18
18
  "sideEffects": false,
19
19
  "devDependencies": {
20
- "@pnpm/hooks.pnpmfile": "^1100.0.11",
21
- "@pnpm/types": "^1101.2.0",
20
+ "@pnpm/hooks.pnpmfile": "^1100.0.12",
21
+ "@pnpm/types": "^1101.3.0",
22
22
  "typescript": "^6.0.3"
23
23
  },
24
24
  "scripts": {
@@ -1,5 +1,5 @@
1
1
  diff --git a/lib/index.js b/lib/index.js
2
- index 8bc7cb29312161fde29039f146c9f0de4d278fc8..888f7a0dacf42ddea85ad6a0b44ff1f0e62f6415 100644
2
+ index 8bc7cb29312161fde29039f146c9f0de4d278fc8..36eac734bc4b73626886c24c40a8104001eeb548 100644
3
3
  --- a/lib/index.js
4
4
  +++ b/lib/index.js
5
5
  @@ -88,9 +88,19 @@ class DependencyExtractionWebpackPlugin {
@@ -25,7 +25,7 @@ index 8bc7cb29312161fde29039f146c9f0de4d278fc8..888f7a0dacf42ddea85ad6a0b44ff1f0
25
25
  }
26
26
  } catch ( err ) {
27
27
  return callback( err );
28
- @@ -289,6 +299,10 @@ class DependencyExtractionWebpackPlugin {
28
+ @@ -289,6 +299,13 @@ class DependencyExtractionWebpackPlugin {
29
29
  const chunkStaticDeps = new Set();
30
30
  /** @type {Set<string>} */
31
31
  const chunkDynamicDeps = new Set();
@@ -33,24 +33,36 @@ index 8bc7cb29312161fde29039f146c9f0de4d278fc8..888f7a0dacf42ddea85ad6a0b44ff1f0
33
33
  + const chunkScriptModuleStaticDeps = new Set();
34
34
  + /** @type {Set<string>} */
35
35
  + const chunkScriptModuleDynamicDeps = new Set();
36
+ +
37
+ + const staticDepsCurrent = new WeakSet();
38
+ + const staticDepsCache = new WeakMap();
36
39
 
37
40
  if ( injectPolyfill ) {
38
41
  chunkStaticDeps.add( 'wp-polyfill' );
39
- @@ -310,12 +324,32 @@ class DependencyExtractionWebpackPlugin {
42
+ @@ -303,6 +320,8 @@ class DependencyExtractionWebpackPlugin {
43
+ if ( this.useModules ) {
44
+ const isStatic =
45
+ DependencyExtractionWebpackPlugin.hasStaticDependencyPathToRoot(
46
+ + staticDepsCache,
47
+ + staticDepsCurrent,
48
+ compilation,
49
+ m
50
+ );
51
+ @@ -310,12 +329,47 @@ class DependencyExtractionWebpackPlugin {
40
52
  ( isStatic ? chunkStaticDeps : chunkDynamicDeps ).add(
41
53
  m.request
42
54
  );
43
55
  + } else if ( m.externalType === 'import' || m.externalType === 'module') {
44
56
  + const isStatic =
45
- + DependencyExtractionWebpackPlugin.hasStaticDependencyPathToRoot(
46
- + compilation,
47
- + m
48
- + );
57
+ + DependencyExtractionWebpackPlugin.hasStaticDependencyPathToRoot(
58
+ + staticDepsCache,
59
+ + staticDepsCurrent,
60
+ + compilation,
61
+ + m
62
+ + );
49
63
  +
50
- + (isStatic
51
- + ? chunkScriptModuleStaticDeps
52
- + : chunkScriptModuleDynamicDeps
53
- + ).add(userRequest);
64
+ + (isStatic ? chunkScriptModuleStaticDeps : chunkScriptModuleDynamicDeps)
65
+ + .add(userRequest);
54
66
  } else {
55
67
  chunkStaticDeps.add(
56
68
  this.mapRequestToDependency( userRequest )
@@ -59,9 +71,24 @@ index 8bc7cb29312161fde29039f146c9f0de4d278fc8..888f7a0dacf42ddea85ad6a0b44ff1f0
59
71
  }
60
72
  + if (m.blocks) {
61
73
  + for (const block of m.blocks) {
62
- + if (block.constructor.name === AsyncDependenciesBlock.name || block.constructor.name === DependenciesBlock.name) {
63
- + for (const dep of block.dependencies) {
64
- + processModule(compilation.moduleGraph.getModule(dep));
74
+ + if (block.constructor.name !== AsyncDependenciesBlock.name && block.constructor.name !== DependenciesBlock.name) {
75
+ + continue;
76
+ + }
77
+ + for (const dep of block.dependencies) {
78
+ + if (this.externalizedDeps.has(dep.userRequest)) {
79
+ + if (block.constructor.name === AsyncDependenciesBlock.name) {
80
+ + if (this.useModules) {
81
+ + chunkDynamicDeps.add(dep.request);
82
+ + } else {
83
+ + chunkScriptModuleDynamicDeps.add(dep.userRequest)
84
+ + }
85
+ + } else {
86
+ + if (this.useModules) {
87
+ + chunkStaticDeps.add(dep.request);
88
+ + } else {
89
+ + chunkScriptModuleStaticDeps.add(dep.userRequest)
90
+ + }
91
+ + }
65
92
  + }
66
93
  + }
67
94
  + }
@@ -69,7 +96,7 @@ index 8bc7cb29312161fde29039f146c9f0de4d278fc8..888f7a0dacf42ddea85ad6a0b44ff1f0
69
96
  };
70
97
 
71
98
  // Search for externalized modules in all chunks.
72
- @@ -383,6 +417,18 @@ class DependencyExtractionWebpackPlugin {
99
+ @@ -383,6 +437,18 @@ class DependencyExtractionWebpackPlugin {
73
100
  version: contentHash,
74
101
  };
75
102
 
@@ -88,3 +115,84 @@ index 8bc7cb29312161fde29039f146c9f0de4d278fc8..888f7a0dacf42ddea85ad6a0b44ff1f0
88
115
  if ( this.useModules ) {
89
116
  assetData.type = 'module';
90
117
  }
118
+ @@ -444,9 +510,6 @@ class DependencyExtractionWebpackPlugin {
119
+ }
120
+ }
121
+
122
+ - static #staticDepsCurrent = new WeakSet();
123
+ - static #staticDepsCache = new WeakMap();
124
+ -
125
+ /**
126
+ * Can we trace a line of static dependencies from an entry to a module
127
+ *
128
+ @@ -455,20 +518,20 @@ class DependencyExtractionWebpackPlugin {
129
+ *
130
+ * @return {boolean} True if there is a static import path to the root
131
+ */
132
+ - static hasStaticDependencyPathToRoot( compilation, block ) {
133
+ - if ( DependencyExtractionWebpackPlugin.#staticDepsCache.has( block ) ) {
134
+ - return DependencyExtractionWebpackPlugin.#staticDepsCache.get(
135
+ + static hasStaticDependencyPathToRoot( staticDepsCache, staticDepsCurrent, compilation, block ) {
136
+ + if ( staticDepsCache.has( block ) ) {
137
+ + return staticDepsCache.get(
138
+ block
139
+ );
140
+ }
141
+
142
+ if (
143
+ - DependencyExtractionWebpackPlugin.#staticDepsCurrent.has( block )
144
+ + staticDepsCurrent.has( block )
145
+ ) {
146
+ return false;
147
+ }
148
+
149
+ - DependencyExtractionWebpackPlugin.#staticDepsCurrent.add( block );
150
+ + staticDepsCurrent.add( block );
151
+
152
+ const incomingConnections = [
153
+ ...compilation.moduleGraph.getIncomingConnections( block ),
154
+ @@ -483,11 +546,11 @@ class DependencyExtractionWebpackPlugin {
155
+ // If we don't have non-entry, non-library incoming connections,
156
+ // we've reached a root of
157
+ if ( ! incomingConnections.length ) {
158
+ - DependencyExtractionWebpackPlugin.#staticDepsCache.set(
159
+ + staticDepsCache.set(
160
+ block,
161
+ true
162
+ );
163
+ - DependencyExtractionWebpackPlugin.#staticDepsCurrent.delete(
164
+ + staticDepsCurrent.delete(
165
+ block
166
+ );
167
+ return true;
168
+ @@ -508,11 +571,11 @@ class DependencyExtractionWebpackPlugin {
169
+
170
+ // All the dependencies were Async, the module was reached via a dynamic import
171
+ if ( ! staticDependentModules.length ) {
172
+ - DependencyExtractionWebpackPlugin.#staticDepsCache.set(
173
+ + staticDepsCache.set(
174
+ block,
175
+ false
176
+ );
177
+ - DependencyExtractionWebpackPlugin.#staticDepsCurrent.delete(
178
+ + staticDepsCurrent.delete(
179
+ block
180
+ );
181
+ return false;
182
+ @@ -522,13 +585,14 @@ class DependencyExtractionWebpackPlugin {
183
+ const result = staticDependentModules.some(
184
+ ( parentStaticDependentModule ) =>
185
+ DependencyExtractionWebpackPlugin.hasStaticDependencyPathToRoot(
186
+ + staticDepsCache, staticDepsCurrent,
187
+ compilation,
188
+ parentStaticDependentModule
189
+ )
190
+ );
191
+
192
+ - DependencyExtractionWebpackPlugin.#staticDepsCache.set( block, result );
193
+ - DependencyExtractionWebpackPlugin.#staticDepsCurrent.delete( block );
194
+ + staticDepsCache.set( block, result );
195
+ + staticDepsCurrent.delete( block );
196
+ return result;
197
+ }
198
+ }
@@ -0,0 +1,34 @@
1
+ diff --git a/src/rules/listStyle.js b/src/rules/listStyle.js
2
+ index ea7d5bc68cea664beaef42c1afac587b3014a745..c4f8831a6a7e45d5fed03f72d3b54b3d50f8a7ec 100644
3
+ --- a/src/rules/listStyle.js
4
+ +++ b/src/rules/listStyle.js
5
+ @@ -14,6 +14,9 @@ module.exports = function listStyleNormalizer(listStyle) {
6
+ const order = { type: '', position: '', image: '' };
7
+
8
+ listStyle.walk((decl) => {
9
+ + if (decl.listStyleAlreadyWalked) {
10
+ + return;
11
+ + }
12
+ if (decl.type === 'word') {
13
+ if (definedTypes.has(decl.value)) {
14
+ // its a type field
15
+ @@ -36,9 +39,19 @@ module.exports = function listStyleNormalizer(listStyle) {
16
+ }
17
+ }
18
+ if (decl.type === 'function') {
19
+ + markFunctionNodesAsProcessed(decl);
20
+ order.image = `${order.image} ${valueParser.stringify(decl)}`;
21
+ }
22
+ });
23
+
24
+ return `${order.type.trim()} ${order.position.trim()} ${order.image.trim()}`.trim();
25
+ };
26
+ +
27
+ +function markFunctionNodesAsProcessed(decl) {
28
+ + if (decl.nodes) {
29
+ + for (const node of decl.nodes) {
30
+ + node.listStyleAlreadyWalked = true;
31
+ + markFunctionNodesAsProcessed(node);
32
+ + }
33
+ + }
34
+ +}
package/pnpmfile.mjs CHANGED
@@ -5,8 +5,8 @@ import { reactDependencies } from "./shared.mjs";
5
5
  * A map of "<package id>[@<version identifier>]" -> "file in the 'patches' folder" pairs
6
6
  */
7
7
  const activePatches = {
8
- // "webpack@5.*": "webpack.patch"
9
- "@wordpress/dependency-extraction-webpack-plugin@6.*": "@wordpress__dependency-extraction-webpack-plugin.patch"
8
+ "@wordpress/dependency-extraction-webpack-plugin@6.*": "@wordpress__dependency-extraction-webpack-plugin.patch",
9
+ "postcss-ordered-values": "postcss-ordered-values.patch"
10
10
  };
11
11
  const globalForcePinDependenciesRegex = false; ///^@wordpress\//;
12
12
  const dependencyKeys = ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies'];