@nx/webpack 19.7.3 → 19.8.0-beta.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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/webpack",
|
|
3
|
-
"version": "19.
|
|
3
|
+
"version": "19.8.0-beta.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
|
|
6
6
|
"repository": {
|
|
@@ -69,9 +69,9 @@
|
|
|
69
69
|
"webpack-dev-server": "^5.0.4",
|
|
70
70
|
"webpack-node-externals": "^3.0.0",
|
|
71
71
|
"webpack-subresource-integrity": "^5.1.0",
|
|
72
|
-
"@nx/devkit": "19.
|
|
73
|
-
"@nx/js": "19.
|
|
74
|
-
"@nrwl/webpack": "19.
|
|
72
|
+
"@nx/devkit": "19.8.0-beta.0",
|
|
73
|
+
"@nx/js": "19.8.0-beta.0",
|
|
74
|
+
"@nrwl/webpack": "19.8.0-beta.0"
|
|
75
75
|
},
|
|
76
76
|
"publishConfig": {
|
|
77
77
|
"access": "public"
|
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
import { type Tree } from '@nx/devkit';
|
|
2
|
+
import { logger as devkitLogger } from 'nx/src/devkit-exports';
|
|
2
3
|
interface Schema {
|
|
3
4
|
project?: string;
|
|
4
5
|
skipFormat?: boolean;
|
|
5
6
|
}
|
|
6
7
|
export declare function convertToInferred(tree: Tree, options: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
|
|
8
|
+
export declare function createCollectingLogger(): typeof devkitLogger & {
|
|
9
|
+
loggedMessages: Map<string, string[]>;
|
|
10
|
+
flushLogs: (filter?: (message: string) => boolean) => void;
|
|
11
|
+
};
|
|
7
12
|
export {};
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertToInferred = convertToInferred;
|
|
4
|
+
exports.createCollectingLogger = createCollectingLogger;
|
|
4
5
|
const devkit_1 = require("@nx/devkit");
|
|
5
6
|
const aggregate_log_util_1 = require("@nx/devkit/src/generators/plugin-migrations/aggregate-log-util");
|
|
6
7
|
const executor_to_plugin_migrator_1 = require("@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator");
|
|
@@ -8,6 +9,7 @@ const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
|
8
9
|
const plugin_1 = require("../../plugins/plugin");
|
|
9
10
|
const versions_1 = require("../../utils/versions");
|
|
10
11
|
const utils_1 = require("./utils");
|
|
12
|
+
const devkit_exports_1 = require("nx/src/devkit-exports");
|
|
11
13
|
async function convertToInferred(tree, options) {
|
|
12
14
|
const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
|
|
13
15
|
const migrationContext = {
|
|
@@ -15,6 +17,7 @@ async function convertToInferred(tree, options) {
|
|
|
15
17
|
projectGraph,
|
|
16
18
|
workspaceRoot: tree.root,
|
|
17
19
|
};
|
|
20
|
+
const logger = createCollectingLogger();
|
|
18
21
|
const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/webpack/plugin', plugin_1.createNodesV2, {
|
|
19
22
|
buildTargetName: 'build',
|
|
20
23
|
previewTargetName: 'preview',
|
|
@@ -33,9 +36,22 @@ async function convertToInferred(tree, options) {
|
|
|
33
36
|
targetPluginOptionMapper: (target) => ({ serveTargetName: target }),
|
|
34
37
|
skipProjectFilter: skipProjectFilterFactory(tree),
|
|
35
38
|
},
|
|
36
|
-
], options.project);
|
|
39
|
+
], options.project, logger);
|
|
37
40
|
if (migratedProjects.size === 0) {
|
|
38
|
-
|
|
41
|
+
const convertMessage = [...logger.loggedMessages.values()]
|
|
42
|
+
.flat()
|
|
43
|
+
.find((v) => v.includes('@nx/webpack:convert-config-to-webpack-plugin'));
|
|
44
|
+
if (convertMessage.length > 0) {
|
|
45
|
+
logger.flushLogs((message) => !convertMessage.includes(message));
|
|
46
|
+
throw new Error(convertMessage);
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
logger.flushLogs();
|
|
50
|
+
throw new executor_to_plugin_migrator_1.NoTargetsToMigrateError();
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
logger.flushLogs();
|
|
39
55
|
}
|
|
40
56
|
const installCallback = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { 'webpack-cli': versions_1.webpackCliVersion }, undefined, true);
|
|
41
57
|
if (!options.skipFormat) {
|
|
@@ -68,3 +84,31 @@ function skipProjectFilterFactory(tree) {
|
|
|
68
84
|
return false;
|
|
69
85
|
};
|
|
70
86
|
}
|
|
87
|
+
function createCollectingLogger() {
|
|
88
|
+
const loggedMessages = new Map();
|
|
89
|
+
const flushLogs = (filter) => {
|
|
90
|
+
loggedMessages.forEach((messages, method) => {
|
|
91
|
+
messages.forEach((message) => {
|
|
92
|
+
if (!filter || filter(message)) {
|
|
93
|
+
devkit_exports_1.logger[method](message);
|
|
94
|
+
}
|
|
95
|
+
});
|
|
96
|
+
});
|
|
97
|
+
};
|
|
98
|
+
return new Proxy({ ...devkit_exports_1.logger, loggedMessages, flushLogs }, {
|
|
99
|
+
get(target, property) {
|
|
100
|
+
const originalMethod = target[property];
|
|
101
|
+
if (typeof originalMethod === 'function') {
|
|
102
|
+
return (...args) => {
|
|
103
|
+
const message = args.join(' ');
|
|
104
|
+
const propertyString = String(property);
|
|
105
|
+
if (!loggedMessages.has(message)) {
|
|
106
|
+
loggedMessages.set(propertyString, []);
|
|
107
|
+
}
|
|
108
|
+
loggedMessages.get(propertyString).push(message);
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
return originalMethod;
|
|
112
|
+
},
|
|
113
|
+
});
|
|
114
|
+
}
|