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
2 changes: 1 addition & 1 deletion e2e/nx-e2e/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"root": "e2e/nx-e2e",
"sourceRoot": "e2e/nx-e2e/src",
"targets": {
"e2e": {
Expand Down
3 changes: 0 additions & 3 deletions jest.config.js

This file was deleted.

3 changes: 3 additions & 0 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
const { getJestProjects } = require('@nrwl/jest');

export default { projects: [...getJestProjects(), '<rootDir>/e2e/nx-e2e'] };
2 changes: 1 addition & 1 deletion jest.preset.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const nxPreset = require('@nrwl/jest/preset');
const nxPreset = require('@nrwl/jest/preset').default;

module.exports = { ...nxPreset };
26 changes: 14 additions & 12 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,14 @@
},
"tasksRunnerOptions": {
"default": {
"runner": "@nrwl/workspace/tasks-runners/default",
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": ["build", "lint", "test", "e2e"],
"cacheableOperations": [
"build",
"lint",
"test",
"e2e"
],
"parallel": 1
}
}
Expand All @@ -27,15 +32,12 @@
"appsDir": "e2e",
"libsDir": "packages"
},
"targetDependencies": {
"build": [
{
"target": "build",
"projects": "dependencies"
}
]
},
"cli": {
"defaultCollection": "@nrwl/workspace"
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"targetDefaults": {
"build": {
"dependsOn": [
"^build"
]
}
}
}
34 changes: 20 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,17 @@
},
"private": true,
"devDependencies": {
"@nrwl/angular": "13.4.6",
"@nrwl/cli": "13.4.6",
"@nrwl/eslint-plugin-nx": "13.4.6",
"@nrwl/jest": "13.4.6",
"@nrwl/nx-plugin": "13.4.6",
"@nrwl/tao": "13.4.6",
"@nrwl/workspace": "13.4.6",
"@nrwl/angular": "14.3.4",
"@nrwl/cli": "14.3.4",
"@nrwl/eslint-plugin-nx": "14.3.4",
"@nrwl/jest": "14.3.4",
"@nrwl/nx-plugin": "14.3.4",
"@nrwl/workspace": "14.3.4",
"@swc-node/register": "^1.4.2",
"@swc/core": "^1.2.173",
"@types/fs-extra": "^9.0.11",
"@types/jest": "27.0.2",
"@types/node": "^16.0.0",
"@types/jest": "27.4.1",
"@types/node": "^17.0.0",
"@types/plist": "^3.0.2",
"@types/xml2js": "^0.4.9",
"@typescript-eslint/eslint-plugin": "^4.3.0",
Expand All @@ -52,14 +53,19 @@
"eslint": "7.22.0",
"eslint-config-prettier": "8.1.0",
"fs-extra": "^9.1.0",
"jest": "27.2.3",
"jest": "27.5.1",
"jsonc-parser": "3.0.0",
"nx": "14.3.4",
"plist": "^3.0.4",
"prettier": "2.4.1",
"ts-jest": "27.0.5",
"ts-node": "9.1.1",
"prettier": "2.7.0",
"ts-jest": "27.1.4",
"ts-node": "10.8.1",
"tslib": "^2.4.0",
"tslint": "6.1.3",
"typescript": "4.5.5",
"typescript": "4.7.3",
"xml2js": "^0.4.23"
},
"dependencies": {
"@angular/core": "~14.0.0"
}
}
3 changes: 2 additions & 1 deletion packages/nx/jest.config.js → packages/nx/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'nx',
preset: '../../jest.preset.js',
globals: {
Expand Down
6 changes: 3 additions & 3 deletions packages/nx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
"migrations": "./migrations.json"
},
"dependencies": {
"@angular-devkit/architect": "^0.1300.0",
"@angular-devkit/core": "^13.0.0",
"@angular-devkit/schematics": "^13.0.0",
"@angular-devkit/architect": "^0.1400.0",
"@angular-devkit/core": "^14.0.0",
"@angular-devkit/schematics": "^14.0.0",
"fs-extra": "^9.1.0",
"ignore": "^5.0.4",
"jsonc-parser": "3.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/nx/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"root": "packages/nx",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/nx/src",
"projectType": "library",
"generators": {},
Expand All @@ -15,12 +15,12 @@
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/packages/nx"],
"options": {
"jestConfig": "packages/nx/jest.config.js",
"jestConfig": "packages/nx/jest.config.ts",
"passWithNoTests": true
}
},
"build": {
"executor": "@nrwl/node:package",
"executor": "@nrwl/js:tsc",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/packages/nx",
Expand Down
20 changes: 10 additions & 10 deletions packages/nx/src/utils/versions.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
export const nxVersion = '^13.0.0';
export const nxVersion = '^14.0.0';

export const nsNxPluginVersion = '~3.0.0';
export const nsCoreVersion = '~8.1.0';
export const nsTypesVersion = '~8.1.0';
export const nsNxPluginVersion = '~4.0.0';
export const nsCoreVersion = '~8.2.0';
export const nsTypesVersion = '~8.2.0';
export const nsThemeVersion = '~1.0.4';
export const nsWebpackVersion = '~5.0.0';
export const sassVersion = '^1.32.0';
export const nsIOSRuntimeVersion = '~8.1.0';
export const nsAndroidRuntimeVersion = '~8.1.1';
export const nsIOSRuntimeVersion = '~8.2.0';
export const nsAndroidRuntimeVersion = '~8.2.1';


// Frontend frameworks
export const angularVersion = '^13.0.0';
export const nsAngularVersion = '^13.0.0';
export const nsNgToolsVersion = '^13.0.0';
export const angularVersion = '^14.0.0';
export const nsAngularVersion = '^14.0.0';
export const nsNgToolsVersion = '^14.0.0';
export const rxjsVersion = '~7.5.0';
export const zonejsVersion = '^0.11.4';
export const typescriptVersion = '~4.5.0';
export const typescriptVersion = '~4.7.0';
2 changes: 1 addition & 1 deletion packages/nx/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"declaration": true,
"types": ["node"]
},
"exclude": ["**/*.spec.ts", "**/*.test.ts"],
"exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
"include": ["**/*.ts"]
}
2 changes: 1 addition & 1 deletion packages/nx/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"module": "commonjs",
"types": ["jest", "node"]
},
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx", "**/*.spec.js", "**/*.test.js", "**/*.spec.jsx", "**/*.test.jsx", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx", "**/*.spec.js", "**/*.test.js", "**/*.spec.jsx", "**/*.test.jsx", "**/*.d.ts", "jest.config.ts"]
}
3 changes: 2 additions & 1 deletion workspace.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"projects": {
"nx": "packages/nx",
"nx-e2e": "e2e/nx-e2e"
}
},
"$schema": "./node_modules/nx/schemas/workspace-schema.json"
}
Loading