Skip to content

Commit

Permalink
ci: update to [email protected] (#713)
Browse files Browse the repository at this point in the history
  • Loading branch information
nsbarsukov authored Dec 5, 2023
1 parent c38d71c commit 16615be
Show file tree
Hide file tree
Showing 24 changed files with 339 additions and 969 deletions.
5 changes: 0 additions & 5 deletions jest.config.js

This file was deleted.

5 changes: 5 additions & 0 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import {getJestProjects} from '@nrwl/jest';

export default {
projects: getJestProjects(),
};
2 changes: 1 addition & 1 deletion jest.preset.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const nxPreset = require('@nrwl/jest/preset');
const nxPreset = require('@nrwl/jest/preset').default;
const {resolve} = require('path');

module.exports = {
Expand Down
9 changes: 0 additions & 9 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,6 @@
"tsconfig.json": "*"
},
"npmScope": "maskito",
"tasksRunnerOptions": {
"default": {
"runner": "@nrwl/nx-cloud",
"options": {
"cacheableOperations": ["build", "test", "lint"],
"parallel": 3
}
}
},
"affected": {
"defaultBase": "origin/main"
},
Expand Down
1,222 changes: 304 additions & 918 deletions package-lock.json

Large diffs are not rendered by default.

21 changes: 10 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,16 @@
"@angular/compiler-cli": "13.3.12",
"@angular/language-service": "13.3.12",
"@commitlint/cli": "18.4.3",
"@nrwl/angular": "13.10.6",
"@nrwl/cli": "13.10.6",
"@nrwl/eslint-plugin-nx": "13.10.6",
"@nrwl/jest": "13.10.6",
"@nrwl/js": "13.10.6",
"@nrwl/node": "13.10.6",
"@nrwl/nx-cloud": "13.1.4",
"@nrwl/react": "13.10.6",
"@nrwl/tao": "13.10.6",
"@nrwl/web": "13.10.6",
"@nrwl/workspace": "13.10.6",
"@nrwl/angular": "14.1.9",
"@nrwl/cli": "14.1.9",
"@nrwl/eslint-plugin-nx": "14.1.9",
"@nrwl/jest": "14.1.9",
"@nrwl/js": "14.1.9",
"@nrwl/node": "14.1.9",
"@nrwl/react": "14.1.9",
"@nrwl/tao": "14.1.9",
"@nrwl/web": "14.1.9",
"@nrwl/workspace": "14.1.9",
"@taiga-ui/commitlint-config": "0.4.2",
"@taiga-ui/cspell-config": "0.23.1",
"@taiga-ui/eslint-plugin-experience": "0.39.3",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
displayName: 'angular',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
Expand Down
3 changes: 1 addition & 2 deletions projects/angular/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"projectType": "library",
"root": "projects/angular",
"sourceRoot": "projects/angular/src",
"prefix": "maskito",
"targets": {
Expand Down Expand Up @@ -31,7 +30,7 @@
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/angular"],
"options": {
"jestConfig": "projects/angular/jest.config.js",
"jestConfig": "projects/angular/jest.config.ts",
"passWithNoTests": true
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
displayName: 'core',
preset: '../../jest.preset.js',
transform: {
Expand Down
3 changes: 1 addition & 2 deletions projects/core/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"root": "projects/core",
"sourceRoot": "projects/core/src",
"projectType": "library",
"targets": {
Expand All @@ -25,7 +24,7 @@
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/core"],
"options": {
"jestConfig": "projects/core/jest.config.js",
"jestConfig": "projects/core/jest.config.ts",
"passWithNoTests": true
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
displayName: 'demo',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
Expand Down
3 changes: 1 addition & 2 deletions projects/demo/project.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"projectType": "application",
"generators": {},
"root": "projects/demo",
"sourceRoot": "projects/demo/src",
"prefix": "app",
"targets": {
Expand Down Expand Up @@ -130,7 +129,7 @@
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/demo"],
"options": {
"jestConfig": "projects/demo/jest.config.js",
"jestConfig": "projects/demo/jest.config.ts",
"passWithNoTests": true
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
displayName: 'kit',
preset: '../../jest.preset.js',
transform: {
Expand Down
3 changes: 1 addition & 2 deletions projects/kit/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"root": "projects/kit",
"sourceRoot": "projects/kit/src",
"projectType": "library",
"targets": {
Expand Down Expand Up @@ -32,7 +31,7 @@
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/kit"],
"options": {
"jestConfig": "projects/kit/jest.config.js",
"jestConfig": "projects/kit/jest.config.ts",
"passWithNoTests": true
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
displayName: 'phone',
preset: '../../jest.preset.js',
transform: {
Expand Down
3 changes: 1 addition & 2 deletions projects/phone/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"root": "projects/phone",
"sourceRoot": "projects/phone/src",
"projectType": "library",
"targets": {
Expand Down Expand Up @@ -32,7 +31,7 @@
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/phone"],
"options": {
"jestConfig": "projects/phone/jest.config.js",
"jestConfig": "projects/phone/jest.config.ts",
"passWithNoTests": true
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
displayName: 'react',
preset: '../../jest.preset.js',
transform: {
Expand Down
3 changes: 1 addition & 2 deletions projects/react/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"root": "projects/react",
"sourceRoot": "projects/react/src",
"projectType": "library",
"tags": [],
Expand Down Expand Up @@ -41,7 +40,7 @@
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/projects/react"],
"options": {
"jestConfig": "projects/react/jest.config.js",
"jestConfig": "projects/react/jest.config.ts",
"passWithNoTests": true
}
},
Expand Down
3 changes: 2 additions & 1 deletion projects/react/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"**/*.spec.js",
"**/*.test.js",
"**/*.spec.jsx",
"**/*.test.jsx"
"**/*.test.jsx",
"jest.config.ts"
],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
displayName: 'vue',
preset: '../../jest.preset.js',
transform: {
Expand Down
3 changes: 1 addition & 2 deletions projects/vue/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"root": "projects/vue",
"sourceRoot": "projects/vue/src",
"projectType": "library",
"tags": [],
Expand Down Expand Up @@ -39,7 +38,7 @@
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/projects/vue"],
"options": {
"jestConfig": "projects/vue/jest.config.js",
"jestConfig": "projects/vue/jest.config.ts",
"passWithNoTests": true
}
},
Expand Down
2 changes: 1 addition & 1 deletion projects/vue/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"outDir": "../../dist/out-tsc",
"types": ["node"]
},
"exclude": ["**/*.spec.ts"],
"exclude": ["**/*.spec.ts", "jest.config.ts"],
"include": ["**/*.ts"]
}
2 changes: 1 addition & 1 deletion tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "./tsconfig.json",
"exclude": ["**/*.spec.ts"],
"exclude": ["**/*.spec.ts", "**/jest.config.ts"],
"compilerOptions": {
"declaration": true,
"declarationMap": true,
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.eslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"baseUrl": ".",
"strict": false
},
"include": ["projects", "scripts"],
"include": ["projects", "scripts", "jest.config.ts"],
"exclude": ["**/node_modules", "**/schematics/**", "**/.*/", "*.js"]
}

0 comments on commit 16615be

Please sign in to comment.