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
84 changes: 44 additions & 40 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@
"apps/example-app/src/**/*.html",
"apps/example-app/src/**/*.html"
]
}
},
"outputs": ["{options.outputFile}"]
},
"test": {
"builder": "@nrwl/jest:jest",
Expand Down Expand Up @@ -164,7 +165,8 @@
"apps/example-app-karma/src/**/*.html",
"apps/example-app-karma/src/**/*.html"
]
}
},
"outputs": ["{options.outputFile}"]
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
Expand All @@ -180,111 +182,113 @@
}
}
},
"testing-library": {
"root": "projects/testing-library",
"sourceRoot": "projects/testing-library/src",
"jest-utils": {
"root": "projects/jest-utils",
"sourceRoot": "projects/jest-utils/src",
"projectType": "library",
"prefix": "lib",
"architect": {
"build-package": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "projects/testing-library/tsconfig.lib.json",
"project": "projects/testing-library/ng-package.json"
"tsConfig": "projects/jest-utils/tsconfig.lib.json",
"project": "projects/jest-utils/ng-package.json"
},
"configurations": {
"production": {
"project": "projects/testing-library/ng-package.json",
"tsConfig": "projects/testing-library/tsconfig.lib.json"
"project": "projects/jest-utils/ng-package.json",
"tsConfig": "projects/jest-utils/tsconfig.lib.json"
}
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": [
"projects/testing-library/**/*.ts",
"projects/testing-library/**/*.html",
"projects/testing-library/src/**/*.html",
"projects/testing-library/src/**/*.html",
"projects/testing-library/src/**/*.html"
"projects/jest-utils/**/*.ts",
"projects/jest-utils/**/*.html",
"projects/jest-utils/src/**/*.html",
"projects/jest-utils/src/**/*.html",
"projects/jest-utils/src/**/*.html"
]
}
},
"outputs": ["{options.outputFile}"]
},
"build": {
"builder": "@nrwl/workspace:run-commands",
"options": {
"parallel": false,
"commands": [
{
"command": "ng run testing-library:build-package"
},
{
"command": "npm run build:schematics"
},
{
"command": "cpy ./README.md ./dist/@testing-library/angular"
"command": "ng run jest-utils:build-package"
}
]
}
},
"test": {
"builder": "@nrwl/jest:jest",
"options": {
"jestConfig": "projects/testing-library/jest.config.js"
"jestConfig": "projects/jest-utils/jest.config.js"
},
"outputs": ["coverage/projects/testing-library"]
"outputs": ["coverage/projects/jest-utils"]
}
}
},
"jest-utils": {
"root": "projects/jest-utils",
"sourceRoot": "projects/jest-utils/src",
"testing-library": {
"root": "projects/testing-library",
"sourceRoot": "projects/testing-library/src",
"projectType": "library",
"prefix": "lib",
"architect": {
"build-package": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "projects/jest-utils/tsconfig.lib.json",
"project": "projects/jest-utils/ng-package.json"
"tsConfig": "projects/testing-library/tsconfig.lib.json",
"project": "projects/testing-library/ng-package.json"
},
"configurations": {
"production": {
"project": "projects/jest-utils/ng-package.json",
"tsConfig": "projects/jest-utils/tsconfig.lib.json"
"project": "projects/testing-library/ng-package.json",
"tsConfig": "projects/testing-library/tsconfig.lib.json"
}
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": [
"projects/jest-utils/**/*.ts",
"projects/jest-utils/**/*.html",
"projects/jest-utils/src/**/*.html",
"projects/jest-utils/src/**/*.html",
"projects/jest-utils/src/**/*.html"
"projects/testing-library/**/*.ts",
"projects/testing-library/**/*.html",
"projects/testing-library/src/**/*.html",
"projects/testing-library/src/**/*.html",
"projects/testing-library/src/**/*.html"
]
}
},
"outputs": ["{options.outputFile}"]
},
"build": {
"builder": "@nrwl/workspace:run-commands",
"options": {
"parallel": false,
"commands": [
{
"command": "ng run jest-utils:build-package"
"command": "ng run testing-library:build-package"
},
{
"command": "npm run build:schematics"
},
{
"command": "cpy ./README.md ./dist/@testing-library/angular"
}
]
}
},
"test": {
"builder": "@nrwl/jest:jest",
"options": {
"jestConfig": "projects/jest-utils/jest.config.js"
"jestConfig": "projects/testing-library/jest.config.js"
},
"outputs": ["coverage/projects/jest-utils"]
"outputs": ["coverage/projects/testing-library"]
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const { getJestProjects } = require('@nrwl/jest');

module.exports = {
projects: ['<rootDir>/apps/example-app', '<rootDir>/projects/testing-library', '<rootDir>/projects/jest-utils'],
projects: getJestProjects(),
};
4 changes: 2 additions & 2 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
"example-app-karma": {
"tags": []
},
"testing-library": {
"jest-utils": {
"tags": []
},
"jest-utils": {
"testing-library": {
"tags": []
}
}
Expand Down
68 changes: 34 additions & 34 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,48 +28,48 @@
"prepare": "husky install"
},
"dependencies": {
"@angular/animations": "12.1.1",
"@angular/cdk": "12.1.1",
"@angular/common": "12.1.1",
"@angular/compiler": "12.1.1",
"@angular/core": "12.1.1",
"@angular/forms": "12.1.1",
"@angular/material": "12.1.1",
"@angular/platform-browser": "12.1.1",
"@angular/platform-browser-dynamic": "12.1.1",
"@angular/router": "12.1.1",
"@ngrx/store": "12.2.0",
"@nrwl/angular": "12.5.1",
"@nrwl/nx-cloud": "11.2.0",
"@angular/animations": "12.2.0",
"@angular/cdk": "12.2.0",
"@angular/common": "12.2.0",
"@angular/compiler": "12.2.0",
"@angular/core": "12.2.0",
"@angular/forms": "12.2.0",
"@angular/material": "12.2.0",
"@angular/platform-browser": "12.2.0",
"@angular/platform-browser-dynamic": "12.2.0",
"@angular/router": "12.2.0",
"@ngrx/store": "12.4.0",
"@nrwl/angular": "12.9.0",
"@nrwl/nx-cloud": "12.3.12",
"@testing-library/dom": "^8.0.0",
"@testing-library/user-event": "^13.1.9",
"core-js": "^3.6.5",
"rxjs": "^6.5.5",
"tslib": "^2.0.0",
"zone.js": "^0.11.4"
"zone.js": "0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "12.1.0",
"@angular-eslint/eslint-plugin": "^12.2.0",
"@angular-eslint/eslint-plugin-template": "^12.2.0",
"@angular-eslint/template-parser": "^12.2.0",
"@angular/cli": "12.1.0",
"@angular/compiler-cli": "12.1.1",
"@angular/language-service": "12.1.1",
"@nrwl/cli": "12.5.1",
"@nrwl/eslint-plugin-nx": "12.5.1",
"@nrwl/jest": "12.5.1",
"@nrwl/linter": "12.5.1",
"@nrwl/node": "12.5.1",
"@nrwl/nx-plugin": "12.5.1",
"@nrwl/workspace": "12.5.1",
"@angular-devkit/build-angular": "12.2.7",
"@angular-eslint/eslint-plugin": "12.3.1",
"@angular-eslint/eslint-plugin-template": "12.3.1",
"@angular-eslint/template-parser": "12.3.1",
"@angular/cli": "12.2.7",
"@angular/compiler-cli": "12.2.0",
"@angular/language-service": "12.2.0",
"@nrwl/cli": "12.9.0",
"@nrwl/eslint-plugin-nx": "12.9.0",
"@nrwl/jest": "12.9.0",
"@nrwl/linter": "12.9.0",
"@nrwl/node": "12.9.0",
"@nrwl/nx-plugin": "12.9.0",
"@nrwl/workspace": "12.9.0",
"@testing-library/jasmine-dom": "^1.2.0",
"@testing-library/jest-dom": "^5.11.10",
"@types/jasmine": "^3.5.0",
"@types/jest": "^26.0.23",
"@types/jest": "^27.0.2",
"@types/node": "14.14.37",
"@typescript-eslint/eslint-plugin": "4.28.2",
"@typescript-eslint/parser": "4.28.2",
"@typescript-eslint/eslint-plugin": "4.28.5",
"@typescript-eslint/parser": "4.28.5",
"cpy-cli": "^3.1.1",
"eslint": "^7.25.0",
"eslint-config-prettier": "8.3.0",
Expand All @@ -82,18 +82,18 @@
"jasmine-core": "^3.7.0",
"jasmine-spec-reporter": "^5.0.0",
"jest": "^27.0.6",
"jest-preset-angular": "9.0.4",
"jest-preset-angular": "9.0.7",
"karma": "^6.3.4",
"karma-chrome-launcher": "^3.1.0",
"karma-jasmine": "^4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"lint-staged": "^10.2.11",
"ng-packagr": "12.0.0",
"ng-packagr": "12.2.2",
"prettier": "^2.3.0",
"rimraf": "^3.0.2",
"semantic-release": "^17.1.1",
"ts-jest": "^27.0.3",
"ts-node": "9.1.1",
"typescript": "4.2.4"
"typescript": "4.3.5"
}
}