Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: update all non-major dependencies #27026

Merged
merged 1 commit into from Feb 2, 2024
Merged

build: update all non-major dependencies #27026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Expand Up @@ -148,7 +148,7 @@
"http-proxy": "^1.18.1",
"http-proxy-middleware": "2.0.6",
"https-proxy-agent": "7.0.2",
"husky": "9.0.9",
"husky": "9.0.10",
"ini": "4.1.1",
"inquirer": "9.2.13",
"jasmine": "^5.0.0",
Expand All @@ -168,7 +168,7 @@
"license-webpack-plugin": "4.0.2",
"loader-utils": "3.2.1",
"magic-string": "0.30.6",
"mini-css-extract-plugin": "2.7.7",
"mini-css-extract-plugin": "2.8.0",
"mrmime": "2.0.0",
"ng-packagr": "17.1.2",
"npm": "^8.11.0",
Expand Down Expand Up @@ -212,7 +212,7 @@
"verdaccio-auth-memory": "^10.0.0",
"vite": "5.0.12",
"watchpack": "2.4.0",
"webpack": "5.90.0",
"webpack": "5.90.1",
"webpack-dev-middleware": "6.1.1",
"webpack-dev-server": "4.15.1",
"webpack-merge": "5.10.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/angular_devkit/build_angular/package.json
View file
Open in desktop
Expand Up @@ -42,7 +42,7 @@
"license-webpack-plugin": "4.0.2",
"loader-utils": "3.2.1",
"magic-string": "0.30.6",
"mini-css-extract-plugin": "2.7.7",
"mini-css-extract-plugin": "2.8.0",
"mrmime": "2.0.0",
"open": "8.4.2",
"ora": "5.4.1",
Expand All @@ -64,7 +64,7 @@
"undici": "6.6.0",
"vite": "5.0.12",
"watchpack": "2.4.0",
"webpack": "5.90.0",
"webpack": "5.90.1",
"webpack-dev-middleware": "6.1.1",
"webpack-dev-server": "4.15.1",
"webpack-merge": "5.10.0",
Expand Down
5 changes: 3 additions & 2 deletions packages/angular_devkit/build_angular/src/builders/browser/index.ts
View file
Open in desktop
Expand Up @@ -173,8 +173,9 @@ export function buildWebpackBrowser(
logging:
transforms.logging ||
((stats, config) => {
if (options.verbose) {
context.logger.info(stats.toString(config.stats));
if (options.verbose && config.stats !== false) {
const statsOptions = config.stats === true ? undefined : config.stats;
context.logger.info(stats.toString(statsOptions));
}
}),
}).pipe(
Expand Down
2 changes: 1 addition & 1 deletion ...ages/angular_devkit/build_angular/src/builders/browser/tests/options/named-chunks_spec.ts
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';

const MAIN_OUTPUT = 'dist/main.js';
const NAMED_LAZY_OUTPUT = 'dist/src_lazy-module_ts.js';
const UNNAMED_LAZY_OUTPUT = 'dist/631.js';
const UNNAMED_LAZY_OUTPUT = 'dist/208.js';

describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
describe('Option: "namedChunks"', () => {
Expand Down
5 changes: 3 additions & 2 deletions packages/angular_devkit/build_angular/src/builders/server/index.ts
View file
Open in desktop
Expand Up @@ -79,8 +79,9 @@ export function execute(
return runWebpack(config, context, {
webpackFactory: require('webpack') as typeof webpack,
logging: (stats, config) => {
if (options.verbose) {
context.logger.info(stats.toString(config.stats));
if (options.verbose && config.stats !== false) {
const statsOptions = config.stats === true ? undefined : config.stats;
context.logger.info(stats.toString(statsOptions));
}
},
}).pipe(
Expand Down
5 changes: 3 additions & 2 deletions packages/angular_devkit/build_angular/src/tools/webpack/utils/stats.ts
View file
Open in desktop
Expand Up @@ -542,8 +542,9 @@ export function createWebpackLoggingCallback(
];

return (stats, config) => {
if (verbose) {
logger.info(stats.toString(config.stats));
if (verbose && config.stats !== false) {
const statsOptions = config.stats === true ? undefined : config.stats;
logger.info(stats.toString(statsOptions));
}

const rawStats = stats.toJson(getStatsOptions(false));
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_webpack/package.json
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@
},
"devDependencies": {
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
"webpack": "5.90.0"
"webpack": "5.90.1"
},
"peerDependencies": {
"webpack": "^5.30.0",
Expand Down
13 changes: 9 additions & 4 deletions packages/angular_devkit/build_webpack/src/builders/webpack-dev-server/index.ts
View file
Open in desktop
Expand Up @@ -58,10 +58,15 @@ export function runWebpackDevServer(
return new WebpackDevServer(config, webpack);
};

const log: WebpackLoggingCallback =
options.logging || ((stats, config) => context.logger.info(stats.toString(config.stats)));

const shouldProvideStats = options.shouldProvideStats ?? true;
const {
logging: log = (stats, config) => {
if (config.stats !== false) {
const statsOptions = config.stats === true ? undefined : config.stats;
context.logger.info(stats.toString(statsOptions));
}
},
shouldProvideStats = true,
} = options;

return createWebpack({ ...config, watch: false }).pipe(
switchMap(
Expand Down
8 changes: 7 additions & 1 deletion packages/angular_devkit/build_webpack/src/builders/webpack/index.ts
View file
Open in desktop
Expand Up @@ -38,9 +38,15 @@ export function runWebpack(
} = {},
): Observable<BuildResult> {
const {
logging: log = (stats, config) => context.logger.info(stats.toString(config.stats)),
logging: log = (stats, config) => {
if (config.stats !== false) {
const statsOptions = config.stats === true ? undefined : config.stats;
context.logger.info(stats.toString(statsOptions));
}
},
shouldProvideStats = true,
} = options;

const createWebpack = (c: webpack.Configuration) => {
if (options.webpackFactory) {
const result = options.webpackFactory(c);
Expand Down
2 changes: 1 addition & 1 deletion packages/ngtools/webpack/package.json
View file
Open in desktop
Expand Up @@ -31,6 +31,6 @@
"@angular/compiler": "17.2.0-next.1",
"@angular/compiler-cli": "17.2.0-next.1",
"typescript": "5.3.3",
"webpack": "5.90.0"
"webpack": "5.90.1"
}
}
26 changes: 17 additions & 9 deletions yarn.lock
View file
Open in desktop
Expand Up @@ -7950,10 +7950,10 @@ humanize-ms@^1.2.1:
dependencies:
ms "^2.0.0"

husky@9.0.9:
version "9.0.9"
resolved "https://registry.yarnpkg.com/husky/-/husky-9.0.9.tgz#3a48d0666bf871de14871865f929a5dceabc07f8"
integrity sha512-eW92PRr1XPKDWd7/iM2JvAl9gEKK3TF69yvbllQtKSYBw+Wtoi+P38NqH1Z7++sSd80FBkFagBFJkoQvMhCnGw==
husky@9.0.10:
version "9.0.10"
resolved "https://registry.yarnpkg.com/husky/-/husky-9.0.10.tgz#ddca8908deb5f244e9286865ebc80b54387672c2"
integrity sha512-TQGNknoiy6bURzIO77pPRu+XHi6zI7T93rX+QnJsoYFf3xdjKOur+IlfqzJGMHIK/wXrLg+GsvMs8Op7vI2jVA==

iconv-lite@0.4.24, iconv-lite@^0.4.24:
version "0.4.24"
Expand Down Expand Up @@ -9581,6 +9581,14 @@ mini-css-extract-plugin@2.7.7:
dependencies:
schema-utils "^4.0.0"

mini-css-extract-plugin@2.8.0:
version "2.8.0"
resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.0.tgz#1aeae2a90a954b6426c9e8311eab36b450f553a0"
integrity sha512-CxmUYPFcTgET1zImteG/LZOy/4T5rTojesQXkSNBiquhydn78tfbCE9sjIjnJ/UcjNjOC1bphTCCW5rrS7cXAg==
dependencies:
schema-utils "^4.0.0"
tapable "^2.2.1"

minimalistic-assert@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
Expand Down Expand Up @@ -12564,7 +12572,7 @@ table-layout@^3.0.0:
typical "^7.1.1"
wordwrapjs "^5.1.0"

tapable@^2.1.1, tapable@^2.2.0:
tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
Expand Down Expand Up @@ -13485,10 +13493,10 @@ webpack@5.89.0:
watchpack "^2.4.0"
webpack-sources "^3.2.3"

webpack@5.90.0:
version "5.90.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.90.0.tgz#313bfe16080d8b2fee6e29b6c986c0714ad4290e"
integrity sha512-bdmyXRCXeeNIePv6R6tGPyy20aUobw4Zy8r0LUS2EWO+U+Ke/gYDgsCh7bl5rB6jPpr4r0SZa6dPxBxLooDT3w==
webpack@5.90.1:
version "5.90.1"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.90.1.tgz#62ab0c097d7cbe83d32523dbfbb645cdb7c3c01c"
integrity sha512-SstPdlAC5IvgFnhiRok8hqJo/+ArAbNv7rhU4fnWGHNVfN59HSQFaxZDSAL3IFG2YmqxuRs+IU33milSxbPlog==
dependencies:
"@types/eslint-scope" "^3.7.3"
"@types/estree" "^1.0.5"
Expand Down