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
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"experimentalDecorators": true,
"strictNullChecks": true,
"noUnusedLocals": true,
"types": ["heft-jest", "node"],
"types": ["jest", "node"],

"module": "commonjs",
"target": "es2017",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"experimentalDecorators": true,
"strictNullChecks": true,
"noUnusedLocals": true,
"types": ["heft-jest", "node"],
"types": ["jest", "node"],

"module": "commonjs",
"target": "es2017",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"experimentalDecorators": true,
"strictNullChecks": true,
"noUnusedLocals": true,
"types": ["heft-jest", "node"],
"types": ["jest", "node"],

"module": "commonjs",
"target": "es2017",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"experimentalDecorators": true,
"strictNullChecks": true,
"noUnusedLocals": true,
"types": ["heft-jest", "node"],
"types": ["jest", "node"],

"module": "commonjs",
"target": "es2017",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"experimentalDecorators": true,
"strictNullChecks": true,
"noUnusedLocals": true,
"types": ["heft-jest", "node"],
"types": ["jest", "node"],

"module": "commonjs",
"target": "es2017",
Expand Down
1 change: 0 additions & 1 deletion apps/rush/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
"@rushstack/rush-amazon-s3-build-cache-plugin": "workspace:*",
"@rushstack/rush-azure-storage-build-cache-plugin": "workspace:*",
"@rushstack/rush-http-build-cache-plugin": "workspace:*",
"@types/heft-jest": "1.0.1",
"@types/semver": "7.5.0"
},
"exports": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@rushstack/heft-jest-plugin": "workspace:*",
"@rushstack/heft-lint-plugin": "workspace:*",
"@rushstack/heft-typescript-plugin": "workspace:*",
"@types/heft-jest": "1.0.1",
"@types/jest": "30.0.0",
"@types/node": "20.17.19",
"eslint": "~9.37.0",
"local-eslint-config": "workspace:*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"noEmitOnError": false,
"allowUnreachableCode": false,

"types": ["heft-jest", "node"],
"types": ["jest", "node"],

"module": "commonjs",
"target": "es2017",
Expand Down
2 changes: 1 addition & 1 deletion build-tests-samples/heft-node-jest-tutorial/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@rushstack/heft-jest-plugin": "workspace:*",
"@rushstack/heft-lint-plugin": "workspace:*",
"@rushstack/heft-typescript-plugin": "workspace:*",
"@types/heft-jest": "1.0.1",
"@types/jest": "30.0.0",
"@types/node": "20.17.19",
"eslint": "~9.37.0",
"local-eslint-config": "workspace:*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { SoundPlayerConsumer } from './SoundPlayerConsumer';

beforeEach(() => {
// Clear all instances and calls to constructor and all methods:
mocked(SoundPlayer).mockClear();
jest.mocked(SoundPlayer).mockClear();
});

it('We can check if the consumer called the class constructor', () => {
Expand All @@ -31,9 +31,9 @@ it('We can check if the consumer called a method on the class instance', () => {
soundPlayerConsumer.playSomethingCool();

// mock.instances is available with automatic mocks:
const mockSoundPlayerInstance: SoundPlayer = mocked(SoundPlayer).mock.instances[0];
const mockSoundPlayerInstance: SoundPlayer = jest.mocked(SoundPlayer).mock.instances[0];

const mockPlaySoundFile = mocked(mockSoundPlayerInstance.playSoundFile);
const mockPlaySoundFile = jest.mocked(mockSoundPlayerInstance.playSoundFile);
expect(mockPlaySoundFile.mock.calls[0][0]).toEqual(coolSoundFileName);

// Equivalent to above check:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { SoundPlayerConsumer } from './SoundPlayerConsumer';

beforeEach(() => {
// Clear all instances and calls to constructor and all methods:
mocked(SoundPlayer).mockClear();
jest.mocked(SoundPlayer).mockClear();
mockPlaySoundFile.mockClear();
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { SoundPlayerConsumer } from './SoundPlayerConsumer';
import { SoundPlayer } from './SoundPlayer';

beforeEach(() => {
mocked(SoundPlayer).mockClear();
jest.mocked(SoundPlayer).mockClear();
mockPlaySoundFile.mockClear();
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"noEmitOnError": false,
"allowUnreachableCode": false,

"types": ["heft-jest", "node"],
"types": ["jest", "node"],

"module": "commonjs",
"target": "es2017",
Expand Down
2 changes: 1 addition & 1 deletion build-tests-samples/heft-node-rig-tutorial/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"local-eslint-config": "workspace:*",
"@rushstack/heft": "workspace:*",
"@rushstack/heft-node-rig": "workspace:*",
"@types/heft-jest": "1.0.1",
"@types/jest": "30.0.0",
"@types/node": "20.17.19",
"eslint": "~9.37.0"
}
Expand Down
2 changes: 1 addition & 1 deletion build-tests-samples/heft-node-rig-tutorial/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json",
"compilerOptions": {
"isolatedModules": true,
"types": ["heft-jest", "node"]
"types": ["jest", "node"]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@serverless-stack/cli": "1.18.4",
"@serverless-stack/resources": "1.18.4",
"@types/aws-lambda": "8.10.93",
"@types/heft-jest": "1.0.1",
"@types/jest": "30.0.0",
"@types/node": "20.17.19",
"aws-cdk-lib": "2.189.1",
"constructs": "~10.0.98",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

"skipLibCheck": true, // Some of the AWS dependencies have typings issues

"types": ["heft-jest", "node"],
"types": ["jest", "node"],

"module": "commonjs",
"target": "es2017",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@storybook/core-events": "~6.4.18",
"@storybook/react": "~6.4.18",
"@storybook/theming": "~6.4.18",
"@types/heft-jest": "1.0.1",
"@types/jest": "30.0.0",
"@types/node": "20.17.19",
"@types/react-dom": "17.0.25",
"@types/react": "17.0.74",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@rushstack/heft-webpack4-plugin": "workspace:*",
"@rushstack/webpack4-module-minifier-plugin": "workspace:*",
"@storybook/react": "~6.4.18",
"@types/heft-jest": "1.0.1",
"@types/jest": "30.0.0",
"@types/node": "20.17.19",
"@types/react": "17.0.74",
"@types/react-dom": "17.0.25",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"allowUnreachableCode": false,
"importHelpers": true,

"types": ["heft-jest", "webpack-env"],
"types": ["jest", "webpack-env"],

"module": "esnext",
"moduleResolution": "node",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@storybook/cli": "~9.1.6",
"@storybook/react": "~9.1.6",
"@storybook/react-webpack5": "~9.1.6",
"@types/heft-jest": "1.0.1",
"@types/jest": "30.0.0",
"@types/node": "20.17.19",
"@types/react-dom": "19.2.3",
"@types/react": "19.2.7",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@rushstack/webpack5-module-minifier-plugin": "workspace:*",
"@storybook/react-webpack5": "~9.1.6",
"@storybook/react": "~9.1.6",
"@types/heft-jest": "1.0.1",
"@types/jest": "30.0.0",
"@types/node": "20.17.19",
"@types/react": "19.2.7",
"@types/react-dom": "19.2.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"allowUnreachableCode": false,
"importHelpers": true,

"types": ["heft-jest", "webpack-env"],
"types": ["jest", "webpack-env"],

"module": "esnext",
"moduleResolution": "node",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "./node_modules/@rushstack/heft-web-rig/profiles/app/tsconfig-base.json",
"compilerOptions": {
"types": ["heft-jest", "webpack-env"]
"types": ["jest", "webpack-env"]
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "./node_modules/@rushstack/heft-web-rig/profiles/app/tsconfig-base.json",
"compilerOptions": {
"types": ["heft-jest", "webpack-env"]
"types": ["jest", "webpack-env"]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@rushstack/heft-typescript-plugin": "workspace:*",
"@rushstack/heft-webpack5-plugin": "workspace:*",
"@rushstack/heft": "workspace:*",
"@types/heft-jest": "1.0.1",
"@types/jest": "30.0.0",
"@types/react": "19.2.7",
"@types/react-dom": "19.2.3",
"@types/webpack-env": "1.18.8",
Expand Down
12 changes: 10 additions & 2 deletions build-tests-samples/heft-webpack-basic-tutorial/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,20 @@
"allowUnreachableCode": false,
"importHelpers": true,

"types": ["heft-jest", "webpack-env"],
"types": ["jest", "webpack-env"],

"module": "esnext",
"moduleResolution": "node",
"target": "es5",
"lib": ["es5", "scripthost", "es2015.collection", "es2015.promise", "es2015.iterable", "dom"]
"lib": [
"es5",
"scripthost",
"es2015.collection",
"es2015.promise",
"es2015.iterable",
"es2015.symbol.wellknown",
"dom"
]
},
"include": ["src/**/*.ts", "src/**/*.tsx"]
}
2 changes: 1 addition & 1 deletion build-tests/api-extractor-test-01/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"_phase:build": "heft run --only build -- --clean"
},
"dependencies": {
"@types/jest": "29.2.5",
"@types/jest": "30.0.0",
"@types/long": "4.0.0",
"long": "^4.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion build-tests/heft-fastify-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@rushstack/heft": "workspace:*",
"@rushstack/heft-lint-plugin": "workspace:*",
"@rushstack/heft-typescript-plugin": "workspace:*",
"@types/heft-jest": "1.0.1",
"@types/jest": "30.0.0",
"@types/node": "20.17.19",
"eslint": "~9.37.0",
"local-eslint-config": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion build-tests/heft-fastify-test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"experimentalDecorators": true,
"strictNullChecks": true,
"noUnusedLocals": true,
"types": ["heft-jest", "node"],
"types": ["jest", "node"],

"module": "commonjs",
"target": "es2017",
Expand Down
3 changes: 0 additions & 3 deletions build-tests/heft-jest-preset-test/config/jest.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@
// Prefer .cjs to .js to catch explicit commonjs output. Optimize for local files, which will be .cjs
"moduleFileExtensions": ["cjs", "js", "json", "node"],

// When using the heft-jest-plugin, these will be replaced with the resolved module location
"setupFiles": ["@rushstack/heft-jest-plugin/lib-commonjs/exports/jest-global-setup.js"],

// When using the heft-jest-plugin, these will be replaced with the resolved module location
"resolver": "@rushstack/heft-jest-plugin/lib-commonjs/exports/jest-improved-resolver.js"
}
2 changes: 1 addition & 1 deletion build-tests/heft-jest-preset-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@rushstack/heft-jest-plugin": "workspace:*",
"@rushstack/heft-lint-plugin": "workspace:*",
"@rushstack/heft-typescript-plugin": "workspace:*",
"@types/heft-jest": "1.0.1",
"@types/jest": "30.0.0",
"eslint": "~9.37.0",
"local-eslint-config": "workspace:*",
"typescript": "~5.8.2"
Expand Down
2 changes: 1 addition & 1 deletion build-tests/heft-jest-preset-test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"experimentalDecorators": true,
"strictNullChecks": true,
"noUnusedLocals": true,
"types": ["heft-jest"],
"types": ["jest"],

"module": "esnext",
"moduleResolution": "node",
Expand Down
2 changes: 1 addition & 1 deletion build-tests/heft-jest-reporters-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@rushstack/heft-jest-plugin": "workspace:*",
"@rushstack/heft-lint-plugin": "workspace:*",
"@rushstack/heft-typescript-plugin": "workspace:*",
"@types/heft-jest": "1.0.1",
"@types/jest": "30.0.0",
"@types/node": "20.17.19",
"eslint": "~9.37.0",
"local-eslint-config": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion build-tests/heft-jest-reporters-test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"experimentalDecorators": true,
"strictNullChecks": true,
"noUnusedLocals": true,
"types": ["heft-jest"],
"types": ["jest"],

"module": "esnext",
"moduleResolution": "node",
Expand Down
2 changes: 1 addition & 1 deletion build-tests/heft-minimal-rig-usage-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"devDependencies": {
"@rushstack/heft": "workspace:*",
"@rushstack/heft-jest-plugin": "workspace:*",
"@types/heft-jest": "1.0.1",
"@types/jest": "30.0.0",
"@types/node": "20.17.19",
"heft-minimal-rig-test": "workspace:*"
}
Expand Down
2 changes: 1 addition & 1 deletion build-tests/heft-minimal-rig-usage-test/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "./node_modules/heft-minimal-rig-test/profiles/default/tsconfig-base.json",
"compilerOptions": {
"types": ["heft-jest", "node"]
"types": ["jest", "node"]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@rushstack/heft-lint-plugin": "workspace:*",
"@rushstack/heft-static-asset-typings-plugin": "workspace:*",
"@rushstack/heft-typescript-plugin": "workspace:*",
"@types/heft-jest": "1.0.1",
"@types/jest": "30.0.0",
"@types/node": "20.17.19",
"eslint": "~9.37.0",
"heft-example-plugin-01": "workspace:*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"experimentalDecorators": true,
"strictNullChecks": true,
"noUnusedLocals": true,
"types": ["heft-jest", "node"],
"types": ["jest", "node"],

"module": "commonjs",
"target": "es2017",
Expand Down
2 changes: 1 addition & 1 deletion build-tests/heft-node-everything-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@rushstack/heft-jest-plugin": "workspace:*",
"@rushstack/heft-lint-plugin": "workspace:*",
"@rushstack/heft-typescript-plugin": "workspace:*",
"@types/heft-jest": "1.0.1",
"@types/jest": "30.0.0",
"@types/node": "20.17.19",
"eslint": "~9.37.0",
"heft-example-lifecycle-plugin": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion build-tests/heft-node-everything-test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"experimentalDecorators": true,
"strictNullChecks": true,
"noUnusedLocals": true,
"types": ["heft-jest", "node"],
"types": ["jest", "node"],

"module": "commonjs",
"target": "es2017",
Expand Down
2 changes: 1 addition & 1 deletion build-tests/heft-parameter-plugin-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@rushstack/heft-typescript-plugin": "workspace:*",
"@rushstack/heft": "workspace:*",
"@rushstack/node-core-library": "workspace:*",
"@types/heft-jest": "1.0.1",
"@types/jest": "30.0.0",
"@types/node": "20.17.19",
"heft-parameter-plugin": "workspace:*",
"typescript": "~5.8.2"
Expand Down
Loading