@atlassian/webresource-webpack-plugin 7.0.4 → 7.0.5
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 +17 -0
- package/dist/AppResources.d.ts +1 -0
- package/dist/AppResources.js +17 -5
- package/dist/AppResources.js.map +1 -1
- package/dist/WebpackHelpers.d.ts +1 -0
- package/dist/WebpackHelpers.js +15 -1
- package/dist/WebpackHelpers.js.map +1 -1
- package/dist/helpers/compiled-css.d.ts +4 -0
- package/dist/helpers/compiled-css.js +9 -0
- package/dist/helpers/compiled-css.js.map +1 -0
- package/package.json +12 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,23 @@
|
|
|
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
|
+
### [7.0.5](https://bitbucket.org/atlassianlabs/fe-server/branches/compare/@atlassian/webresource-webpack-plugin@7.0.5..@atlassian/webresource-webpack-plugin@7.0.4) (2025-09-09)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **@atlassian/webpack-webresource-plugin:** both async and sync chunks now have a precedence on name and fallback to id as webresource key ([f665572](https://bitbucket.org/atlassianlabs/fe-server/commits/f665572e9f02b9bfc93543bee68dd5f1b8973461))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### [7.0.5](https://bitbucket.org/atlassianlabs/fe-server/branches/compare/@atlassian/webresource-webpack-plugin@7.0.5..@atlassian/webresource-webpack-plugin@7.0.4) (2025-09-09)
|
|
16
|
+
|
|
17
|
+
### Bug Fixes
|
|
18
|
+
|
|
19
|
+
* [DCA11Y-2170](https://hello.jira.atlassian.cloud/browse/DCA11Y-2170) Fixed async chunks missing a web-resource dependency on [@compiled/css](https://www.npmjs.com/package/@compiled/css) split chunks
|
|
20
|
+
* [DCA11Y-2170](https://hello.jira.atlassian.cloud/browse/DCA11Y-2170) Fixed two separate web-resource definitions being created when there was a split chunk used by both a synchronous and asynchronous chunk
|
|
21
|
+
* [DCA11Y-2170](https://hello.jira.atlassian.cloud/browse/DCA11Y-2170) Fixed async chunk web-resource keys using the chunk name (if defined) instead of the chunk ID
|
|
22
|
+
|
|
6
23
|
### [7.0.4](https://bitbucket.org/atlassianlabs/fe-server/branches/compare/@atlassian/webresource-webpack-plugin@7.0.4..@atlassian/webresource-webpack-plugin@7.0.3) (2025-08-27)
|
|
7
24
|
|
|
8
25
|
|
package/dist/AppResources.d.ts
CHANGED
|
@@ -29,6 +29,7 @@ export default class AppResources {
|
|
|
29
29
|
getSingleRuntimeFiles(): string[];
|
|
30
30
|
getAssetResourceDescriptor(): ChunkResourceDescriptor;
|
|
31
31
|
getDependencyResourcesFromChunk(chunk: Chunk): string[];
|
|
32
|
+
getWebresourceKeyForChunk(chunk: Chunk, transform?: (name: string) => string): string;
|
|
32
33
|
/**
|
|
33
34
|
* Every entrypoint has an attribute called "chunks".
|
|
34
35
|
* This contains all chunks that are needed to successfully "load" this entrypoint.
|
package/dist/AppResources.js
CHANGED
|
@@ -3,9 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const lodash_1 = require("lodash");
|
|
6
7
|
const flatMap_1 = __importDefault(require("lodash/flatMap"));
|
|
7
8
|
const uniq_1 = __importDefault(require("lodash/uniq"));
|
|
8
9
|
const base_dependencies_1 = require("./deps/base-dependencies");
|
|
10
|
+
const compiled_css_1 = require("./helpers/compiled-css");
|
|
9
11
|
const web_resource_entrypoints_1 = require("./helpers/web-resource-entrypoints");
|
|
10
12
|
const WebpackHelpers_1 = require("./WebpackHelpers");
|
|
11
13
|
const RUNTIME_WR_KEY = 'common-runtime';
|
|
@@ -44,6 +46,12 @@ class AppResources {
|
|
|
44
46
|
getDependencyResourcesFromChunk(chunk) {
|
|
45
47
|
return Array.from(chunk.auxiliaryFiles);
|
|
46
48
|
}
|
|
49
|
+
getWebresourceKeyForChunk(chunk, transform) {
|
|
50
|
+
const chunkName = String(chunk.name || chunk.id);
|
|
51
|
+
// compiled-css is a special chunk generated by @compiled/css - there should be only one such chunk
|
|
52
|
+
// prettier-ignore
|
|
53
|
+
return (!transform || (0, compiled_css_1.chunkLooksLikeCompiledCss)(chunk)) ? chunkName : transform(chunkName);
|
|
54
|
+
}
|
|
47
55
|
/**
|
|
48
56
|
* Every entrypoint has an attribute called "chunks".
|
|
49
57
|
* This contains all chunks that are needed to successfully "load" this entrypoint.
|
|
@@ -70,7 +78,7 @@ class AppResources {
|
|
|
70
78
|
getSyncSplitChunkDependenciesKeyMap(syncSplitChunks) {
|
|
71
79
|
const syncSplitChunkDependencyKeyMap = new Map();
|
|
72
80
|
for (const c of syncSplitChunks) {
|
|
73
|
-
const webResourceKey = `split_${
|
|
81
|
+
const webResourceKey = this.getWebresourceKeyForChunk(c, (name) => `split_${name}`);
|
|
74
82
|
syncSplitChunkDependencyKeyMap.set(c, {
|
|
75
83
|
key: webResourceKey,
|
|
76
84
|
dependency: `${this.options.pluginKey}:${webResourceKey}`,
|
|
@@ -99,10 +107,14 @@ class AppResources {
|
|
|
99
107
|
return (0, WebpackHelpers_1.getAllAsyncChunks)(this.getEntryPoints()).map((c) => {
|
|
100
108
|
const additionalFileDeps = this.getDependencyResourcesFromChunk(c);
|
|
101
109
|
return {
|
|
102
|
-
attributes: { key:
|
|
110
|
+
attributes: { key: this.getWebresourceKeyForChunk(c) },
|
|
103
111
|
externalResources: (0, WebpackHelpers_1.getExternalResourcesForChunk)(this.compilation, c),
|
|
104
112
|
resources: (0, uniq_1.default)([...c.files, ...additionalFileDeps]),
|
|
105
|
-
dependencies: (0, uniq_1.default)([
|
|
113
|
+
dependencies: (0, uniq_1.default)([
|
|
114
|
+
...(0, base_dependencies_1.getBaseDependencies)(),
|
|
115
|
+
...(0, WebpackHelpers_1.getDependenciesForChunks)(this.compilation, c),
|
|
116
|
+
...(0, WebpackHelpers_1.getDependencyForCompiledCss)(this.compilation, c, this.options.pluginKey),
|
|
117
|
+
]),
|
|
106
118
|
contexts: this.options.addAsyncNameAsContext && c.name ? [`async-chunk-${c.name}`] : undefined,
|
|
107
119
|
};
|
|
108
120
|
});
|
|
@@ -160,11 +172,11 @@ class AppResources {
|
|
|
160
172
|
return prodEntryPoints;
|
|
161
173
|
}
|
|
162
174
|
getResourceDescriptors() {
|
|
163
|
-
return []
|
|
175
|
+
return (0, lodash_1.uniqBy)([]
|
|
164
176
|
.concat(this.getSyncSplitChunksResourceDescriptors())
|
|
165
177
|
.concat(this.getAsyncChunksResourceDescriptors())
|
|
166
178
|
.concat(this.getEntryPointsResourceDescriptors())
|
|
167
|
-
.concat(this.getAssetResourceDescriptor());
|
|
179
|
+
.concat(this.getAssetResourceDescriptor()), 'attributes.key');
|
|
168
180
|
}
|
|
169
181
|
}
|
|
170
182
|
exports.default = AppResources;
|
package/dist/AppResources.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppResources.js","sourceRoot":"","sources":["../src/AppResources.ts"],"names":[],"mappings":";;;;;AAAA,6DAAqC;AACrC,uDAA+B;AAG/B,gEAA+D;AAC/D,iFAM4C;AAG5C,
|
|
1
|
+
{"version":3,"file":"AppResources.js","sourceRoot":"","sources":["../src/AppResources.ts"],"names":[],"mappings":"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"}
|
package/dist/WebpackHelpers.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ export declare const getAllAsyncChunks: (entryPoints: Entrypoint[]) => Chunk[];
|
|
|
5
5
|
export declare const getChunkModules: (compilation: Compilation, chunk: Chunk) => Module[];
|
|
6
6
|
export declare const getExternalResourcesForChunk: (compilation: Compilation, chunk: Chunk) => WrmResource[];
|
|
7
7
|
export declare const getDependenciesForChunks: (compilation: Compilation, val: Chunk | Chunk[]) => string[];
|
|
8
|
+
export declare const getDependencyForCompiledCss: (compilation: Compilation, chunk: Chunk, pluginKey: string) => string[];
|
|
8
9
|
export declare const isRunningInProductionMode: (compiler: Compiler) => boolean;
|
|
9
10
|
export declare const isSingleRuntime: (compiler: Compiler) => boolean;
|
|
10
11
|
export declare const extractLibraryDetailsFromWebpackConfig: (compiler: Compiler) => {
|
package/dist/WebpackHelpers.js
CHANGED
|
@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.extractLibraryDetailsFromWebpackConfig = exports.isSingleRuntime = exports.isRunningInProductionMode = exports.getDependenciesForChunks = exports.getExternalResourcesForChunk = exports.getChunkModules = exports.getAllAsyncChunks = void 0;
|
|
6
|
+
exports.extractLibraryDetailsFromWebpackConfig = exports.isSingleRuntime = exports.isRunningInProductionMode = exports.getDependencyForCompiledCss = exports.getDependenciesForChunks = exports.getExternalResourcesForChunk = exports.getChunkModules = exports.getAllAsyncChunks = void 0;
|
|
7
7
|
const flatMap_1 = __importDefault(require("lodash/flatMap"));
|
|
8
8
|
const uniq_1 = __importDefault(require("lodash/uniq"));
|
|
9
|
+
const compiled_css_1 = require("./helpers/compiled-css");
|
|
9
10
|
const ProvidedExternalDependencyModule_1 = __importDefault(require("./webpack-modules/ProvidedExternalDependencyModule"));
|
|
10
11
|
const WrmDependencyModule_1 = __importDefault(require("./webpack-modules/WrmDependencyModule"));
|
|
11
12
|
const WrmResourceModule_1 = __importDefault(require("./webpack-modules/WrmResourceModule"));
|
|
@@ -76,6 +77,19 @@ const getDependenciesForChunks = (compilation, val) => {
|
|
|
76
77
|
return Array.from(externalDeps);
|
|
77
78
|
};
|
|
78
79
|
exports.getDependenciesForChunks = getDependenciesForChunks;
|
|
80
|
+
const getDependencyForCompiledCss = (compilation, chunk, pluginKey) => {
|
|
81
|
+
const modules = (0, exports.getChunkModules)(compilation, chunk);
|
|
82
|
+
const looksLikeCompiledCss = (0, compiled_css_1.chunkLooksLikeCompiledCss)(chunk);
|
|
83
|
+
const hasCompiledCss = modules
|
|
84
|
+
.filter((m) => m.constructor.name === 'NormalModule')
|
|
85
|
+
.some((m) => {
|
|
86
|
+
const request = m.request;
|
|
87
|
+
// we're overly broad here to avoid unexpected internal changes in compiled-css causing us to miss the dependency
|
|
88
|
+
return request.includes(compiled_css_1.COMPILED_CSS_SCOPE) || request.endsWith(compiled_css_1.COMPILED_CSS_FILENAME);
|
|
89
|
+
});
|
|
90
|
+
return !looksLikeCompiledCss && hasCompiledCss ? [`${pluginKey}:compiled-css`] : [];
|
|
91
|
+
};
|
|
92
|
+
exports.getDependencyForCompiledCss = getDependencyForCompiledCss;
|
|
79
93
|
const isRunningInProductionMode = (compiler) => {
|
|
80
94
|
const { mode } = compiler.options;
|
|
81
95
|
return mode === 'production' || (mode === 'none' && process.env.NODE_ENV === 'production');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebpackHelpers.js","sourceRoot":"","sources":["../src/WebpackHelpers.ts"],"names":[],"mappings":";;;;;;AAAA,6DAAqC;AACrC,uDAA+B;
|
|
1
|
+
{"version":3,"file":"WebpackHelpers.js","sourceRoot":"","sources":["../src/WebpackHelpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.chunkLooksLikeCompiledCss = exports.COMPILED_CSS_FILENAME = exports.COMPILED_CSS_SCOPE = void 0;
|
|
4
|
+
// These are not exported from @compiled & we don't want to force a dependency on it for our consumers
|
|
5
|
+
exports.COMPILED_CSS_SCOPE = '@compiled';
|
|
6
|
+
exports.COMPILED_CSS_FILENAME = 'compiled-css.css';
|
|
7
|
+
const chunkLooksLikeCompiledCss = (chunk) => (chunk.name ?? chunk.id) === 'compiled-css';
|
|
8
|
+
exports.chunkLooksLikeCompiledCss = chunkLooksLikeCompiledCss;
|
|
9
|
+
//# sourceMappingURL=compiled-css.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compiled-css.js","sourceRoot":"","sources":["../../src/helpers/compiled-css.ts"],"names":[],"mappings":";;;AAEA,sGAAsG;AACzF,QAAA,kBAAkB,GAAG,WAAW,CAAC;AACjC,QAAA,qBAAqB,GAAG,kBAAkB,CAAC;AAEjD,MAAM,yBAAyB,GAAG,CAAC,KAAY,EAAW,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC,KAAK,cAAc,CAAC;AAAnG,QAAA,yBAAyB,6BAA0E"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlassian/webresource-webpack-plugin",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.5",
|
|
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",
|
|
@@ -69,6 +69,13 @@
|
|
|
69
69
|
"webpack-sources": "^1 || ^2"
|
|
70
70
|
},
|
|
71
71
|
"devDependencies": {
|
|
72
|
+
"@babel/core": "^7.28.3",
|
|
73
|
+
"@babel/preset-env": "^7.28.3",
|
|
74
|
+
"@babel/preset-react": "^7.27.1",
|
|
75
|
+
"@compiled/babel-plugin": "^0.38.1",
|
|
76
|
+
"@compiled/babel-plugin-strip-runtime": "^0.38.0",
|
|
77
|
+
"@compiled/react": "^0.18.6",
|
|
78
|
+
"@compiled/webpack-loader": "^0.19.6",
|
|
72
79
|
"@types/glob": "7.2.0",
|
|
73
80
|
"@types/lodash": "4.14.202",
|
|
74
81
|
"@types/node": "22.17.2",
|
|
@@ -77,6 +84,7 @@
|
|
|
77
84
|
"@types/uuid": "8.3.4",
|
|
78
85
|
"@types/webpack-sources": "3.2.3",
|
|
79
86
|
"@types/xml-parser": "1.2.33",
|
|
87
|
+
"babel-loader": "^10.0.0",
|
|
80
88
|
"css-loader": "5.2.7",
|
|
81
89
|
"del": "6.1.1",
|
|
82
90
|
"esbuild": "0.25.9",
|
|
@@ -86,6 +94,8 @@
|
|
|
86
94
|
"jest": "29.7.0",
|
|
87
95
|
"jquery": "3.6.0",
|
|
88
96
|
"mini-css-extract-plugin": "2.8.1",
|
|
97
|
+
"react": "^18.3.1",
|
|
98
|
+
"react-dom": "^18.3.1",
|
|
89
99
|
"style-loader": "2.0.0",
|
|
90
100
|
"ts-node": "10.4.0",
|
|
91
101
|
"typescript": "5.9.2",
|
|
@@ -116,5 +126,5 @@
|
|
|
116
126
|
"test": "jest",
|
|
117
127
|
"test:watch": "jest --watch"
|
|
118
128
|
},
|
|
119
|
-
"gitHead": "
|
|
129
|
+
"gitHead": "cb2b4db157232d3d9df2a048271e21534b808afa"
|
|
120
130
|
}
|