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 .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"editor.formatOnPaste": true,
"editor.formatOnSave": true,
"editor.renderWhitespace": "boundary",
"eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact", "json", "jsonc", "markdown"],
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
Expand Down
2,509 changes: 1,215 additions & 1,294 deletions package-lock.json

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
"scripts": {},
"private": true,
"dependencies": {
"@nx/devkit": "22.5.3",
"@nx/node": "22.5.3"
"@nx/devkit": "22.5.4",
"@nx/node": "22.5.4"
},
"devDependencies": {
"@eslint/js": "^9.8.0",
"@nx/esbuild": "22.5.3",
"@nx/eslint": "22.5.3",
"@nx/eslint-plugin": "22.5.3",
"@nx/jest": "22.5.3",
"@nx/js": "22.5.3",
"@nx/plugin": "22.5.3",
"@nx/vite": "22.5.3",
"@nx/vitest": "22.5.3",
"@nx/web": "22.5.3",
"@nx/webpack": "22.5.3",
"@nx/esbuild": "22.5.4",
"@nx/eslint": "22.5.4",
"@nx/eslint-plugin": "22.5.4",
"@nx/jest": "22.5.4",
"@nx/js": "22.5.4",
"@nx/plugin": "22.5.4",
"@nx/vite": "22.5.4",
"@nx/vitest": "22.5.4",
"@nx/web": "22.5.4",
"@nx/webpack": "22.5.4",
"@swc-node/register": "~1.11.1",
"@swc/cli": "~0.8.0",
"@swc/core": "~1.15.8",
Expand All @@ -38,7 +38,7 @@
"jiti": "2.4.2",
"jsdom": "^27.1.0",
"jsonc-eslint-parser": "^2.1.0",
"nx": "22.5.3",
"nx": "22.5.4",
"prettier": "~3.6.2",
"prettier-plugin-organize-imports": "^3.2.4",
"swc-loader": "~0.1.15",
Expand Down
27 changes: 14 additions & 13 deletions packages/azure-func-e2e/tests/azure-func.spec.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
import { getPackageManagerCommand } from '@nx/devkit';
import { execSync } from 'child_process';
import { randomUUID } from 'crypto';
import { mkdirSync, rmSync } from 'fs';
import { dirname, join } from 'path';

const LOCAL_REGISTRY = 'http://localhost:4873';
const TMP_DIRECTORY = join(process.cwd(), 'tmp');
const PACKAGE_MANAGER_COMMAND = getPackageManagerCommand();

describe('azure-func', () => {
let projectDirectory: string;

beforeAll(() => {
projectDirectory = createTestProject();

execSync(`npm install @ziacik/azure-func@e2e`, {
execSync(`${PACKAGE_MANAGER_COMMAND.addDev} @ziacik/azure-func@e2e`, {
cwd: projectDirectory,
stdio: 'inherit',
env: getCommandEnvironment({
NPM_CONFIG_REGISTRY: LOCAL_REGISTRY,
npm_config_registry: LOCAL_REGISTRY,
}),
env: getCommandEnvironment(),
});
});

Expand All @@ -27,19 +25,22 @@ describe('azure-func', () => {
});

it('should be installed', () => {
execSync('npm ls @ziacik/azure-func', {
execSync(`${PACKAGE_MANAGER_COMMAND.list} @ziacik/azure-func`, {
cwd: projectDirectory,
stdio: 'inherit',
env: getCommandEnvironment(),
});
});

it('should generate app', () => {
execSync('nx generate @ziacik/azure-func:application --directory=my-func-app --linter=eslint --unitTestRunner=jest --e2eTestRunner=none --framework=none', {
cwd: projectDirectory,
stdio: 'inherit',
env: getCommandEnvironment(),
});
execSync(
`${PACKAGE_MANAGER_COMMAND.exec} nx generate @ziacik/azure-func:application --directory=my-func-app --linter=eslint --unitTestRunner=jest --e2eTestRunner=none --framework=none`,
{
cwd: projectDirectory,
stdio: 'inherit',
env: getCommandEnvironment(),
},
);
});
});

Expand All @@ -55,7 +56,7 @@ function createTestProject() {
removeDirectory(projectDirectory);
mkdirSync(dirname(projectDirectory), { recursive: true });

execSync(`npx --yes create-nx-workspace@latest ${projectName} --preset apps --nxCloud skip --no-interactive`, {
execSync(`${PACKAGE_MANAGER_COMMAND.dlx} create-nx-workspace@latest ${projectName} --preset apps --nxCloud skip --no-interactive`, {
cwd: dirname(projectDirectory),
stdio: 'inherit',
env: getCommandEnvironment(),
Expand Down
11 changes: 10 additions & 1 deletion packages/azure-func/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [5.0.1] - 2026-03-13

### Changed

- Upgraded nx to 22.5.4.
- Moved selected integration dependencies to `peerDependencies`.
- Relaxed supported dependency ranges to major-only versions where applicable.

## [5.0.0] - 2026-02-28

### Fixed
Expand Down Expand Up @@ -173,7 +181,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- `serve` now watches the project for changes.

[unreleased]: https://github.com/ziacik/nx-tools/compare/azure-func-5.0.0...HEAD
[unreleased]: https://github.com/ziacik/nx-tools/compare/azure-func-5.0.1...HEAD
[5.0.1]: https://github.com/ziacik/nx-tools/compare/azure-func-5.0.0...azure-func-5.0.1
[5.0.0]: https://github.com/ziacik/nx-tools/compare/azure-func-4.0.0...azure-func-5.0.0
[4.0.0]: https://github.com/ziacik/nx-tools/compare/azure-func-3.3.1...azure-func-4.0.0
[3.3.1]: https://github.com/ziacik/nx-tools/compare/azure-func-3.3.0...azure-func-3.3.1
Expand Down
16 changes: 9 additions & 7 deletions packages/azure-func/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{
"name": "@ziacik/azure-func",
"version": "5.0.0",
"version": "5.0.1",
"dependencies": {
"@nx/devkit": "22.5.3",
"@nx/js": "22.5.3",
"@nx/node": "22.5.3",
"typescript": "5.9.3",
"@swc/helpers": "~0.5.18",
"@nx/vite": "^22.5.1",
"@nx/devkit": "^22.0.0",
"@swc/helpers": "~0.5.18"
},
"peerDependencies": {
"@nx/js": "^22.0.0",
"@nx/node": "^22.0.0",
"@nx/vite": "^22.0.0",
"typescript": "~5.9.3",
"vitest": "^4.0.0"
},
"type": "commonjs",
Expand Down
7 changes: 7 additions & 0 deletions packages/azure-func/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
"sourceRoot": "packages/azure-func/src",
"projectType": "library",
"tags": [],
"release": {
"version": {
"manifestRootsToUpdate": ["dist/{projectRoot}"],
"currentVersionResolver": "git-tag",
"fallbackCurrentVersionResolver": "disk"
}
},
"targets": {
"build": {
"executor": "@nx/js:swc",
Expand Down
11 changes: 10 additions & 1 deletion packages/upgrade-verify/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [5.0.1] - 2026-03-13

### Changed

- Upgraded nx to 22.5.4.
- Moved selected integration dependencies to `peerDependencies`.
- Relaxed supported dependency ranges to major-only versions where applicable.

## [5.0.0] - 2026-02-28

### Changed
Expand Down Expand Up @@ -137,7 +145,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- READMEs updated and props added to package.json.
- A _Package subpath './package.json' is not defined by "exports"_ error hopefully fixed.

[unreleased]: https://github.com/ziacik/nx-tools/compare/upgrade-verify-5.0.0...HEAD
[unreleased]: https://github.com/ziacik/nx-tools/compare/upgrade-verify-5.0.1...HEAD
[5.0.1]: https://github.com/ziacik/nx-tools/compare/upgrade-verify-5.0.0...upgrade-verify-5.0.1
[5.0.0]: https://github.com/ziacik/nx-tools/compare/upgrade-verify-4.0.0...upgrade-verify-5.0.0
[4.0.0]: https://github.com/ziacik/nx-tools/compare/upgrade-verify-3.3.1...upgrade-verify-4.0.0
[3.3.1]: https://github.com/ziacik/nx-tools/compare/upgrade-verify-3.3.0...upgrade-verify-3.3.1
Expand Down
10 changes: 6 additions & 4 deletions packages/upgrade-verify/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"name": "@ziacik/upgrade-verify",
"version": "5.0.0",
"version": "5.0.1",
"dependencies": {
"@nx/devkit": "22.5.3",
"@swc/helpers": "~0.5.18",
"@nx/vite": "^22.5.1",
"@nx/devkit": "^22.0.0",
"@swc/helpers": "~0.5.18"
},
"peerDependencies": {
"@nx/vite": "^22.0.0",
"vitest": "^4.0.0"
},
"type": "commonjs",
Expand Down
7 changes: 7 additions & 0 deletions packages/upgrade-verify/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
"sourceRoot": "packages/upgrade-verify/src",
"projectType": "library",
"tags": [],
"release": {
"version": {
"manifestRootsToUpdate": ["dist/{projectRoot}"],
"currentVersionResolver": "git-tag",
"fallbackCurrentVersionResolver": "disk"
}
},
"targets": {
"build": {
"executor": "@nx/js:swc",
Expand Down
5 changes: 5 additions & 0 deletions tools/scripts/start-local-registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ type FileSnapshot = {
};

const startLocalRegistryForTests = async () => {
// Keep the registry bootstrap and Nx Release publish step isolated from any
// daemon state that may be running in editors or other local Nx processes.
process.env['CI'] = 'true';
process.env['NX_DAEMON'] = 'false';

// local registry target to run
const localRegistryTarget = '@ziacik/source:local-registry';
// storage folder for the local registry
Expand Down
10 changes: 8 additions & 2 deletions upgrade.sh
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,17 @@ fi
step=16

if [ $step -ge $START_STEP ]; then
echo "Step 16: Committing package version bumps"
git commit -am "chore: package versions bumped" || { echo "Error: git commit failed"; exit 1; }
echo "Step 16: Running format check"
npx nx format:check || { echo "Error: nx format:check failed"; exit 1; }
fi
step=17

if [ $step -ge $START_STEP ]; then
echo "Step 17: Committing package version bumps"
git commit -am "chore: package versions bumped" || { echo "Error: git commit failed"; exit 1; }
fi
step=18

if [ $step -ge $START_STEP ]; then
echo "NX upgrade to version $NX_VER completed successfully!"
fi
Loading