Skip to content

Commit

Permalink
feat: upgrade to nx 14.7.5 (#15)
Browse files Browse the repository at this point in the history
  • Loading branch information
edusperoni authored Sep 17, 2022
1 parent 585352b commit fb7cde4
Show file tree
Hide file tree
Showing 7 changed files with 1,452 additions and 1,121 deletions.
39 changes: 19 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,41 +36,40 @@
},
"devDependencies": {
"@angular-devkit/schematics": "^14.0.0",
"@nrwl/cli": "14.4.0",
"@nrwl/devkit": "14.4.0",
"@nrwl/eslint-plugin-nx": "14.4.0",
"@nrwl/jest": "14.4.0",
"@nrwl/js": "14.4.0",
"@nrwl/linter": "14.4.0",
"@nrwl/node": "14.4.0",
"@nrwl/nx-plugin": "14.4.0",
"@nrwl/workspace": "14.4.0",
"@nrwl/cli": "14.7.5",
"@nrwl/devkit": "14.7.5",
"@nrwl/eslint-plugin-nx": "14.7.5",
"@nrwl/jest": "14.7.5",
"@nrwl/js": "14.7.5",
"@nrwl/linter": "14.7.5",
"@nrwl/node": "14.7.5",
"@nrwl/nx-plugin": "14.7.5",
"@nrwl/workspace": "14.7.5",
"@swc-node/register": "^1.4.2",
"@swc/core": "^1.2.173",
"@types/jest": "27.4.1",
"@types/node": "18.0.0",
"@typescript-eslint/eslint-plugin": "5.24.0",
"@typescript-eslint/parser": "5.24.0",
"@types/jest": "28.1.8",
"@types/node": "18.7.1",
"@typescript-eslint/eslint-plugin": "5.33.1",
"@typescript-eslint/parser": "5.33.1",
"conventional-changelog-cli": "~2.2.0",
"dotenv": "~10.0.0",
"eslint": "8.15.0",
"eslint-config-prettier": "8.1.0",
"github-contributors-list": "~1.2.3",
"husky": "~8.0.0",
"jest": "27.5.1",
"jest": "28.1.3",
"jsonc-parser": "3.0.0",
"nx": "14.4.0",
"nx": "14.7.5",
"parse-version-string": "^1.0.1",
"prettier": "^2.7.1",
"ts-jest": "27.1.4",
"ts-node": "10.8.1",
"prettier": "2.7.1",
"ts-jest": "28.0.8",
"ts-node": "10.9.1",
"tslib": "^2.0.0",
"typescript": "~4.7.4"
"typescript": "4.7.4"
},
"lint-staged": {
"**/*.{js,ts,scss,json,html}": [
"npx prettier --write"
]
}
}

6 changes: 6 additions & 0 deletions packages/plugin-tools/migrations.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@
"version": "4.0.0",
"description": "Migrate tools to 4.0.0",
"implementation": "./src/migrations/update-4-0-0/update-4-0-0"
},
"update-to-4.1.0": {
"cli": "nx",
"version": "4.1.0",
"description": "Migrate tools to 4.1.0",
"implementation": "./src/migrations/update-4-1-0/update-4-1-0"
}
}
}
12 changes: 6 additions & 6 deletions packages/plugin-tools/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nativescript/plugin-tools",
"version": "4.0.3",
"version": "4.1.0",
"description": "NativeScript plugin tooling for workspaces",
"homepage": "https://nativescript.org",
"repository": {
Expand Down Expand Up @@ -28,11 +28,11 @@
"dependencies": {
"xml2js": "~0.4.23",
"@nativescript/nx": "^4.0.1",
"@nrwl/angular": "14.4.0",
"@nrwl/eslint-plugin-nx": "14.4.0",
"@nrwl/node": "14.4.0",
"@nrwl/nx-cloud": "14.2.0",
"@nrwl/workspace": "14.4.0",
"@nrwl/angular": "14.7.5",
"@nrwl/eslint-plugin-nx": "14.7.5",
"@nrwl/node": "14.7.5",
"@nrwl/nx-cloud": "14.6.2",
"@nrwl/workspace": "14.7.5",
"@nstudio/focus": "^14.3.0",
"@nstudio/nps-i": "^2.0.0",
"@types/node": "18.0.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { addProjectConfiguration, getWorkspaceLayout, NxJsonConfiguration, readJson, Tree, updateJson, writeJson } from '@nrwl/devkit';
import { createTree, createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
import { createTree, createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
import update300 from './update-3-0-0';

describe('update-3-0-0', () => {
let tree: Tree;

beforeEach(() => {
tree = createTreeWithEmptyWorkspace();
tree = createTreeWithEmptyV1Workspace();
tree.write(
'workspace.json',
`{
Expand Down Expand Up @@ -400,7 +400,7 @@ describe('update-3-0-0', () => {
},
},
files: ['./references.d.ts', './src/main.ts', './src/polyfills.ts'],
include: ['../../packages/**/references.d.ts']
include: ['../../packages/**/references.d.ts'],
});
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
{
"migrations": [
{
"cli": "nx",
"version": "14.0.6",
"description": "Remove root property from project.json files",
"implementation": "./src/migrations/update-14-0-6/remove-roots",
"package": "nx",
"name": "14-0-6-remove-root"
},
{
"cli": "nx",
"version": "14.2.0-beta.0",
"description": "Add JSON Schema to Nx configuration files",
"implementation": "./src/migrations/update-14-2-0/add-json-schema",
"package": "nx",
"name": "14-2-0-add-json-schema"
},
{
"cli": "nx",
"version": "14.2.0-beta.0",
"description": "Remove default collection from configuration to switch to prompts for collection",
"implementation": "./src/migrations/update-14-2-0/remove-default-collection",
"package": "nx",
"name": "14-2-0-remove-default-collection"
},
{
"cli": "nx",
"version": "14.2.0-beta.5",
"description": "Replace all ./ and ../ in outputs with absolute paths",
"implementation": "./src/migrations/update-14-2-0/replace-all-relative-outputs-with-absolute",
"package": "nx",
"name": "14-2-0-replace-relative-outputs-with-absolute"
},
{
"cli": "nx",
"version": "14.3.4-beta.1",
"description": "Replace targetDependencies with targetDefaults",
"implementation": "./src/migrations/update-14-3-4/create-target-defaults",
"package": "nx",
"name": "14.3.4-create-target-defaults"
},
{
"version": "13.9.0-beta.0",
"description": "Replace @nrwl/tao with nx",
"cli": "nx",
"implementation": "./src/migrations/update-13-9-0/replace-tao-with-nx",
"package": "@nrwl/workspace",
"name": "13-9-0-replace-tao-with-nx"
},
{
"version": "13.10.0-beta.0",
"description": "Update the decorate-angular-cli script to require nx instead of @nrwl/cli",
"cli": "nx",
"implementation": "./src/migrations/update-13-10-0/update-decorate-cli",
"package": "@nrwl/workspace",
"name": "13-10-0-update-decorate-cli"
},
{
"version": "13.10.0-beta.0",
"description": "Update the tasks runner property to import it from the nx package instead of @nrwl/worksapce",
"cli": "nx",
"implementation": "./src/migrations/update-13-10-0/update-tasks-runner",
"package": "@nrwl/workspace",
"name": "13-10-0-update-tasks-runner"
},
{
"version": "14.0.0-beta.0",
"description": "Changes the presets in nx.json to come from the nx package",
"cli": "nx",
"implementation": "./src/migrations/update-14-0-0/change-nx-json-presets",
"package": "@nrwl/workspace",
"name": "14-0-0-change-nx-json-presets"
},
{
"version": "14.0.0-beta.0",
"description": "Migrates from @nrwl/workspace:run-script to nx:run-script",
"cli": "nx",
"implementation": "./src/migrations/update-14-0-0/change-npm-script-executor",
"package": "@nrwl/workspace",
"name": "14-0-0-change-npm-script-executor"
},
{
"version": "14.2.0",
"description": "Explicitly enable sourceAnalysis for all workspaces extending from npm.json or core.json (this was default behavior prior to 14.2)",
"cli": "nx",
"implementation": "./src/migrations/update-14-2-0/enable-source-analysis",
"package": "@nrwl/workspace",
"name": "14-2-0-enable-source-analysis"
},
{
"cli": "nx",
"version": "14.2.0-beta.0",
"description": "Adjusts calls to createTreeWithEmptyWorkspace to reflect new API",
"factory": "./src/migrations/update-14-2-0/split-create-empty-tree",
"package": "@nrwl/devkit",
"name": "split-create-tree"
},
{
"version": "14.0.0-beta.2",
"cli": "nx",
"description": "Update move jest config files to .ts files.",
"factory": "./src/migrations/update-14-0-0/update-jest-config-ext",
"package": "@nrwl/jest",
"name": "update-jest-config-extensions"
},
{
"version": "14.1.5-beta.0",
"cli": "nx",
"description": "Update to export default in jest config and revert jest.preset.ts to jest.preset.js",
"factory": "./src/migrations/update-14-1-5/update-exports-jest-config",
"package": "@nrwl/jest",
"name": "update-to-export-default"
},
{
"version": "14.5.5-beta.0",
"cli": "nx",
"description": "Exclude jest.config.ts from tsconfig where missing.",
"factory": "./src/migrations/update-14-0-0/update-jest-config-ext",
"package": "@nrwl/jest",
"name": "exclude-jest-config-from-ts-config"
},
{
"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"
},
{
"cli": "nx",
"version": "14.1.9-beta.0",
"description": "Adds @swc/core and @swc-node as a dev dep if you are using them",
"factory": "./src/migrations/update-14-1-9/add-swc-deps-if-needed",
"package": "@nrwl/linter",
"name": "add-swc-deps"
},
{
"cli": "nx",
"version": "14.2.3-beta.0",
"description": "Adds @swc/core and @swc-node as a dev dep if you are using them (repeated due to prior mistake)",
"factory": "./src/migrations/update-14-1-9/add-swc-deps-if-needed",
"package": "@nrwl/linter",
"name": "add-swc-deps-again"
},
{
"cli": "nx",
"version": "14.4.4",
"description": "Adds @typescript-eslint/utils as a dev dep",
"factory": "./src/migrations/update-14-4-4/experimental-to-utils-deps",
"package": "@nrwl/linter",
"name": "experimental-to-utils-deps"
},
{
"cli": "nx",
"version": "14.4.4",
"description": "Switch from @typescript-eslint/experimental-utils to @typescript-eslint/utils in all rules and rules.spec files",
"factory": "./src/migrations/update-14-4-4/experimental-to-utils-rules",
"package": "@nrwl/linter",
"name": "experimental-to-utils-rules"
},
{
"cli": "nx",
"version": "13.8.5-beta.1",
"description": "Renames @nrwl/node:build to @nrwl/node:webpack",
"factory": "./src/migrations/update-13-8-5/rename-build-to-webpack",
"package": "@nrwl/node",
"name": "rename-build-to-webpack"
},
{
"cli": "nx",
"version": "13.8.5-beta.1",
"description": "Renames @nrwl/node:execute to @nrwl/node:node",
"factory": "./src/migrations/update-13-8-5/rename-execute-to-node",
"package": "@nrwl/node",
"name": "rename-execute-to-node"
},
{
"cli": "nx",
"version": "13.8.5-beta.1",
"description": "Renames @nrwl/node:package to @nrwl/js:tsc",
"factory": "./src/migrations/update-13-8-5/update-package-to-tsc",
"package": "@nrwl/node",
"name": "update-package-to-tsc"
}
]
}

Loading

0 comments on commit fb7cde4

Please sign in to comment.