Skip to content

Commit 61bb2eb

Browse files
authored
chore: update "vulnerable" dependencies (#15915)
1 parent ad565c5 commit 61bb2eb

29 files changed

Lines changed: 626 additions & 601 deletions

File tree

Lines changed: 300 additions & 300 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,11 @@ packageExtensions:
2929
"@react-native/community-cli-plugin@*":
3030
peerDependencies:
3131
"@babel/preset-env": ^7.1.6
32-
"@react-native/metro-babel-transformer@*":
33-
peerDependencies:
34-
"@babel/preset-env": ^7.1.6
3532
babel-plugin-transform-flow-enums@*:
3633
peerDependencies:
3734
"@babel/core": ^7.0.0
3835
react-native@*:
3936
peerDependencies:
4037
"@babel/preset-env": ^7.1.6
4138

42-
yarnPath: .yarn/releases/yarn-4.10.3.cjs
39+
yarnPath: .yarn/releases/yarn-4.12.0.cjs

examples/angular/.babelrc.js

Lines changed: 0 additions & 23 deletions
This file was deleted.

examples/angular/app.component.spec.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,18 @@ import {DataService} from './shared/data.service';
55

66
const title = 'Test';
77
const getTitleFn = jest.fn(() => title);
8-
const dataServiceSpy = jest.fn(
9-
(): Partial<DataService> => ({
10-
getTitle: getTitleFn,
11-
}),
12-
);
8+
const dataServiceMock: Partial<DataService> = {
9+
getTitle: getTitleFn,
10+
};
1311

1412
describe('AppComponent', () => {
1513
let fixture: ComponentFixture<AppComponent>;
1614
let app: AppComponent;
1715

1816
beforeEach(async () => {
1917
await TestBed.configureTestingModule({
20-
declarations: [AppComponent],
21-
providers: [{provide: DataService, useClass: dataServiceSpy}],
18+
imports: [AppComponent],
19+
providers: [{provide: DataService, useValue: dataServiceMock}],
2220
}).compileComponents();
2321
fixture = TestBed.createComponent(AppComponent);
2422
app = fixture.debugElement.componentInstance;

examples/angular/app.component.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
import {Component} from '@angular/core';
1+
import {Component, inject} from '@angular/core';
22
import {DataService} from './shared/data.service';
33

44
@Component({
55
selector: 'app-root',
6+
standalone: true,
67
template: '<h1>Welcome to {{ title }}!</h1>',
78
})
89
export class AppComponent {
9-
public title: string;
10-
11-
constructor(dataService: DataService) {
12-
this.title = dataService.getTitle();
13-
}
10+
private dataService = inject(DataService);
11+
public title = this.dataService.getTitle();
1412
}

examples/angular/app.module.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

examples/angular/jest.config.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1+
// eslint-disable-next-line import-x/no-extraneous-dependencies
2+
const {createCjsPreset} = require('jest-preset-angular/presets');
3+
14
module.exports = {
2-
moduleFileExtensions: ['ts', 'html', 'js', 'json'],
5+
...createCjsPreset({
6+
diagnostics: {
7+
// https://github.com/kulshekhar/ts-jest/issues/3820
8+
ignoreCodes: [151_001],
9+
},
10+
tsconfig: '<rootDir>/tsconfig.json',
11+
}),
312
setupFilesAfterEnv: ['<rootDir>/setupJest.js'],
4-
testEnvironment: 'jsdom',
5-
transform: {
6-
'\\.[tj]s$': ['babel-jest', {configFile: require.resolve('./.babelrc')}],
7-
},
813
};

examples/angular/package.json

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,26 @@
11
{
2-
"name": "angular",
2+
"name": "example-angular",
33
"version": "0.0.1",
44
"scripts": {
55
"test": "jest"
66
},
77
"private": true,
88
"dependencies": {
9-
"@angular/common": "^12.0.0",
10-
"@angular/compiler": "^12.0.0",
11-
"@angular/core": "^12.0.0",
12-
"@angular/forms": "^12.0.0",
13-
"@angular/platform-browser": "^12.0.0",
14-
"@angular/platform-browser-dynamic": "^12.0.0",
15-
"core-js": "^3.2.1",
9+
"@angular/common": "^21.0.0",
10+
"@angular/compiler": "^21.0.0",
11+
"@angular/compiler-cli": "^21.0.0",
12+
"@angular/core": "^21.0.0",
13+
"@angular/platform-browser": "^21.0.0",
14+
"@angular/platform-browser-dynamic": "^21.0.0",
1615
"rxjs": "^7.8.2",
1716
"tslib": "^2.0.0",
1817
"typescript": "^5.8.3",
19-
"zone.js": "~0.11.8"
18+
"zone.js": "~0.16.0"
2019
},
2120
"devDependencies": {
22-
"@babel/core": "^7.27.4",
23-
"@babel/plugin-proposal-decorators": "^7.27.1",
24-
"@babel/preset-env": "^7.27.2",
25-
"@babel/preset-typescript": "^7.27.1",
2621
"@jest/globals": "workspace:*",
27-
"babel-jest": "workspace:*",
28-
"babel-plugin-transform-typescript-metadata": "*",
2922
"jest": "workspace:*",
30-
"jest-environment-jsdom": "workspace:*",
31-
"jest-zone-patch": "*"
23+
"jest-preset-angular": "^16.0.0",
24+
"jsdom": "^26.1.0"
3225
}
3326
}

examples/angular/setupJest.js

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
11
'use strict';
22

3-
require('core-js/proposals/reflect-metadata');
4-
require('zone.js/dist/zone.js');
5-
require('zone.js/dist/proxy.js');
6-
require('zone.js/dist/sync-test');
7-
require('zone.js/dist/async-test');
8-
require('zone.js/dist/fake-async-test');
93
// eslint-disable-next-line import-x/no-extraneous-dependencies
10-
require('jest-zone-patch');
4+
const {setupZoneTestEnv} = require('jest-preset-angular/setup-env/zone');
115

12-
const {getTestBed} = require('@angular/core/testing');
13-
const testingModule = require('@angular/platform-browser-dynamic/testing');
14-
15-
getTestBed().initTestEnvironment(
16-
testingModule.BrowserDynamicTestingModule,
17-
testingModule.platformBrowserDynamicTesting(),
18-
);
6+
setupZoneTestEnv();

examples/angular/shared/data.service.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ import {SubService} from './sub.service';
55

66
const title = 'SubTest';
77
const getTitleFn = jest.fn().mockReturnValue(title);
8-
const subServiceSpy = jest.fn().mockImplementation(() => ({
8+
const subServiceMock: Partial<SubService> = {
99
getTitle: getTitleFn,
10-
}));
10+
};
1111

1212
describe('Service: DataService', () => {
1313
let service: DataService;
1414

1515
beforeEach(() => {
1616
TestBed.configureTestingModule({
17-
providers: [DataService, {provide: SubService, useClass: subServiceSpy}],
17+
providers: [DataService, {provide: SubService, useValue: subServiceMock}],
1818
});
1919

20-
service = TestBed.get(DataService);
20+
service = TestBed.inject(DataService);
2121
});
2222

2323
it('should create service', () => {

0 commit comments

Comments
 (0)