Skip to content

Commit

Permalink
Merge pull request #915 from jscutlery/update-nrwl-workspace-20.1.4
Browse files Browse the repository at this point in the history
Update @nx/workspace to update-nrwl-workspace-20.1.4
  • Loading branch information
edbzn authored Dec 3, 2024
2 parents 2e18d9e + d73cf9d commit 8ea6711
Show file tree
Hide file tree
Showing 33 changed files with 120 additions and 237 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/nx-npm-19.8.4-bd89c34c5e-f12e98004a.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const { getJestProjects } = require('@nx/jest');
const { getJestProjectsAsync } = require('@nx/jest');

export default { projects: getJestProjects() };
export default async () => ({ projects: await getJestProjectsAsync() });
3 changes: 2 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,6 @@
"production": ["default", "!{projectRoot}/src/test-setup.[jt]s"]
},
"parallel": 1,
"defaultBase": "main"
"defaultBase": "main",
"useLegacyCache": true
}
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
"@angular-devkit/schematics": "19.0.2",
"@commitlint/cli": "^19.0.0",
"@commitlint/config-angular": "^19.0.0",
"@nx/devkit": "19.8.4",
"@nx/eslint-plugin": "19.8.4",
"@nx/jest": "19.8.4",
"@nx/js": "19.8.4",
"@nx/plugin": "19.8.4",
"@nx/workspace": "19.8.4",
"@nx/devkit": "20.1.4",
"@nx/eslint-plugin": "20.1.4",
"@nx/jest": "20.1.4",
"@nx/js": "20.1.4",
"@nx/plugin": "20.1.4",
"@nx/workspace": "20.1.4",
"@swc-node/register": "1.10.9",
"@swc/core": "1.9.3",
"@types/jest": "29.5.14",
Expand All @@ -53,7 +53,7 @@
"jest": "29.7.0",
"jest-extended": "^4.0.0",
"ngx-deploy-npm": "^8.0.0",
"nx": "19.8.4",
"nx": "20.1.4",
"prettier": "3.4.1",
"tmp": "^0.2.1",
"ts-jest": "29.2.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/semver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"url": "https://github.com/jscutlery/semver"
},
"peerDependencies": {
"@nx/devkit": "^18.0.0 || ^19.0.0"
"@nx/devkit": "^18.0.0 || ^19.0.0 || ^20.0.0"
},
"dependencies": {
"chalk": "4.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@
exports[`@jscutlery/semver @jscutlery/semver:migrate-nx-release should generate CHANGELOG.md: b-0.3.0 1`] = `
"## 0.3.0 (yyyy-mm-dd)
### 🚀 Features
- **b:** 🚀 new feature
### ❤️ Thank You
### ❤️ Thank You
- Test Bot
Expand Down
5 changes: 3 additions & 2 deletions packages/semver/src/executors/version/testing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ export function setupTestingWorkspace(): TestingWorkspace {
},

generateLib(name: string, options = '') {
const commonArgs = `--unitTestRunner=none --linter=none --bundler=none --minimal --skipFormat --projectNameAndRootFormat=as-provided`;
const commonArgs = `--unitTestRunner=none --linter=none --bundler=tsc --minimal --skipFormat`;
this.runNx(
`g @nx/js:lib ${name} --directory=libs/${name} ${commonArgs} ${options}`,
`g @nx/js:lib --directory=libs/${name} ${commonArgs} ${options}`,
);
},

Expand Down Expand Up @@ -167,6 +167,7 @@ export function createFakeContext({
nodes: {},
dependencies: {},
},
nxJsonConfiguration: {},
} satisfies ExecutorContext;
}

Expand Down
3 changes: 1 addition & 2 deletions packages/semver/src/executors/version/utils/post-target.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ export function runPostTargets({
return concat(
...postTargets.map((postTargetSchema) =>
defer(async () => {
// TODO: deprecate specifying the project name in the post target schema.
const target = postTargetSchema.includes(':')
? parseTargetString(postTargetSchema)
? parseTargetString(postTargetSchema, context.projectGraph)
: parseTargetString(postTargetSchema, context);

_checkTargetExist(target, context);
Expand Down
Loading

0 comments on commit 8ea6711

Please sign in to comment.