miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(testing): update ts-jest to version 26.5.5 (#5405)

Browse Source 
Update `jest.config.js` ts-jest section with lower-cased 'tsconfig' property as 'tsConfig' is to be deprecated in version 27.
This commit is contained in:
Minijus L 2021-04-26 15:56:52 +03:00 committed by GitHub
parent c41968648a
commit 357ecd09a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
48 changed files with 205 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dep-graph/dep-graph/jest.config.js
View File

@ -4,7 +4,7 @@ module.exports = {
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {
'ts-jest': {
tsConfig: '<rootDir>/tsconfig.spec.json',
tsconfig: '<rootDir>/tsconfig.spec.json',
},
},
transform: {

2
e2e/angular/jest.config.js
View File

@ -5,6 +5,6 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-angular',
};

2
e2e/cli/jest.config.js
View File

@ -5,6 +5,6 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-cli',
};

2
e2e/cypress/jest.config.js
View File

@ -5,6 +5,6 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-cypress',
};

2
e2e/gatsby/jest.config.js
View File

@ -5,6 +5,6 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-next',
};

2
e2e/jest/jest.config.js
View File

@ -5,6 +5,6 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-jest',
};

2
e2e/linter/jest.config.js
View File

@ -5,6 +5,6 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-linter',
};

2
e2e/next/jest.config.js
View File

@ -5,6 +5,6 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-next',
};

2
e2e/node/jest.config.js
View File

@ -5,6 +5,6 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-node',
};

2
e2e/node/src/node.test.ts
View File

@ -387,7 +387,7 @@ describe('nest libraries', function () {
preset: '../../jest.preset.js',
globals: {
'ts-jest': {
tsConfig: '<rootDir>/tsconfig.spec.json',
tsconfig: '<rootDir>/tsconfig.spec.json',
},
},
testEnvironment: 'node',

2
e2e/nx-plugin/jest.config.js
View File

@ -5,6 +5,6 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-nx-plugin',
};

2
e2e/react/jest.config.js
View File

@ -5,6 +5,6 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-react',
};

2
e2e/storybook/jest.config.js
View File

@ -5,6 +5,6 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-storybook',
};

2
e2e/web/jest.config.js
View File

@ -5,6 +5,6 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-web',
};

2
e2e/workspace/jest.config.js
View File

@ -5,6 +5,6 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'e2e-workspace',
};

2
nx-dev/data-access-documents/jest.config.js
View File

@ -4,7 +4,7 @@ module.exports = {
displayName: 'nx-dev-data-access-documents',
globals: {
'ts-jest': {
tsConfig: '<rootDir>/tsconfig.spec.json',
tsconfig: '<rootDir>/tsconfig.spec.json',
},
},
transform: {

2
package.json
View File

@ -219,7 +219,7 @@
"tippy.js": "^6.3.1",
"tmp": "~0.2.1",
"tree-kill": "1.2.2",
"ts-jest": "26.4.0",
"ts-jest": "26.5.5",
"ts-loader": "5.4.5",
"ts-node": "9.1.1",
"tsconfig-paths": "^3.9.0",

2
packages/angular/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'angular',
};

2
packages/cli/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'cli',
};

2
packages/create-nx-plugin/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'create-nx-plugin',
};

2
packages/create-nx-workspace/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'create-nx-workspace',
};

2
packages/cypress/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'cypress',
};

2
packages/devkit/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'cli',
};

2
packages/eslint-plugin-nx/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'eslint-plugin-nx',
};

2
packages/express/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'express',
};

2
packages/gatsby/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'gatsby',
};

2
packages/jest/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'jest',
};

9
packages/jest/migrations.json
View File

@ -64,6 +64,11 @@
"version": "12.1.0-beta.1",
"description": "Update jest-preset-angular to version 8.4.0",
"factory": "./src/migrations/update-12-1-0/update-jest-preset-angular"
},
"update-ts-jest-6-5-5": {
"version": "12.1.0-beta.1",
"description": "Replace tsConfig with tsconfig for ts-jest in jest.config.js",
"factory": "./src/migrations/update-12-1-0/update-ts-jest"
}
},
"packageJsonUpdates": {
@ -137,6 +142,10 @@
"jest-preset-angular": {
"version": "8.4.0",
"alwaysAddToPackageJson": false
},
"ts-jest": {
"version": "26.5.5",
"alwaysAddToPackageJson": false
}
}
}

4
packages/jest/src/generators/jest-project/__snapshots__/jest-project.spec.ts.snap
View File

@ -33,7 +33,7 @@ exports[`jestProject --setup-file should have setupFilesAfterEnv and globals.ts-
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {
'ts-jest': {
tsConfig: '<rootDir>/tsconfig.spec.json',
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\\\\\\\.(html|svg)$',
astTransformers: {
before: [
@ -59,7 +59,7 @@ exports[`jestProject should create a jest.config.js 1`] = `
preset: '../../jest.preset.js',
globals: {
'ts-jest': {
tsConfig: '<rootDir>/tsconfig.spec.json',
tsconfig: '<rootDir>/tsconfig.spec.json',
}
},
coverageDirectory: '../../coverage/libs/lib1',

2
packages/jest/src/generators/jest-project/files/jest.config.js__tmpl__
View File

@ -4,7 +4,7 @@ module.exports = {
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],<% } %><% if (transformer === 'ts-jest') { %>
globals: {
'ts-jest': {
tsConfig: '<rootDir>/tsconfig.spec.json',<%if (setupFile === 'angular') { %>
tsconfig: '<rootDir>/tsconfig.spec.json',<%if (setupFile === 'angular') { %>
stringifyContentPathRegex: '\\.(html|svg)$',
astTransformers: {
before: [

2
packages/jest/src/generators/jest-project/jest-project.spec.ts
View File

@ -270,7 +270,7 @@ describe('jestProject', () => {
expect(jestConfig.globals).toEqual({
'ts-jest': {
tsConfig: '<rootDir>/tsconfig.spec.json',
tsconfig: '<rootDir>/tsconfig.spec.json',
},
});
});

85
packages/jest/src/migrations/update-12-1-0/update-ts-jest.spec.ts Normal file
View File

@ -0,0 +1,85 @@
import { Tree } from '@angular-devkit/schematics';
import { SchematicTestRunner } from '@angular-devkit/schematics/testing';
import { serializeJson } from '@nrwl/workspace';
import { createEmptyWorkspace } from '@nrwl/workspace/testing';
import * as path from 'path';
import { getJestObject } from '../update-10-0-0/require-jest-config';
import { jestConfigObject } from '../utils/config/legacy/functions';
jest.mock('../update-10-0-0/require-jest-config');
const getJestObjectMock = getJestObject as jest.Mock<typeof getJestObject>;
const jestObject = {
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
};
describe('update 12.1.0', () => {
let initialTree: Tree;
let schematicRunner: SchematicTestRunner;
const jestConfig = String.raw`
module.exports = ${JSON.stringify(jestObject, null, 2)}
`;
beforeEach(() => {
getJestObjectMock.mockImplementation((path: string): any => {
if (path.includes('apps/products')) {
return jestObject;
}
});
initialTree = createEmptyWorkspace(Tree.empty());
initialTree.create('apps/products/jest.config.js', jestConfig);
initialTree.create(
'apps/products/src/test-setup.ts',
`import 'jest-preset-angular';`
);
initialTree.overwrite(
'workspace.json',
serializeJson({
version: 1,
projects: {
products: {
root: 'apps/products',
sourceRoot: 'apps/products/src',
architect: {
build: {
builder: '@angular-devkit/build-angular:browser',
},
test: {
builder: '@nrwl/jest:jest',
options: {
jestConfig: 'apps/products/jest.config.js',
passWithNoTests: true,
},
},
},
},
},
})
);
schematicRunner = new SchematicTestRunner(
'@nrwl/jest',
path.join(__dirname, '../../../migrations.json')
);
});
it('should update the jest.config files by renaming tsConfig', async (done) => {
await schematicRunner
.runSchematicAsync('update-ts-jest-6-5-5', {}, initialTree)
.toPromise();
const jestObject = jestConfigObject(
initialTree,
'apps/products/jest.config.js'
);
expect(jestObject.globals['ts-jest']['tsconfig']).toEqual(
'<rootDir>/tsconfig.spec.json'
);
expect(jestObject.globals['ts-jest']['tsConfig']).toBeUndefined();
done();
});
});

59
packages/jest/src/migrations/update-12-1-0/update-ts-jest.ts Normal file
View File

@ -0,0 +1,59 @@
import { stripIndents } from '@angular-devkit/core/src/utils/literals';
import {
chain,
Rule,
SchematicContext,
Tree,
} from '@angular-devkit/schematics';
import { formatFiles, getWorkspace } from '@nrwl/workspace';
import { appRootPath } from '@nrwl/workspace/src/utilities/app-root';
import { join } from 'path';
import { getJestObject } from '../update-10-0-0/require-jest-config';
import {
addPropertyToJestConfig,
removePropertyFromJestConfig,
} from '../utils/config/legacy/update-config';
function updateJestConfig(): Rule {
return async (host: Tree, context: SchematicContext) => {
const workspace = await getWorkspace(host);
for (const [projectName, project] of workspace.projects) {
for (const [, target] of project.targets) {
if (target.builder !== '@nrwl/jest:jest') {
continue;
}
const jestConfigPath = target.options.jestConfig as string;
const config = getJestObject(join(appRootPath, jestConfigPath));
const tsJestConfig = config.globals['ts-jest'];
if (!tsJestConfig.tsConfig) {
continue;
}
try {
removePropertyFromJestConfig(
host,
jestConfigPath,
'globals.ts-jest.tsConfig'
);
addPropertyToJestConfig(
host,
jestConfigPath,
'globals.ts-jest.tsconfig',
tsJestConfig.tsConfig
);
} catch {
context.logger.error(
stripIndents`Unable to update jest.config.js for project ${projectName}.`
);
}
}
}
};
}
export default function update(): Rule {
return chain([updateJestConfig(), formatFiles()]);
}

2
packages/jest/src/utils/versions.ts
View File

@ -1,7 +1,7 @@
export const nxVersion = '*';
export const jestVersion = '26.2.2';
export const jestTypesVersion = '26.0.8';
export const tsJestVersion = '26.4.0';
export const tsJestVersion = '26.5.5';
export const babelCoreVersion = '7.12.13';
export const babelPresetEnvVersion = '7.12.13';

2
packages/linter/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'linter',
};

2
packages/nest/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'nest',
};

2
packages/nest/src/schematics/library/library.spec.ts
View File

@ -509,7 +509,7 @@ describe('lib', () => {
preset: '../../jest.preset.js',
globals: {
'ts-jest': {
tsConfig: '<rootDir>/tsconfig.spec.json',
tsconfig: '<rootDir>/tsconfig.spec.json',
},
},
testEnvironment: 'node',

2
packages/next/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'next',
};

2
packages/node/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'node',
};

2
packages/nx-plugin/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'nx-plugin',
};

2
packages/nx/jest.config.js
View File

@ -5,5 +5,5 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
};

2
packages/react/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'react',
};

2
packages/storybook/jest.config.js
View File

@ -5,7 +5,7 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: {
'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' },
'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' },
},
displayName: 'storybook',
};

2
packages/tao/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'tao',
};

2
packages/web/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'web',
};

2
packages/workspace/jest.config.js
View File

@ -4,6 +4,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
displayName: 'workspace',
};

2
packages/workspace/src/generators/library/library.spec.ts
View File

@ -117,7 +117,7 @@ describe('lib', () => {
preset: '../../jest.preset.js',
globals: {
'ts-jest': {
tsConfig: '<rootDir>/tsconfig.spec.json',
tsconfig: '<rootDir>/tsconfig.spec.json',
}
},
transform: {

23
yarn.lock
View File

@ -3696,14 +3696,6 @@
jest-diff "^25.2.1"
pretty-format "^25.2.1"
"@types/jest@26.x":
version "26.0.20"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.20.tgz#cd2f2702ecf69e86b586e1f5223a60e454056307"
integrity sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA==
dependencies:
jest-diff "^26.0.0"
pretty-format "^26.0.0"
"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
version "7.0.7"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
@ -13248,7 +13240,7 @@ jest-diff@^25.2.1:
jest-get-type "^25.2.6"
pretty-format "^25.5.0"
jest-diff@^26.0.0, jest-diff@^26.6.2:
jest-diff@^26.6.2:
version "26.6.2"
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
@ -14452,7 +14444,7 @@ lodash.map@^4.5.1:
resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=
lodash.memoize@4.x, lodash.memoize@^4.1.2:
lodash.memoize@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
@ -21035,18 +21027,17 @@ ts-essentials@^2.0.3:
resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz#c9303f3d74f75fa7528c3d49b80e089ab09d8745"
integrity sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w==
ts-jest@26.4.0:
version "26.4.0"
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.4.0.tgz#903c7827f3d3bc33efc2f91be294b164400c32e3"
integrity sha512-ofBzoCqf6Nv/PoWb/ByV3VNKy2KJSikamOBxvR3E6eVdIw10GwAXoyvMWXXjZJK2s6S27ZE8fI+JBTnGaovl6Q==
ts-jest@26.5.5:
version "26.5.5"
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.5.tgz#e40481b6ee4dd162626ba481a2be05fa57160ea5"
integrity sha1-5ASBtu5N0WJia6SBor4F+lcWDqU=
dependencies:
"@types/jest" "26.x"
bs-logger "0.x"
buffer-from "1.x"
fast-json-stable-stringify "2.x"
jest-util "^26.1.0"
json5 "2.x"
lodash.memoize "4.x"
lodash "4.x"
make-error "1.x"
mkdirp "1.x"
semver "7.x"