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.

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

feat!: upgrade to nx 19 #46

Merged
merged 5 commits into from
May 18, 2024
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 .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ runs:
run: echo "node_version=$(cat .nvmrc)" >> $GITHUB_OUTPUT
- uses: pnpm/action-setup@v2
with:
version: 8.6.11
version: 8.15.7
- name: Use Node.js
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.19.0
20.13
4 changes: 2 additions & 2 deletions examples/cloudflare-next-app/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "examples/cloudflare-next-app",
"projectType": "application",
"tags": [],
"implicitDependencies": ["nx-cloudflare"],
"targets": {
"build": {
Expand All @@ -27,6 +28,5 @@
"jestConfig": "examples/cloudflare-next-app/jest.config.ts"
}
}
},
"tags": []
}
}
3 changes: 2 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,6 @@
"linter": "eslint"
}
}
}
},
"nxCloudAccessToken": "OWEyN2E2OTktMWM2Ni00MmQwLWE1YmEtNjI2MDMwNDg1MWVjfHJlYWQtd3JpdGU="
}
62 changes: 31 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,45 +5,45 @@
"scripts": {},
"private": true,
"devDependencies": {
"@angular-devkit/core": "~17.3.3",
"@cloudflare/next-on-pages": "^1.11.0",
"@cloudflare/workers-types": "^4.20240419.0",
"@angular-devkit/core": "~17.3.7",
"@cloudflare/next-on-pages": "^1.11.3",
"@cloudflare/workers-types": "^4.20240512.0",
"@commitlint/cli": "^17.8.1",
"@commitlint/config-conventional": "^17.8.1",
"@eslint/eslintrc": "^2.1.2",
"@eslint/js": "^8.52.0",
"@jscutlery/semver": "^5.2.0",
"@nx/angular": "18.3.3",
"@nx/devkit": "18.3.3",
"@nx/esbuild": "18.3.3",
"@nx/eslint": "18.3.3",
"@nx/eslint-plugin": "18.3.3",
"@nx/jest": "18.3.3",
"@nx/js": "18.3.3",
"@nx/next": "18.3.3",
"@nx/node": "18.3.3",
"@nx/plugin": "18.3.3",
"@nx/react": "18.3.3",
"@nx/vite": "18.3.3",
"@nx/web": "18.3.3",
"@nx/workspace": "18.3.3",
"@nx/angular": "19.0.4",
"@nx/devkit": "19.0.4",
"@nx/esbuild": "19.0.4",
"@nx/eslint": "19.0.4",
"@nx/eslint-plugin": "19.0.4",
"@nx/jest": "19.0.4",
"@nx/js": "19.0.4",
"@nx/next": "19.0.4",
"@nx/node": "19.0.4",
"@nx/plugin": "19.0.4",
"@nx/react": "19.0.4",
"@nx/vite": "19.0.4",
"@nx/web": "19.0.4",
"@nx/workspace": "19.0.4",
"@svgr/webpack": "^8.1.0",
"@swc-node/register": "~1.8.0",
"@swc/cli": "~0.1.62",
"@swc/cli": "0.3.12",
"@swc/core": "~1.3.85",
"@swc/helpers": "~0.5.2",
"@testing-library/react": "14.3.0",
"@testing-library/react": "15.0.6",
"@types/jest": "^29.4.0",
"@types/kill-port": "^2.0.3",
"@types/node": "18.16.9",
"@types/react": "18.2.33",
"@types/react-dom": "18.2.14",
"@types/node": "20.12.12",
"@types/react": "18.3.2",
"@types/react-dom": "18.3.0",
"@types/semver": "^7.5.8",
"@types/tcp-port-used": "^1.0.4",
"@typescript-eslint/eslint-plugin": "7.6.0",
"@typescript-eslint/parser": "7.6.0",
"@vitest/coverage-v8": "1.4.0",
"@vitest/ui": "1.4.0",
"@vitest/ui": "1.6.0",
"babel-jest": "^29.4.1",
"chalk": "^4.1.2",
"cli-spinners": "^2.9.2",
Expand All @@ -63,7 +63,7 @@
"jest-environment-node": "^29.4.1",
"kill-port": "^2.0.1",
"ngx-deploy-npm": "^7.1.0",
"nx": "18.3.3",
"nx": "19.0.4",
"prettier": "^2.6.2",
"semver": "^7.6.0",
"tcp-port-used": "^1.0.2",
Expand All @@ -74,17 +74,17 @@
"url-loader": "^4.1.1",
"verdaccio": "^5.0.4",
"vite": "~5.0.0",
"vitest": "1.4.0",
"vitest": "1.6.0",
"webpack": "^5.90.1",
"wrangler": "^3.51.2"
"wrangler": "^3.57.0"
},
"dependencies": {
"@nx/devkit": "18.2.4",
"@nx/devkit": "19.0.4",
"@types/fs-extra": "^11.0.4",
"hono": "^4.2.5",
"next": "14.0.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"hono": "^4.3.7",
"next": "14.2.3",
"react": "18.3.1",
"react-dom": "18.3.1",
"tslib": "^2.3.0"
},
"nx": {
Expand Down
4 changes: 2 additions & 2 deletions packages/e2e-utils/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/e2e-utils/src",
"projectType": "library",
"tags": [],
"targets": {
"test": {
"executor": "@nx/jest:jest",
Expand All @@ -11,6 +12,5 @@
"jestConfig": "packages/e2e-utils/jest.config.ts"
}
}
},
"tags": []
}
}
4 changes: 2 additions & 2 deletions packages/nx-cloudflare-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"sourceRoot": "packages/nx-cloudflare-e2e/src",
"implicitDependencies": ["nx-cloudflare"],
"targets": {
"e2e": {
"executor": "@nx/jest:jest",
Expand All @@ -13,6 +14,5 @@
},
"dependsOn": ["^build"]
}
},
"implicitDependencies": ["nx-cloudflare"]
}
}
20 changes: 10 additions & 10 deletions packages/nx-cloudflare/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@
},
"license": "MIT",
"dependencies": {
"@nx/devkit": "18.2.4",
"wrangler": "^3.48.0",
"dotenv": "^16.4.4",
"@nx/js": "18.3.3",
"@nx/devkit": "^19.0.4",
"@nx/js": "^19.0.4",
"fs-extra": "^11.2.0",
"semver": "^7.6.0",
"@nx/workspace": "18.3.3",
"typescript": "5.4.4",
"nx": "18.3.3",
"@nx/web": "18.3.3",
"next": "14.0.4",
"next": "14.2.3",
"webpack": "^5.90.1",
"copy-webpack-plugin": "^12.0.2",
"tslib": "^2.3.0",
"@nx/node": "18.3.3",
"@nx/node": "19.0.4",
"@svgr/webpack": "^8.1.0",
"url-loader": "^4.1.1"
"url-loader": "^4.1.1",
"nx": "19.0.4",
"wrangler": "^3.57.0",
"dotenv": "^16.4.4",
"@nx/workspace": "19.0.4",
"@nx/web": "19.0.4"
},
"keywords": [
"nx",
Expand Down
4 changes: 2 additions & 2 deletions packages/nx-cloudflare/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/nx-cloudflare/src",
"projectType": "library",
"tags": ["scope:public", "type:plugin"],
"targets": {
"build": {
"executor": "@nx/js:tsc",
Expand Down Expand Up @@ -67,6 +68,5 @@
"command": "node tools/scripts/publish.mjs nx-cloudflare {args.ver} {args.tag}",
"dependsOn": ["build"]
}
},
"tags": ["scope:public", "type:plugin"]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import {
writeFileSync,
} from 'fs-extra';
import { dirname, extname, join, relative } from 'path';
import { findNodes } from 'nx/src/utils/typescript';

import type { NextBuildBuilderOptions } from '../../../utils/types';
import { findNodes } from '@nx/js';

export function createNextConfigFile(
options: NextBuildBuilderOptions,
Expand Down
6 changes: 3 additions & 3 deletions packages/nx-cloudflare/src/utils/versions.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// eslint-disable-next-line @typescript-eslint/no-var-requires
export const nxCloudflareVersion = require('../../package.json').version;

export const wranglerVersion = '^3.51.2';
export const cloudflareWorkersTypeVersions = '^4.20240419.0';
export const honoVersion = '^4.2.5';
export const wranglerVersion = '^3.57.0';
export const cloudflareWorkersTypeVersions = '^4.20240512.0';
export const honoVersion = '^4.3.7';
Loading
Loading