Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"**/remark-parse/trim": "1.0.1",
"**/sharp": "0.32.6",
"**/typescript": "5.1.6",
"**/util": "^0.11.1",
"**/util": "^0.12.5",
"@aws-sdk/client-bedrock-agent-runtime": "^3.744.0",
"@aws-sdk/client-bedrock-runtime": "^3.744.0",
"@aws-sdk/client-kendra": "3.744.0",
Expand Down Expand Up @@ -1833,7 +1833,7 @@
"msw": "~2.5.2",
"mutation-observer": "^1.0.3",
"nock": "12.0.3",
"node-libs-browser": "^2.2.1",
"node-stdlib-browser": "^1.3.1",
"nyc": "^15.1.0",
"oboe": "^2.1.4",
"openapi-types": "^12.1.3",
Expand Down
8 changes: 8 additions & 0 deletions packages/kbn-optimizer/src/worker/webpack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,14 @@ export function getWebpackConfig(
worker.reactVersion === '18' ? 'react-dom-18/profiling' : 'react-dom/profiling',
'scheduler/tracing': 'scheduler/tracing-profiling',
react: worker.reactVersion === '18' ? 'react-18' : 'react',
buffer: [
Path.resolve(worker.repoRoot, 'node_modules/node-stdlib-browser/node_modules/buffer'),
require.resolve('buffer'),
],
punycode: [
Path.resolve(worker.repoRoot, 'node_modules/node-stdlib-browser/node_modules/punycode'),
require.resolve('punycode'),
],
},
},

Expand Down
4 changes: 2 additions & 2 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -1190,9 +1190,9 @@
"enabled": true
},
{
"groupName": "node-libs-browser",
"groupName": "node-stdlib-browser",
"matchDepNames": [
"node-libs-browser"
"node-stdlib-browser"
],
"reviewers": [
"team:kibana-operations"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ SRCS = glob(
)

BUNDLER_DEPS = [
"@npm//node-libs-browser",
"@npm//node-stdlib-browser",
]

filegroup(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,16 @@
/** @typedef {import('webpack').Compiler} WebpackCompiler */

/* eslint-disable import/no-extraneous-dependencies */
// @ts-expect-error
const nodeLibsBrowser = require('node-libs-browser');
const nodeStdlibBrowser = require('node-stdlib-browser');

/**
* @param {string} pkgName
* @returns {string}
*/
const getStdLibBrowserPackage = (pkgName) => {
// @ts-expect-error
return require.resolve(nodeStdlibBrowser[pkgName]);
};

const NodeLibsBrowserPlugin = class NodeLibsBrowserPlugin {
/**
Expand All @@ -20,51 +28,51 @@ const NodeLibsBrowserPlugin = class NodeLibsBrowserPlugin {
apply(compiler) {
compiler.options.plugins.push(
new compiler.webpack.ProvidePlugin({
Buffer: [nodeLibsBrowser.buffer, 'Buffer'],
console: nodeLibsBrowser.console,
process: nodeLibsBrowser.process,
Buffer: [getStdLibBrowserPackage('buffer'), 'Buffer'],
console: getStdLibBrowserPackage('console'),
process: getStdLibBrowserPackage('process'),
})
);

compiler.options.resolve.fallback = {
assert: nodeLibsBrowser.assert,
buffer: nodeLibsBrowser.buffer,
assert: getStdLibBrowserPackage('assert'),
buffer: getStdLibBrowserPackage('buffer'),
child_process: false,
cluster: false,
console: false,
constants: nodeLibsBrowser.constants,
crypto: nodeLibsBrowser.crypto,
constants: getStdLibBrowserPackage('constants'),
crypto: getStdLibBrowserPackage('crypto'),
dgram: false,
dns: false,
domain: nodeLibsBrowser.domain,
events: nodeLibsBrowser.events,
domain: getStdLibBrowserPackage('domain'),
events: getStdLibBrowserPackage('events'),
fs: false,
http: nodeLibsBrowser.http,
https: nodeLibsBrowser.https,
http: getStdLibBrowserPackage('http'),
https: getStdLibBrowserPackage('https'),
module: false,
net: false,
os: nodeLibsBrowser.os,
path: nodeLibsBrowser.path,
punycode: nodeLibsBrowser.punycode,
process: nodeLibsBrowser.process,
querystring: nodeLibsBrowser.querystring,
os: getStdLibBrowserPackage('os'),
path: getStdLibBrowserPackage('path'),
punycode: getStdLibBrowserPackage('punycode'),
process: getStdLibBrowserPackage('process'),
querystring: getStdLibBrowserPackage('querystring'),
readline: false,
repl: false,
stream: nodeLibsBrowser.stream,
_stream_duplex: nodeLibsBrowser._stream_duplex,
_stream_passthrough: nodeLibsBrowser._stream_passthrough,
_stream_readable: nodeLibsBrowser._stream_readable,
_stream_transform: nodeLibsBrowser._stream_transform,
_stream_writable: nodeLibsBrowser._stream_writable,
string_decoder: nodeLibsBrowser.string_decoder,
sys: nodeLibsBrowser.sys,
timers: nodeLibsBrowser.timers,
stream: getStdLibBrowserPackage('stream'),
_stream_duplex: getStdLibBrowserPackage('_stream_duplex'),
_stream_passthrough: getStdLibBrowserPackage('_stream_passthrough'),
_stream_readable: getStdLibBrowserPackage('_stream_readable'),
_stream_transform: getStdLibBrowserPackage('_stream_transform'),
_stream_writable: getStdLibBrowserPackage('_stream_writable'),
string_decoder: getStdLibBrowserPackage('string_decoder'),
sys: getStdLibBrowserPackage('sys'),
timers: getStdLibBrowserPackage('timers'),
tls: false,
tty: nodeLibsBrowser.tty,
url: nodeLibsBrowser.url,
util: nodeLibsBrowser.util,
vm: nodeLibsBrowser.vm,
zlib: nodeLibsBrowser.zlib,
tty: getStdLibBrowserPackage('tty'),
url: getStdLibBrowserPackage('url'),
util: getStdLibBrowserPackage('util'),
vm: getStdLibBrowserPackage('vm'),
zlib: getStdLibBrowserPackage('zlib'),
...compiler.options.resolve.fallback,
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ RUNTIME_DEPS = [
"@npm//jquery",
"@npm//lodash",
"@npm//moment-timezone",
"@npm//node-libs-browser",
"@npm//node-stdlib-browser",
"@npm//react-dom",
"@npm//react-dom-18",
"@npm//react-router-dom",
Expand All @@ -70,7 +70,7 @@ RUNTIME_DEPS = [
"@npm//redux",
"@npm//react-redux",
"@npm//immer",
"@npm//reselect"
"@npm//reselect",
]

webpack_cli(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ module.exports = (_, argv) => {
'buffer',
'punycode',
'util',
'url',

/**
* babel runtime helpers referenced from entry chunks
Expand Down Expand Up @@ -140,6 +141,16 @@ module.exports = (_, argv) => {
process.env.REACT_18 === 'true' ? 'react-dom-18/profiling' : 'react-dom/profiling',
'scheduler/tracing': 'scheduler/tracing-profiling',
react: process.env.REACT_18 === 'true' ? 'react-18' : 'react',
// NOTE: We use this to make sure that buffer and punycode bundled are the ones
// installed from node-stdlib-browser and are in sync in between shared deps and plugins bundles
buffer: [
Path.resolve(REPO_ROOT, 'node_modules/node-stdlib-browser/node_modules/buffer'),
require.resolve('buffer'),
],
punycode: [
Path.resolve(REPO_ROOT, 'node_modules/node-stdlib-browser/node_modules/punycode'),
require.resolve('punycode'),
],
},
extensions: ['.js', '.ts'],
mainFields: ['browser', 'module', 'main'],
Expand Down
Loading