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
1 change: 1 addition & 0 deletions e2e/nx-e2e/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "nx-e2e",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"sourceRoot": "e2e/nx-e2e/src",
Expand Down
100 changes: 100 additions & 0 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
{
"migrations": [
{
"cli": "nx",
"version": "15.0.0-beta.1",
"description": "Replace implicitDependencies with namedInputs + target inputs",
"implementation": "./src/migrations/update-15-0-0/migrate-to-inputs",
"package": "nx",
"name": "15.0.0-migrate-to-inputs"
},
{
"cli": "nx",
"version": "15.0.0-beta.1",
"description": "Prefix outputs with {workspaceRoot}/{projectRoot} if needed",
"implementation": "./src/migrations/update-15-0-0/prefix-outputs",
"package": "nx",
"name": "15.0.0-prefix-outputs"
},
{
"cli": "nx",
"version": "15.0.12-beta.1",
"description": "Set project names in project.json files",
"implementation": "./src/migrations/update-15-1-0/set-project-names",
"package": "nx",
"name": "15.1.0-set-project-names"
},
{
"cli": "nx",
"version": "14.6.0-beta.0",
"description": "Update the @angular/cli package version to ~14.2.0.",
"factory": "./src/migrations/update-14-6-0/update-angular-cli",
"package": "@nrwl/angular",
"name": "update-angular-cli-version-14-2-0"
},
{
"cli": "nx",
"version": "15.0.0-beta.0",
"description": "Rename @nrwl/angular:webpack-server executor to @nrwl/angular:webpack-dev-server",
"factory": "./src/migrations/update-14-8-0/rename-webpack-server",
"package": "@nrwl/angular",
"name": "rename-webpack-server-executor"
},
{
"cli": "nx",
"version": "15.0.0-beta.0",
"description": "Update the usages of @nrwl/angular/testing to import jasmine-marbles symbols from jasmine-marbles itself.",
"factory": "./src/migrations/update-15-0-0/switch-to-jasmine-marbles",
"package": "@nrwl/angular",
"name": "switch-to-jasmine-marbles"
},
{
"cli": "nx",
"version": "15.0.0-beta.1",
"description": "Stop hashing karma spec files and config files for build targets and dependent tasks",
"factory": "./src/migrations/update-15-0-0/add-karma-inputs",
"package": "@nrwl/angular",
"name": "add-karma-inputs"
},
{
"version": "14.6.0-beta.0",
"cli": "nx",
"description": "Update jest configs to support jest 28 changes (https://jestjs.io/docs/upgrading-to-jest28#configuration-options)",
"factory": "./src/migrations/update-14-6-0/update-configs-jest-28",
"package": "@nrwl/jest",
"name": "update-configs-jest-28"
},
{
"version": "14.6.0-beta.0",
"cli": "nx",
"description": "Update jest test files to support jest 28 changes (https://jestjs.io/docs/upgrading-to-jest28)",
"factory": "./src/migrations/update-14-6-0/update-tests-jest-28",
"package": "@nrwl/jest",
"name": "update-tests-jest-28"
},
{
"version": "15.0.0-beta.0",
"cli": "nx",
"description": "Stop hashing jest spec files and config files for build targets and dependent tasks",
"factory": "./src/migrations/update-15-0-0/add-jest-inputs",
"package": "@nrwl/jest",
"name": "add-jest-inputs"
},
{
"cli": "nx",
"version": "15.0.0-beta.0",
"description": "Migrates executor schema files to v2",
"factory": "./src/migrations/update-15-0-0/specify-output-capture",
"package": "@nrwl/nx-plugin",
"name": "update-15-0-0"
},
{
"version": "14.8.0-beta.0",
"description": "Migrates from @nrwl/workspace:run-commands to nx:run-commands",
"cli": "nx",
"implementation": "./src/migrations/update-14-8-0/change-run-commands-executor",
"package": "@nrwl/workspace",
"name": "14-8-0-change-run-commands-executor"
}
]
}
31 changes: 11 additions & 20 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,11 @@
"affected": {
"defaultBase": "master"
},
"implicitDependencies": {
"workspace.json": "*",
"package.json": {
"dependencies": "*",
"devDependencies": "*"
},
"tsconfig.base.json": "*",
"tslint.json": "*",
".eslintrc.json": "*",
"nx.json": "*"
},
"tasksRunnerOptions": {
"default": {
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": [
"build",
"lint",
"test",
"e2e"
],
"cacheableOperations": ["build", "lint", "test", "e2e"],
"parallel": 1
}
}
Expand All @@ -35,9 +19,16 @@
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"targetDefaults": {
"build": {
"dependsOn": [
"^build"
]
"dependsOn": ["^build"],
"inputs": ["production", "^production"]
},
"test": {
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
}
},
"namedInputs": {
"default": ["{projectRoot}/**/*", "sharedGlobals"],
"sharedGlobals": ["{workspaceRoot}/workspace.json", "{workspaceRoot}/tsconfig.base.json", "{workspaceRoot}/tslint.json", "{workspaceRoot}/nx.json"],
"production": ["default", "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)", "!{projectRoot}/tsconfig.spec.json", "!{projectRoot}/jest.config.[jt]s"]
}
}
25 changes: 12 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@
},
"private": true,
"devDependencies": {
"@angular/core": "14.1.3",
"@nrwl/angular": "14.5.10",
"@nrwl/cli": "14.5.10",
"@nrwl/eslint-plugin-nx": "14.5.10",
"@nrwl/jest": "14.5.10",
"@nrwl/nx-plugin": "14.5.10",
"@nrwl/workspace": "14.5.10",
"@angular/core": "~14.2.0",
"@nrwl/angular": "15.1.1",
"@nrwl/cli": "15.1.1",
"@nrwl/eslint-plugin-nx": "15.1.1",
"@nrwl/jest": "15.1.1",
"@nrwl/nx-plugin": "15.1.1",
"@nrwl/workspace": "15.1.1",
"@swc-node/register": "^1.4.2",
"@swc/core": "^1.2.173",
"@types/fs-extra": "^9.0.11",
"@types/jest": "27.4.1",
"@types/jest": "28.1.8",
"@types/node": "^18.0.0",
"@types/plist": "^3.0.2",
"@types/xml2js": "^0.4.9",
Expand All @@ -54,16 +54,15 @@
"eslint": "7.22.0",
"eslint-config-prettier": "8.1.0",
"fs-extra": "^10.1.0",
"jest": "27.5.1",
"jest": "28.1.3",
"jsonc-parser": "3.0.0",
"nx": "14.5.10",
"nx": "15.1.1",
"plist": "^3.0.4",
"prettier": "^2.7.0",
"ts-jest": "27.1.4",
"ts-jest": "28.0.8",
"ts-node": "10.9.1",
"tslib": "^2.4.0",
"typescript": "~4.7.3",
"typescript": "4.8.4",
"xml2js": "^0.4.23"
}
}

2 changes: 1 addition & 1 deletion packages/nx/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nativescript/nx",
"version": "4.0.2",
"version": "4.1.0",
"description": "NativeScript Plugin for Nx",
"repository": {
"type": "git",
Expand Down
3 changes: 2 additions & 1 deletion packages/nx/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "nx",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/nx/src",
"projectType": "library",
Expand All @@ -13,7 +14,7 @@
},
"test": {
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/packages/nx"],
"outputs": ["{workspaceRoot}/coverage/packages/nx"],
"options": {
"jestConfig": "packages/nx/jest.config.ts",
"passWithNoTests": true
Expand Down
2 changes: 2 additions & 0 deletions packages/nx/src/executors/build/schema.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"version": 2,
"outputCapture": "direct-nodejs",
"$schema": "http://json-schema.org/schema",
"title": "NativeScript builder",
"description": "",
Expand Down
2 changes: 2 additions & 0 deletions packages/nx/src/executors/test/schema.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"version": 2,
"outputCapture": "direct-nodejs",
"$schema": "http://json-schema.org/schema",
"title": "Start the NativeScript unit test runner",
"description": "",
Expand Down
2 changes: 1 addition & 1 deletion packages/nx/src/generators/application/application.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe('app', () => {
await applicationGenerator(appTree, { name: 'myApp' });
const config = readProjectConfiguration(appTree, 'nativescript-my-app');

expect(config.root).toEqual('apps/nativescript-my-app/');
expect(config.root).toEqual('apps/nativescript-my-app');
});

it('should generate files', async () => {
Expand Down
10 changes: 5 additions & 5 deletions packages/nx/src/utils/versions.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
export const nxVersion = '^14.0.0';
export const nxVersion = '^15.0.0';

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


// Frontend frameworks
Expand Down
Loading