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.

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

feat: add experimental precompilation to global setup #1434

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions examples/example-app-v11/jest-esm.config.mjs
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import ngPreset from 'jest-preset-angular/presets/index.js';

globalThis.ngJest = {
skipNgcc: false,
experimentalPrecompilation: true,
tsconfig: 'tsconfig-esm.spec.json',
};
}

/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
const jestConfig = {
...ngPreset.defaultsESM,
preset: 'jest-preset-angular/presets/defaults-esm',
globals: {
'ts-jest': {
...ngPreset.defaultsESM.globals["ts-jest"],
useESM: true,
stringifyContentPathRegex: '\\.(html|svg)$',
tsconfig: '<rootDir>/tsconfig-esm.spec.json',
},
},
Expand Down
1 change: 1 addition & 0 deletions examples/example-app-v11/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const { paths } = require('./tsconfig.json').compilerOptions;
globalThis.ngJest = {
skipNgcc: false,
tsconfig: 'tsconfig.spec.json',
experimentalPrecompilation: true,
};

/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
Expand Down
16 changes: 16 additions & 0 deletions examples/example-app-v11/src/app/app-services/app.service.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { TestBed } from '@angular/core/testing';

import { AppService } from './app.service';

describe('AppService', () => {
let service: AppService;

beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(AppService);
});

it('should be created', () => {
expect(service).toBeTruthy();
});
});
11 changes: 11 additions & 0 deletions examples/example-app-v11/src/app/app-services/app.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Inject, Injectable, Optional } from '@angular/core';
import type { Request } from 'express';

import { REQUEST } from './app.tokens';

@Injectable({
providedIn: 'root',
})
export class AppService {
constructor(@Inject(REQUEST) @Optional() private request: Request) {}
}
4 changes: 4 additions & 0 deletions examples/example-app-v11/src/app/app-services/app.tokens.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { InjectionToken } from '@angular/core';
import type { Request } from 'express';

export const REQUEST = new InjectionToken<Request>('express-request');
3 changes: 3 additions & 0 deletions examples/example-app-v11/src/app/app-services/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import * as Services from './app.service';

export { Services };
6 changes: 5 additions & 1 deletion examples/example-app-v11/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import { Component } from '@angular/core';

import { Services } from './app-services';

@Component({
selector: 'app-root',
templateUrl: './app.component.html',
})
export class AppComponent {}
export class AppComponent {
constructor(private myService: Services.AppService) {}
}
1 change: 1 addition & 0 deletions examples/example-app-v11/tsconfig-esm.spec.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "./tsconfig.json",
"compilerOptions": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
globalThis.ngJest = {
skipNgcc: false,
tsconfig: 'tsconfig-esm.spec.json',
experimentalPrecompilation: true,
};

/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
Expand Down
1 change: 1 addition & 0 deletions examples/example-app-v12-monorepo/jest-esm.config.mjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
globalThis.ngJest = {
skipNgcc: false,
tsconfig: 'tsconfig-esm.spec.json',
experimentalPrecompilation: true,
};

/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
Expand Down
1 change: 1 addition & 0 deletions examples/example-app-v12-monorepo/jest-isolated.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
globalThis.ngJest = {
skipNgcc: false,
tsconfig: 'tsconfig.spec.json',
experimentalPrecompilation: true,
};

/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
Expand Down
1 change: 1 addition & 0 deletions examples/example-app-v12-monorepo/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
globalThis.ngJest = {
skipNgcc: false,
tsconfig: 'tsconfig.spec.json',
experimentalPrecompilation: true,
};

/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
globalThis.ngJest = {
skipNgcc: false,
experimentalPrecompilation: true,
tsconfig: 'tsconfig-esm.spec.json',
}

/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
const jestConfig = {
preset: 'jest-preset-angular/presets/defaults-esm',
Expand All @@ -8,9 +14,7 @@ const jestConfig = {
tsconfig: '<rootDir>/tsconfig-esm.spec.json',
},
},
moduleNameMapper: {
tslib: 'tslib/tslib.es6.js',
},
globalSetup: 'jest-preset-angular/global-setup',
setupFilesAfterEnv: ['<rootDir>/setup-jest.ts'],
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { TestBed } from '@angular/core/testing';

import { AppService } from './app.service';

describe('AppService', () => {
let service: AppService;

beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(AppService);
});

it('should be created', () => {
expect(service).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Inject, Injectable, Optional } from '@angular/core';
import type { Request } from 'express';

import { REQUEST } from './app.tokens';

@Injectable({
providedIn: 'root',
})
export class AppService {
constructor(@Inject(REQUEST) @Optional() private request: Request) {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { InjectionToken } from '@angular/core';
import type { Request } from 'express';

export const REQUEST = new InjectionToken<Request>('express-request');
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import * as Services from './app.service';

export { Services };
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import { Component } from '@angular/core';

import { Services } from './app-services';

@Component({
selector: 'app-root',
templateUrl: './app.component.html',
})
export class AppComponent {}
export class AppComponent {
constructor(private myService: Services.AppService) {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Inject, Injectable, Optional } from '@angular/core';
import type { Request } from 'express';

import { REQUEST } from './app.tokens';

@Injectable({
providedIn: 'root',
})
export class AppService {
constructor(@Inject(REQUEST) @Optional() private request: Request) {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { InjectionToken } from '@angular/core';
import type { Request } from 'express';

export const REQUEST = new InjectionToken<Request>('express-request');
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
globalThis.ngJest = {
skipNgcc: false,
experimentalPrecompilation: true,
tsconfig: 'tsconfig-esm.spec.json',
}

/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
const jestConfig = {
preset: 'jest-preset-angular/presets/defaults-esm',
Expand All @@ -8,9 +14,7 @@ const jestConfig = {
tsconfig: '<rootDir>/tsconfig-esm.spec.json',
},
},
moduleNameMapper: {
tslib: 'tslib/tslib.es6.js',
},
globalSetup: 'jest-preset-angular/global-setup',
setupFilesAfterEnv: ['<rootDir>/setup-jest.ts'],
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { TestBed } from '@angular/core/testing';

import { AppService } from './app.service';

describe('AppService', () => {
let service: AppService;

beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(AppService);
});

it('should be created', () => {
expect(service).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Inject, Injectable, Optional } from '@angular/core';
import type { Request } from 'express';

import { REQUEST } from './app.tokens';

@Injectable({
providedIn: 'root',
})
export class AppService {
constructor(@Inject(REQUEST) @Optional() private request: Request) {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { InjectionToken } from '@angular/core';
import type { Request } from 'express';

export const REQUEST = new InjectionToken<Request>('express-request');
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import * as Services from './app.service';

export { Services };
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import { Component } from '@angular/core';

import { Services } from './app-services';

@Component({
selector: 'app-root',
templateUrl: './app.component.html',
})
export class AppComponent {}
export class AppComponent {
constructor(private myService: Services.AppService) {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Inject, Injectable, Optional } from '@angular/core';
import type { Request } from 'express';

import { REQUEST } from './app.tokens';

@Injectable({
providedIn: 'root',
})
export class AppService {
constructor(@Inject(REQUEST) @Optional() private request: Request) {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { InjectionToken } from '@angular/core';
import type { Request } from 'express';

export const REQUEST = new InjectionToken<Request>('express-request');
10 changes: 5 additions & 5 deletions examples/example-app-v12/jest-esm.config.mjs
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import ngPreset from 'jest-preset-angular/presets/index.js';

globalThis.ngJest = {
skipNgcc: false,
experimentalPrecompilation: true,
tsconfig: 'tsconfig-esm.spec.json',
};
}

/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
const jestConfig = {
...ngPreset.defaultsESM,
preset: 'jest-preset-angular/presets/defaults-esm',
globals: {
'ts-jest': {
...ngPreset.defaultsESM.globals["ts-jest"],
useESM: true,
stringifyContentPathRegex: '\\.(html|svg)$',
tsconfig: '<rootDir>/tsconfig-esm.spec.json',
},
},
Expand Down
1 change: 1 addition & 0 deletions examples/example-app-v12/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const { paths } = require('./tsconfig.json').compilerOptions;
globalThis.ngJest = {
skipNgcc: false,
tsconfig: 'tsconfig.spec.json',
experimentalPrecompilation: true,
};

/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
Expand Down
16 changes: 16 additions & 0 deletions examples/example-app-v12/src/app/app-services/app.service.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { TestBed } from '@angular/core/testing';

import { AppService } from '../app.service';

describe('AppService', () => {
let service: AppService;

beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(AppService);
});

it('should be created', () => {
expect(service).toBeTruthy();
});
});
11 changes: 11 additions & 0 deletions examples/example-app-v12/src/app/app-services/app.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Inject, Injectable, Optional } from '@angular/core';
import type { Request } from 'express';

import { REQUEST } from './app.tokens';

@Injectable({
providedIn: 'root',
})
export class AppService {
constructor(@Inject(REQUEST) @Optional() private request: Request) {}
}
4 changes: 4 additions & 0 deletions examples/example-app-v12/src/app/app-services/app.tokens.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { InjectionToken } from '@angular/core';
import type { Request } from 'express';

export const REQUEST = new InjectionToken<Request>('express-request');
3 changes: 3 additions & 0 deletions examples/example-app-v12/src/app/app-services/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import * as Services from './app.service';

export { Services };
6 changes: 5 additions & 1 deletion examples/example-app-v12/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import { Component } from '@angular/core';

import { Services } from './app-services';

@Component({
selector: 'app-root',
templateUrl: './app.component.html',
})
export class AppComponent {}
export class AppComponent {
constructor(private myService: Services.AppService) {}
}
11 changes: 11 additions & 0 deletions examples/example-app-v12/src/app/app.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Inject, Injectable, Optional } from '@angular/core';
import type { Request } from 'express';

import { REQUEST } from './app.tokens';

@Injectable({
providedIn: 'root',
})
export class AppService {
constructor(@Inject(REQUEST) @Optional() private request: Request) {}
}
4 changes: 4 additions & 0 deletions examples/example-app-v12/src/app/app.tokens.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { InjectionToken } from '@angular/core';
import type { Request } from 'express';

export const REQUEST = new InjectionToken<Request>('express-request');
1 change: 1 addition & 0 deletions examples/example-app-v12/tsconfig-esm.spec.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "./tsconfig.json",
"compilerOptions": {
Expand Down