@atlassian/webresource-webpack-plugin 7.1.5 → 7.1.6
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
|
@@ -3,6 +3,14 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## <small>7.1.6 (2026-02-23)</small>
|
|
7
|
+
|
|
8
|
+
* fix(@atlassian/webresource-webpack-plugin): deduplication with same resources ([12baf70](https://bitbucket.org/atlassianlabs/fe-server/commits/12baf70))
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
6
14
|
## <small>7.1.5 (2026-02-21)</small>
|
|
7
15
|
|
|
8
16
|
* fix(@atlassian/webresource-webpack-plugin): handle default values for chunkLoadingGlobal ([a341f63](https://bitbucket.org/atlassianlabs/fe-server/commits/a341f63))
|
package/dist/WebpackHelpers.js
CHANGED
|
@@ -91,17 +91,23 @@ const getResourcesForChunks = (compilation, chunks, auxiliaryChunks, resourceAss
|
|
|
91
91
|
exports.getResourcesForChunks = getResourcesForChunks;
|
|
92
92
|
const getExternalResourcesForChunks = (compilation, val, resourceModuleMap) => {
|
|
93
93
|
const chunks = Array.isArray(val) ? val : [val];
|
|
94
|
-
|
|
94
|
+
// Use a Map keyed by name+location to deduplicate by value, not by
|
|
95
|
+
// object reference. A plain Set would keep duplicate {name, location}
|
|
96
|
+
// pairs that came from different module instances in the same chunk.
|
|
97
|
+
const deduped = new Map();
|
|
95
98
|
for (const chunk of chunks) {
|
|
96
99
|
for (const module of (0, exports.getChunkModules)(compilation, chunk)) {
|
|
97
100
|
const moduleKey = module.identifier();
|
|
98
101
|
const resourcesForModule = [...(resourceModuleMap.get(moduleKey) || [])];
|
|
99
102
|
for (const resource of resourcesForModule) {
|
|
100
|
-
|
|
103
|
+
const key = JSON.stringify(resource);
|
|
104
|
+
if (!deduped.has(key)) {
|
|
105
|
+
deduped.set(key, resource);
|
|
106
|
+
}
|
|
101
107
|
}
|
|
102
108
|
}
|
|
103
109
|
}
|
|
104
|
-
return Array.from(
|
|
110
|
+
return Array.from(deduped.values());
|
|
105
111
|
};
|
|
106
112
|
exports.getExternalResourcesForChunks = getExternalResourcesForChunks;
|
|
107
113
|
const getAllAssetFiles = (compilation) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebpackHelpers.js","sourceRoot":"","sources":["../src/WebpackHelpers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"WebpackHelpers.js","sourceRoot":"","sources":["../src/WebpackHelpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -80,13 +80,23 @@ const generateResourceElement = (resource, parameterMap) => {
|
|
|
80
80
|
}, children);
|
|
81
81
|
};
|
|
82
82
|
const renderResources = (parameterMap, resources) => {
|
|
83
|
+
if (!resources)
|
|
84
|
+
return [];
|
|
85
|
+
// Deduplicate by full resource (name + location), consistent with getExternalResourcesForChunks.
|
|
86
|
+
// Throw when the same resource appears twice; allow same name with different location.
|
|
87
|
+
const seen = new Set();
|
|
83
88
|
return resources
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
89
|
+
.filter(Boolean)
|
|
90
|
+
.filter((resource) => !resource.location.endsWith('.map'))
|
|
91
|
+
.filter((resource) => {
|
|
92
|
+
const key = JSON.stringify(resource);
|
|
93
|
+
if (seen.has(key)) {
|
|
94
|
+
throw new Error(`Duplicate web resource: name="${resource.name}", location="${resource.location}". Each resource must be unique by name and location.`);
|
|
95
|
+
}
|
|
96
|
+
seen.add(key);
|
|
97
|
+
return true;
|
|
98
|
+
})
|
|
99
|
+
.map((resource) => generateResourceElement(resource, parameterMap));
|
|
90
100
|
};
|
|
91
101
|
const renderWebResource = (webresource, descriptors, options) => {
|
|
92
102
|
const { resources = [], externalResources = [], contexts, dependencies, deprecationInfo, conditions, dataProviders, } = webresource;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-resource-generator.js","sourceRoot":"","sources":["../../src/helpers/web-resource-generator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"web-resource-generator.js","sourceRoot":"","sources":["../../src/helpers/web-resource-generator.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAYxB,wEAAgD;AAChD,oFAAuD;AACvD,+DAAmE;AACnE,+BAAsC;AAEtC;;GAEG;AACH,MAAM,mBAAmB,GAAG,CAAC,aAAyC,EAAE,EAAE;IACxE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChE,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CACxC,IAAA,mBAAa,EAAC,MAAM,EAAE;QACpB,GAAG,EAAE,YAAY,CAAC,GAAG;QACrB,KAAK,EAAE,YAAY,CAAC,KAAK;KAC1B,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,SAAS,cAAc,CAAC,QAA8B;IACpD,OAAO,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,YAAY,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACpF,CAAC;AAED,SAAS,kBAAkB,CAAC,YAAkC;IAC5D,OAAO,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,eAAe,UAAU,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACxG,CAAC;AAED,SAAS,qBAAqB,CAC5B,eAA4C,EAC5C,SAAiB,EACjB,sBAAiD;IAEjD,IAAI,eAAe,EAAE,CAAC;QACpB,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;YAC7B,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC5B,CAAC;QACD,MAAM,UAAU,GAA8D,EAAE,CAAC;QACjF,IAAI,eAAe,CAAC,YAAY,EAAE,CAAC;YACjC,UAAU,CAAC,KAAK,GAAG,eAAe,CAAC,YAAY,CAAC;QAClD,CAAC;QACD,IAAI,eAAe,CAAC,eAAe,EAAE,CAAC;YACpC,UAAU,CAAC,MAAM,GAAG,eAAe,CAAC,eAAe,CAAC;QACtD,CAAC;QACD,IAAI,eAAe,CAAC,WAAW,EAAE,CAAC;YAChC,UAAU,CAAC,WAAW,GAAG,+BAA+B,CACtD,eAAe,CAAC,WAAW,EAC3B,SAAS,EACT,sBAAsB,CACvB,CAAC;QACJ,CAAC;QAED,OAAO,CAAC,IAAA,mBAAa,EAAC,YAAY,EAAE,UAAU,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC;IAC9E,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;;;GAMG;AACH,SAAS,+BAA+B,CACtC,yBAAiC,EACjC,SAAiB,EACjB,sBAAiD;IAEjD,4GAA4G;IAC5G,IAAI,yBAAyB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5C,OAAO,yBAAyB,CAAC;IACnC,CAAC;IAED,wGAAwG;IACxG,MAAM,oBAAoB,GAAG,sBAAsB,CAAC,IAAI,CACtD,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,KAAK,yBAAyB,CAC7E,CAAC;IACF,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;QACvC,OAAO,GAAG,SAAS,IAAI,oBAAoB,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;IAC/D,CAAC;IAED,qHAAqH;IACrH,OAAO,GAAG,SAAS,IAAI,yBAAyB,EAAE,CAAC;AACrD,CAAC;AAED,MAAM,uBAAuB,GAAG,CAAC,QAAqB,EAAE,YAA8B,EAAE,EAAE;IACxF,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;IACpC,MAAM,gBAAgB,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;IAC5D,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,gBAAgB,GAAG,CAAC,UAAyB,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAA,mBAAa,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;IAC1G,UAAU,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAErC,OAAO,IAAA,mBAAa,EAClB,UAAU,EACV;QACE,IAAI,EAAE,UAAU;QAChB,IAAI;QACJ,QAAQ;KACT,EACD,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,YAA8B,EAAE,SAAwB,EAAE,EAAE;IACnF,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IAE1B,iGAAiG;IACjG,uFAAuF;IACvF,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,OAAO,SAAS;SACb,MAAM,CAAC,OAAO,CAAC;SACf,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;SACzD,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE;QACnB,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACrC,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CACb,iCAAiC,QAAQ,CAAC,IAAI,gBAAgB,QAAQ,CAAC,QAAQ,uDAAuD,CACvI,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACd,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,uBAAuB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;AACxE,CAAC,CAAC;AAEK,MAAM,iBAAiB,GAAG,CAC/B,WAAoC,EACpC,WAAsC,EACtC,OAAgB,EAChB,EAAE;IACF,MAAM,EACJ,SAAS,GAAG,EAAE,EACd,iBAAiB,GAAG,EAAE,EACtB,QAAQ,EACR,YAAY,EACZ,eAAe,EACf,UAAU,EACV,aAAa,GACd,GAAG,WAAW,CAAC;IAChB,MAAM,UAAU,GAAG,IAAA,gDAA0B,EAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IACtE,MAAM,YAAY,GAAkB,EAAE,CAAC;IACvC,MAAM,QAAQ,GAAG,EAAE,CAAC;IAEpB,MAAM,iBAAiB,GAAG,CAAC,QAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,cAAc,GAAG,QAAQ,CAAC;IAElF,iEAAiE;IACjE,YAAY,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAEhG,4EAA4E;IAC5E,YAAY,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,iBAAiB,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAEnH,QAAQ,CAAC,IAAI,CACX,GAAG,IAAA,+BAAgB,EAAC,OAAO,CAAC,iBAAsC,EAAE,YAAY,CAAC,EACjF,GAAG,cAAc,CAAC,QAAQ,CAAC,EAC3B,GAAG,kBAAkB,CAAC,YAAY,CAAC,EACnC,GAAG,qBAAqB,CAAC,eAAe,EAAE,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,EACzE,GAAG,eAAe,CAAC,OAAO,CAAC,gBAAoC,EAAE,YAAY,CAAC,EAC9E,GAAG,mBAAmB,CAAC,aAAa,CAAC,EACrC,IAAA,yBAAe,EAAC,UAAU,CAAC,CAC5B,CAAC;IAEF,OAAO,IAAA,mBAAa,EAAC,cAAc,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;AAC7D,CAAC,CAAC;AArCW,QAAA,iBAAiB,qBAqC5B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlassian/webresource-webpack-plugin",
|
|
3
|
-
"version": "7.1.
|
|
3
|
+
"version": "7.1.6",
|
|
4
4
|
"description": "Auto-generates web-resource definitions from your webpacked code, for usage in an Atlassian product or plugin.",
|
|
5
5
|
"main": "dist/WrmPlugin.js",
|
|
6
6
|
"types": "dist/WrmPlugin.d.ts",
|
|
@@ -131,5 +131,5 @@
|
|
|
131
131
|
"test:watch": "jest --watch",
|
|
132
132
|
"test:ci": "jest --ci --silent --runInBand"
|
|
133
133
|
},
|
|
134
|
-
"gitHead": "
|
|
134
|
+
"gitHead": "415d6e97aecdf8cf776fcc6697757531cf7d5c31"
|
|
135
135
|
}
|