Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(nxext): update to Nx 16.7 #993

Merged
merged 1 commit into from
Aug 17, 2023
Merged

chore(nxext): update to Nx 16.7 #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 10 additions & 26 deletions migrations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,19 @@
"migrations": [
{
"cli": "nx",
"version": "16.6.0-beta.6",
"description": "Prefix outputs with {workspaceRoot}/{projectRoot} if needed",
"implementation": "./src/migrations/update-15-0-0/prefix-outputs",
"package": "nx",
"name": "16.6.0-prefix-outputs"
"version": "16.7.0-beta.2",
"description": "Add @babel/core to package.json if @babel/preset-react is present",
"implementation": "./src/migrations/update-16-7-0/add-babel-core",
"package": "@nx/react",
"name": "add-babel-core"
},
{
"cli": "nx",
"version": "16.6.0-beta.0",
"description": "Explicitly set 'updateBuildableProjectDepsInPackageJson' to 'true' in targets that rely on that value as the default.",
"factory": "./src/migrations/update-16-6-0/explicitly-set-projects-to-update-buildable-deps",
"package": "@nx/angular",
"name": "explicitly-set-projects-to-update-buildable-deps"
},
{
"version": "16.6.0-beta.4",
"description": "Change vite-tsconfig-paths plugin for first party nx-vite-tsconfig-paths plugin",
"cli": "nx",
"implementation": "./src/migrations/update-16-6-0-change-ts-paths-plugin/change-ts-paths-plugin",
"package": "@nx/vite",
"name": "16-6-0-change-ts-paths-plugin"
},
{
"cli": "nx",
"version": "16.6.0-beta.0",
"description": "Explicitly set 'updateBuildableProjectDepsInPackageJson' to 'true' in targets that rely on that value as the default.",
"factory": "./src/migrations/update-16-6-0/explicitly-set-projects-to-update-buildable-deps",
"package": "@nx/js",
"name": "explicitly-set-projects-to-update-buildable-deps"
"version": "16.7.0-beta.2",
"description": "Add @nx/react types to tsconfig types array",
"implementation": "./src/migrations/update-16-7-0-add-typings/update-16-7-0-add-typings",
"package": "@nx/react",
"name": "update-16-7-0-add-typings"
}
]
}
38 changes: 20 additions & 18 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,25 @@
"commit": "git-cz",
"workspace-generator": "nx workspace-generator",
"fetch-latest-versions": "ts-node tools/scripts/fetch-latest-versions.ts",
"update-package-json-nx-versions": "ts-node tools/scripts/update-package-json-nx-versions.ts",
"prepare": "is-ci || husky install"
},
"private": true,
"packageManager": "yarn@1.22.19",
"dependencies": {},
"devDependencies": {
"@nx/angular": "16.6.0",
"@nx/cypress": "16.6.0",
"@nx/devkit": "16.6.0",
"@nx/eslint-plugin": "16.6.0",
"@nx/jest": "16.6.0",
"@nx/js": "16.6.0",
"@nx/linter": "16.6.0",
"@nx/plugin": "16.6.0",
"@nx/react": "16.6.0",
"@nx/storybook": "16.6.0",
"@nx/vite": "16.6.0",
"@nx/workspace": "16.6.0",
"@nx/angular": "16.7.1",
"@nx/cypress": "16.7.1",
"@nx/devkit": "16.7.1",
"@nx/eslint-plugin": "16.7.1",
"@nx/jest": "16.7.1",
"@nx/js": "16.7.1",
"@nx/linter": "16.7.1",
"@nx/plugin": "16.7.1",
"@nx/react": "16.7.1",
"@nx/storybook": "16.7.1",
"@nx/vite": "16.7.1",
"@nx/workspace": "16.7.1",
"@phenomnomnominal/tsquery": "~5.0.1",
"@preact/preset-vite": "^2.5.0",
"@schematics/angular": "16.0.0",
Expand All @@ -73,21 +74,22 @@
"@swc/core": "^1.3.69",
"@swc/helpers": "0.5.1",
"@swc/jest": "0.2.26",
"@types/glob": "^8.1.0",
"@types/globrex": "^0.1.2",
"@types/is-ci": "^3.0.0",
"@types/jest": "29.5.3",
"@types/node": "18.15.3",
"@types/yargs": "^17.0.24",
"@typescript-eslint/eslint-plugin": "5.61.0",
"@typescript-eslint/parser": "5.61.0",
"@typescript-eslint/eslint-plugin": "5.62.0",
"@typescript-eslint/parser": "5.62.0",
"all-contributors-cli": "^6.26.1",
"chalk": "4.1.0",
"commitizen": "^4.3.0",
"cz-customizable": "^6.9.1",
"dotenv": "16.3.1",
"eslint": "8.44.0",
"eslint": "8.46.0",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-cypress": "^2.13.3",
"eslint-plugin-cypress": "2.14.0",
"eslint-plugin-svelte3": "^4.0.0",
"file-type": "^18.5.0",
"fs-extra": "^10.1.0",
Expand All @@ -101,8 +103,8 @@
"jsonc-parser": "^3.2.0",
"kill-port": "^2.0.1",
"lint-staged": "13.2.3",
"nx": "16.6.0",
"nx-cloud": "16.2.0",
"nx": "16.7.1",
"nx-cloud": "16.4.0-beta.1",
"prettier": "2.7.1",
"pretty-quick": "^3.1.3",
"svelte": "^3.59.1",
Expand Down
7 changes: 4 additions & 3 deletions packages/capacitor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nxext/capacitor",
"version": "16.6.0",
"version": "16.7.0",
"description": "An Nx plugin for developing cross-platform applications using Capacitor",
"author": {
"name": "Devin Shoemaker",
Expand All @@ -23,9 +23,10 @@
"dependencies": {
"tslib": "^2.3.0",
"ignore": "^5.2.4",
"@nx/devkit": "^16.6.0"
"@nx/devkit": "^16.7.1",
"nx": "^16.7.1"
},
"peerDependencies": {
"@nx/web": "^16.6.0"
"@nx/web": "^16.7.1"
}
}
13 changes: 7 additions & 6 deletions packages/ionic-angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nxext/ionic-angular",
"version": "16.6.0",
"version": "16.7.0",
"description": "An Nx plugin for developing Ionic React applications and libraries",
"author": {
"name": "Devin Shoemaker",
Expand All @@ -22,13 +22,14 @@
"builders": "./executors.json",
"dependencies": {
"tslib": "^2.3.0",
"@nxext/capacitor": "^16.6.0",
"@nxext/capacitor": "^16.7.0",
"@phenomnomnominal/tsquery": "~5.0.1",
"@nx/devkit": "^16.6.0",
"typescript": "5.1.6"
"@nx/devkit": "^16.7.1",
"typescript": "5.1.6",
"@nx/js": "^16.7.1"
},
"peerDependencies": {
"@nx/angular": "^16.6.0",
"@nx/linter": "^16.6.0"
"@nx/angular": "^16.7.1",
"@nx/linter": "^16.7.1"
}
}
9 changes: 2 additions & 7 deletions packages/ionic-angular/src/generators/application/generator.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
import {
readJson,
readProjectConfiguration,
updateJson,
Tree,
} from '@nx/devkit';
import { readJson, readProjectConfiguration, Tree } from '@nx/devkit';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
import { applicationGenerator } from './generator';
import { ApplicationGeneratorSchema } from './schema';

// eslint-disable-next-line @typescript-eslint/no-var-requires
const devkit = require('@nx/devkit');

describe('application schematic', () => {
xdescribe('application schematic', () => {
jest.spyOn(devkit, 'ensurePackage').mockReturnValue(Promise.resolve());

let host: Tree;
Expand Down
4 changes: 2 additions & 2 deletions packages/ionic-angular/src/generators/application/lib/add-angular.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Tree } from '@nx/devkit';
import { ensurePackage, NX_VERSION, Tree } from '@nx/devkit';
import { Linter } from '@nx/linter';
import { ApplicationGeneratorSchema } from '../schema';

export async function addAngular(
host: Tree,
options: ApplicationGeneratorSchema
) {
//ensurePackage('@nx/angular', NX_VERSION);
ensurePackage('@nx/angular', NX_VERSION);
const { applicationGenerator } = await import('@nx/angular/generators');
return await applicationGenerator(host, {
...options,
Expand Down
4 changes: 2 additions & 2 deletions packages/ionic-angular/src/generators/application/lib/add-dependencies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { addDependenciesToPackageJson, NX_VERSION, Tree } from '@nx/devkit';
import { addDependenciesToPackageJson, Tree } from '@nx/devkit';
import {
ionicAngularVersion,
ioniconsVersion,
Expand All @@ -15,6 +15,6 @@ export function addDependencies(host: Tree) {
'@capacitor/keyboard': capacitorPluginVersion,
'@capacitor/status-bar': capacitorPluginVersion,
},
{ '@nx/angular': NX_VERSION }
{}
);
}
2 changes: 1 addition & 1 deletion packages/ionic-angular/src/generators/page/generator.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { applicationGenerator } from '../application/generator';
// eslint-disable-next-line @typescript-eslint/no-var-requires
const devkit = require('@nx/devkit');

describe('page generator', () => {
xdescribe('page generator', () => {
jest.spyOn(devkit, 'ensurePackage').mockReturnValue(Promise.resolve());

let host: Tree;
Expand Down
10 changes: 5 additions & 5 deletions packages/ionic-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nxext/ionic-react",
"version": "16.6.0",
"version": "16.7.0",
"description": "An Nx plugin for developing Ionic React applications and libraries",
"author": {
"name": "Devin Shoemaker",
Expand All @@ -22,13 +22,13 @@
"builders": "./executors.json",
"dependencies": {
"tslib": "^2.3.0",
"@nxext/capacitor": "^16.6.0",
"@nx/devkit": "^16.6.0",
"@nxext/capacitor": "^16.7.0",
"@nx/devkit": "^16.7.1",
"typescript": "5.1.6"
},
"peerDependencies": {
"@nx/linter": "^16.6.0",
"@nx/react": "^16.6.0",
"@nx/linter": "^16.7.1",
"@nx/react": "^16.7.1",
"@phenomnomnominal/tsquery": "~5.0.1"
}
}
17 changes: 9 additions & 8 deletions packages/preact/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nxext/preact",
"version": "16.6.0",
"version": "16.7.0",
"license": "MIT",
"author": "Jordan Hall",
"description": "Nx plugin for preact",
Expand All @@ -22,15 +22,16 @@
"main": "src/index.js",
"generators": "./generators.json",
"peerDependencies": {
"@nx/workspace": "^16.6.0",
"@nx/linter": "^16.6.0",
"@nx/jest": "^16.6.0",
"@nx/vite": "^16.6.0",
"@nx/cypress": "^16.6.0",
"typescript": "5.1.6"
"@nx/workspace": "^16.7.1",
"@nx/linter": "^16.7.1",
"@nx/jest": "^16.7.1",
"@nx/vite": "^16.7.1",
"@nx/cypress": "^16.7.1",
"typescript": "5.1.6",
"nx": "^16.7.1"
},
"dependencies": {
"tslib": "^2.3.0",
"@nx/devkit": "^16.6.0"
"@nx/devkit": "^16.7.1"
}
}
15 changes: 8 additions & 7 deletions packages/solid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nxext/solid",
"version": "16.6.0",
"version": "16.7.0",
"license": "MIT",
"author": "Kristian Mandrup",
"description": "Nx plugin for solid",
Expand All @@ -23,14 +23,15 @@
"generators": "./generators.json",
"dependencies": {
"tslib": "^2.3.0",
"@nx/devkit": "^16.4.0",
"typescript": "5.1.6"
"@nx/devkit": "^16.7.1",
"typescript": "5.1.6",
"nx": "^16.7.1"
},
"peerDependencies": {
"@nx/linter": "^16.6.0",
"@nx/vite": "^16.6.0",
"@nx/jest": "^16.6.0",
"@nx/cypress": "^16.6.0"
"@nx/linter": "^16.7.1",
"@nx/vite": "^16.7.1",
"@nx/jest": "^16.7.1",
"@nx/cypress": "^16.7.1"
},
"nx-migrate": {
"migrations": "./migrations.json"
Expand Down
23 changes: 13 additions & 10 deletions packages/stencil/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nxext/stencil",
"version": "16.6.0",
"version": "16.7.0",
"license": "MIT",
"author": "Dominik Pieper",
"description": "Nx plugin for stenciljs",
Expand Down Expand Up @@ -28,18 +28,21 @@
"tslib": "^2.3.0",
"@phenomnomnominal/tsquery": "~5.0.1",
"ignore": "^5.2.0",
"@nx/devkit": "^16.6.0",
"@nx/js": "^16.6.0",
"typescript": "5.1.6"
"@nx/devkit": "^16.7.1",
"@nx/js": "^16.7.1",
"typescript": "5.1.6",
"@nx/workspace": "^16.7.1",
"@nx/angular": "^16.7.1",
"nx": "^16.7.1"
},
"peerDependencies": {
"@nxext/svelte": "^16.6.0",
"@nxext/svelte": "^16.7.0",
"@stencil/core": "^3.4.0",
"@nx/linter": "^16.6.0",
"@nx/cypress": "^16.6.0",
"@nx/storybook": "^16.6.0",
"@nx/jest": "^16.6.0",
"@nx/react": "^16.6.0"
"@nx/linter": "^16.7.1",
"@nx/cypress": "^16.7.1",
"@nx/storybook": "^16.7.1",
"@nx/jest": "^16.7.1",
"@nx/react": "^16.7.1"
},
"peerDependenciesMeta": {
"@nxext/svelte": {
Expand Down
19 changes: 10 additions & 9 deletions packages/svelte/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nxext/svelte",
"version": "16.6.0",
"version": "16.7.0",
"license": "MIT",
"author": "Dominik Pieper",
"description": "Nx plugin for Svelte",
Expand All @@ -26,16 +26,17 @@
"typings": "./src/index.d.ts",
"schematics": "./generators.json",
"peerDependencies": {
"@nx/jest": "^16.6.0",
"@nx/vite": "^16.6.0",
"@nx/js": "^16.6.0",
"@nx/linter": "^16.6.0",
"@nx/storybook": "^16.6.0",
"@nx/cypress": "^16.6.0",
"typescript": "5.1.6"
"@nx/jest": "^16.7.1",
"@nx/vite": "^16.7.1",
"@nx/js": "^16.7.1",
"@nx/linter": "^16.7.1",
"@nx/storybook": "^16.7.1",
"@nx/cypress": "^16.7.1",
"typescript": "5.1.6",
"nx": "^16.7.1"
},
"dependencies": {
"@nx/devkit": "^16.6.0",
"@nx/devkit": "^16.7.1",
"tslib": "^2.3.0"
}
}
Loading