Skip to content
Merged
Show file tree
Hide file tree
Changes from 16 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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
15 changes: 9 additions & 6 deletions LICENSES-3rdparty.csv
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,10 @@ Component,Origin,Licence,Copyright
@rollup/pluginutils,virtual,MIT,Rich Harris (https://github.com/rollup/plugins/tree/master/packages/pluginutils#readme)
@rollup/rollup-darwin-arm64,npm,MIT,Lukas Taegert-Atkinson (https://rollupjs.org/)
@rollup/rollup-darwin-x64,npm,MIT,Lukas Taegert-Atkinson (https://rollupjs.org/)
@rspack/binding,npm,MIT,(https://rspack.dev)
@rspack/binding-darwin-arm64,npm,MIT,(https://rspack.dev)
@rspack/binding-darwin-x64,npm,MIT,(https://rspack.dev)
@rspack/core,virtual,MIT,(https://rspack.dev)
@rspack/binding,npm,MIT,(https://rspack.rs)
@rspack/binding-darwin-arm64,npm,MIT,(https://rspack.rs)
@rspack/binding-darwin-x64,npm,MIT,(https://rspack.rs)
@rspack/core,virtual,MIT,(https://rspack.rs)
@rspack/lite-tapable,npm,MIT,(https://www.npmjs.com/package/@rspack/lite-tapable)
@samverschueren/stream-to-observable,virtual,MIT,(https://www.npmjs.com/package/@samverschueren/stream-to-observable)
@sinclair/typebox,npm,MIT,sinclairzx81 (https://www.npmjs.com/package/@sinclair/typebox)
Expand Down Expand Up @@ -264,11 +264,12 @@ Component,Origin,Licence,Copyright
@xtuc/long,npm,Apache-2.0,Daniel Wirtz (https://www.npmjs.com/package/@xtuc/long)
abbrev,npm,ISC,Isaac Z. Schlueter (https://www.npmjs.com/package/abbrev)
acorn,npm,MIT,(https://github.com/acornjs/acorn)
acorn-import-attributes,virtual,MIT,Sven Sauleau (https://www.npmjs.com/package/acorn-import-attributes)
acorn-import-phases,virtual,MIT,Nicolò Ribaudo (https://www.npmjs.com/package/acorn-import-phases)
acorn-jsx,virtual,MIT,(https://github.com/acornjs/acorn-jsx)
acorn-walk,npm,MIT,(https://github.com/acornjs/acorn)
aggregate-error,npm,MIT,Sindre Sorhus (sindresorhus.com)
ajv,npm,MIT,Evgeny Poberezkin (https://github.com/ajv-validator/ajv)
ajv-formats,virtual,MIT,Evgeny Poberezkin (https://github.com/ajv-validator/ajv-formats#readme)
ajv-keywords,virtual,MIT,Evgeny Poberezkin (https://github.com/epoberezkin/ajv-keywords#readme)
ansi-colors,npm,MIT,Brian Woodward (https://github.com/doowb/ansi-colors)
ansi-escapes,npm,MIT,Sindre Sorhus (https://sindresorhus.com)
Expand Down Expand Up @@ -420,6 +421,7 @@ fast-diff,npm,Apache-2.0,Jason Chen (https://www.npmjs.com/package/fast-diff)
fast-glob,npm,MIT,Denis Malinochkin (https://mrmlnc.com)
fast-json-stable-stringify,npm,MIT,James Halliday (https://github.com/epoberezkin/fast-json-stable-stringify)
fast-levenshtein,npm,MIT,Ramesh Nair (http://www.hiddentao.com/)
fast-uri,npm,BSD-3-Clause,Vincent Le Goff (https://github.com/fastify/fast-uri)
fastq,npm,ISC,Matteo Collina (https://github.com/mcollina/fastq#readme)
fb-watchman,npm,Apache-2.0,Wez Furlong (https://facebook.github.io/watchman/)
fdir,virtual,MIT,thecodrr (https://github.com/thecodrr/fdir#readme)
Expand Down Expand Up @@ -674,6 +676,7 @@ regexpu-core,npm,MIT,Mathias Bynens (https://mths.be/regexpu)
regjsparser,npm,BSD-2-Clause,'Julian Viereck' (https://github.com/jviereck/regjsparser)
request,npm,Apache-2.0,Mikeal Rogers (https://www.npmjs.com/package/request)
require-directory,npm,MIT,Troy Goode (https://github.com/troygoode/node-require-directory/)
require-from-string,npm,MIT,Vsevolod Strukchinsky (github.com/floatdrop)
resolve-cwd,npm,MIT,Sindre Sorhus (sindresorhus.com)
resolve-from,npm,MIT,Sindre Sorhus (sindresorhus.com)
resolve-pkg-maps,npm,MIT,Hiroki Osame (https://www.npmjs.com/package/resolve-pkg-maps)
Expand Down Expand Up @@ -791,4 +794,4 @@ yaml,npm,ISC,Eemeli Aro (https://eemeli.org/yaml/)
yargs,npm,MIT,(https://yargs.js.org/)
yargs-parser,npm,ISC,Ben Coe (https://www.npmjs.com/package/yargs-parser)
yn,npm,MIT,Sindre Sorhus (sindresorhus.com)
yocto-queue,npm,MIT,Sindre Sorhus (https://sindresorhus.com)
yocto-queue,npm,MIT,Sindre Sorhus (https://sindresorhus.com)
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@types/async-retry": "1.4.8",
"@types/chalk": "2.2.0",
"@types/node": "^20",
"esbuild": "0.24.0",
"esbuild": "0.25.8",
"typescript": "5.4.3",
"unplugin": "2.3.5"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/bundler-report/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@dd/core": "workspace:*"
},
"devDependencies": {
"rollup": "4.24.2",
"rollup": "4.45.1",
"typescript": "5.4.3"
}
}
2 changes: 1 addition & 1 deletion packages/plugins/telemetry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"devDependencies": {
"@types/chalk": "2.2.0",
"esbuild": "0.24.0",
"esbuild": "0.25.8",
"typescript": "5.4.3"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/published/esbuild-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
"@rollup/plugin-terser": "0.4.4",
"@types/babel__core": "^7",
"@types/babel__preset-env": "^7",
"esbuild": "0.24.0",
"rollup": "4.24.2",
"esbuild": "0.25.8",
"rollup": "4.45.1",
"rollup-plugin-dts": "6.1.1",
"rollup-plugin-esbuild": "6.1.1",
"typescript": "5.4.3"
Expand Down
4 changes: 2 additions & 2 deletions packages/published/rollup-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
"@rollup/plugin-terser": "0.4.4",
"@types/babel__core": "^7",
"@types/babel__preset-env": "^7",
"esbuild": "0.24.0",
"rollup": "4.24.2",
"esbuild": "0.25.8",
"rollup": "4.45.1",
"rollup-plugin-dts": "6.1.1",
"rollup-plugin-esbuild": "6.1.1",
"typescript": "5.4.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/published/rollup-plugin/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import type {
// #types-export-injection-marker
} from '@dd/factory';
import * as factory from '@dd/factory';
import rollup from 'rollup';
import * as rollup from 'rollup';

import pkg from '../package.json';

Expand Down
4 changes: 2 additions & 2 deletions packages/published/rspack-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
"@rollup/plugin-terser": "0.4.4",
"@types/babel__core": "^7",
"@types/babel__preset-env": "^7",
"esbuild": "0.24.0",
"rollup": "4.24.2",
"esbuild": "0.25.8",
"rollup": "4.45.1",
"rollup-plugin-dts": "6.1.1",
"rollup-plugin-esbuild": "6.1.1",
"typescript": "5.4.3"
Expand Down
6 changes: 3 additions & 3 deletions packages/published/vite-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@
"@rollup/plugin-terser": "0.4.4",
"@types/babel__core": "^7",
"@types/babel__preset-env": "^7",
"esbuild": "0.24.0",
"rollup": "4.24.2",
"esbuild": "0.25.8",
"rollup": "4.45.1",
"rollup-plugin-dts": "6.1.1",
"rollup-plugin-esbuild": "6.1.1",
"typescript": "5.4.3"
},
"peerDependencies": {
"vite": ">= 5.x <= 6.x"
"vite": ">= 5.x <= 7.x"
}
}
4 changes: 2 additions & 2 deletions packages/published/webpack-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
"@rollup/plugin-terser": "0.4.4",
"@types/babel__core": "^7",
"@types/babel__preset-env": "^7",
"esbuild": "0.24.0",
"rollup": "4.24.2",
"esbuild": "0.25.8",
"rollup": "4.45.1",
"rollup-plugin-dts": "6.1.1",
"rollup-plugin-esbuild": "6.1.1",
"typescript": "5.4.3"
Expand Down
12 changes: 10 additions & 2 deletions packages/tests/jest.config.js → packages/tests/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,22 @@
// This product includes software developed at Datadog (https://www.datadoghq.com/).
// Copyright 2019-Present Datadog, Inc.

module.exports = {
import { createJsWithTsPreset, type JestConfigWithTsJest } from 'ts-jest';

const presetConfig = createJsWithTsPreset({
// ...options

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is that something we want to change later ?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, I forgot to remove this after my copy pasting from their website 🤦
I'll remove it.

});

const config: JestConfigWithTsJest = {
...presetConfig,
// Automatically clear mock calls and instances between every test
clearMocks: true,
globalSetup: '<rootDir>/src/_jest/globalSetup.ts',
preset: 'ts-jest/presets/js-with-ts',
roots: ['<rootDir>/../'],
setupFilesAfterEnv: ['<rootDir>/src/_jest/setupAfterEnv.ts'],
testEnvironment: 'node',
testMatch: ['**/*.test.*'],
testTimeout: 10000,
};

export default config;
13 changes: 7 additions & 6 deletions packages/tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,26 @@
"@dd/internal-injection-plugin": "workspace:*",
"@dd/telemetry-plugin": "workspace:*",
"@dd/tools": "workspace:*",
"@jest/globals": "30.0.5",
"@playwright/test": "1.49.1",
"@rollup/plugin-commonjs": "28.0.1",
"clipanion": "4.0.0-rc.3",
"glob": "11.0.0",
"jest": "30.0.0",
"jest": "30.0.5",
"ts-jest": "29.4.0"
},
"devDependencies": {
"@rspack/core": "1.3.10",
"@rspack/core": "1.4.9",
"@types/faker": "5.5.9",
"@types/jest": "^29",
"@types/node": "^20",
"esbuild": "0.24.0",
"esbuild": "0.25.8",
"faker": "5.5.3",
"nock": "14.0.1",
"rollup": "4.24.2",
"rollup": "4.45.1",
"strip-ansi": "6.0.1",
"typescript": "5.4.3",
"vite": "6.3.4",
"webpack": "5.92.1"
"vite": "6.3.5",
"webpack": "5.100.2"
}
}
3 changes: 3 additions & 0 deletions packages/tests/src/e2e/smokeTest/smokeTest.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ describe('Smoke Test', () => {
// Verify that we do log the expected things.
const logs: string[] = [];
page.on('console', async (msg) => {
if (msg.type() !== 'log') {
return;
}
for (const arg of msg.args()) {
// eslint-disable-next-line no-await-in-loop
logs.push(await arg.jsonValue());
Expand Down
8 changes: 4 additions & 4 deletions packages/tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@
"@inquirer/select": "2.3.3",
"@rollup/plugin-commonjs": "28.0.1",
"@rollup/plugin-node-resolve": "15.3.0",
"@rspack/core": "1.3.10",
"@rspack/core": "1.4.9",
"chalk": "2.3.1",
"clipanion": "4.0.0-rc.3",
"esbuild": "0.24.0",
"esbuild": "0.25.8",
"glob": "11.0.0",
"outdent": "0.8.0",
"typanion": "3.14.0",
"vite": "6.3.4",
"webpack": "5.92.1"
"vite": "6.3.5",
"webpack": "5.100.2"
}
}
9 changes: 7 additions & 2 deletions packages/tools/src/commands/dev-server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import chalk from 'chalk';
import { Command, Option } from 'clipanion';
import type http from 'http';
import template from 'lodash.template';
import { homedir } from 'os';
import path from 'path';

// Some context to use for templating content with {{something}}.
const CONTEXT: Record<string, readonly string[]> = {
Expand Down Expand Up @@ -94,9 +96,10 @@ class DevServer extends Command {
}

async execute() {
const absoluteRoot = path.isAbsolute(this.root) ? this.root : path.resolve(ROOT, this.root);
runServer({
port: +this.port,
root: this.root,
root: absoluteRoot,
middleware: async (resp, req) => {
const statusCode = resp.statusCode;
const context = this.getContext(req);
Expand Down Expand Up @@ -126,7 +129,9 @@ class DevServer extends Command {
};
},
});
console.log(`Server running at http://127.0.0.1:${this.port}/`);
const url = chalk.bold.green(`http://127.0.0.1:${this.port}/`);
const folder = chalk.bold.green(absoluteRoot.replace(homedir(), '~'));
console.log(`Serving "${folder}" at ${url}.`);
}
}

Expand Down
7 changes: 4 additions & 3 deletions packages/tools/src/commands/oss/apply.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ const DEPENDENCY_ADDITIONS: Record<string, License> = {
licenseName: 'MIT',
libraryName: '@rspack/binding-darwin-arm64',
origin: 'npm',
owner: '(https://rspack.dev)',
owner: '(https://rspack.rs)',
},
// This one is only installed locally.
'@rspack/binding-darwin-x64': {
licenseName: 'MIT',
libraryName: '@rspack/binding-darwin-x64',
origin: 'npm',
owner: '(https://rspack.dev)',
owner: '(https://rspack.rs)',
},
// This one is only installed locally.
'@unrs/resolver-binding-darwin-arm64': {
Expand Down Expand Up @@ -339,7 +339,8 @@ export const apply3rdPartiesLicenses = async () => {
content += `\n${license.libraryName},${license.origin},${license.licenseName},${license.owner}`;
}

fs.writeFileSync(LICENSES_FILE, content);
// Also adding a new line at the end to allow manual edits and save.
fs.writeFileSync(LICENSES_FILE, `${content}\n`);

if (errors.length) {
console.log(`\n${errors.join('\n')}`);
Expand Down
Loading