miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

chore(repo): update repo to use nx 12.3-beta.2 and latest @nrwl/nx-cloud

Browse Source
This commit is contained in:
vsavkin 2021-05-12 09:55:12 -04:00 committed by Victor Savkin
parent 7352fd0c1e
commit 3dadb304ad
5 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/config.yml
View File

@ -124,6 +124,9 @@ jobs:
- run:
name: Run Unit Tests
command: npx nx affected --target=test --parallel --max-parallel=2
- run:
name: Run Linting
command: npx nx affected --target=lint --parallel --max-parallel=4
- run:
name: Run E2E Tests
command: npx nx affected --target=e2e
@ -156,6 +159,9 @@ jobs:
- run:
name: Run Unit Tests
command: npx nx affected --target=test --base=HEAD~1 --parallel --max-parallel=2
- run:
name: Run Linting
command: npx nx affected --target=lint --base=HEAD~1 --parallel --max-parallel=4
- run:
name: Run E2E Tests
command: npx nx affected --target=e2e --base=HEAD~1

2
nx.json
View File

@ -8,7 +8,7 @@
"default": {
"runner": "@nrwl/nx-cloud",
"options": {
"accessToken": "OTM4MGQ1NDctZGRjMy00ZDlmLThkYzQtOTU3MDhkNWZhZjcwfHJlYWQ=",
"accessToken": "YzVhYjFiNzAtYTYxZS00OWM3LTlkOGYtZjRmOGRlNDY4MTJhfHJlYWQtd3JpdGU=",
"cacheableOperations": ["build", "build-base", "test", "lint", "e2e"],
"canTrackAnalytics": false,
"showUsageWarnings": true,

4
package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nrwl/nx-source",
"version": "12.2.0",
"version": "12.3.0-beta.2",
"description": "Powerful, Extensible Dev Tools",
"homepage": "https://nx.dev",
"private": true,
@ -64,7 +64,7 @@
"@nrwl/linter": "12.3.0-beta.1",
"@nrwl/next": "12.3.0-beta.1",
"@nrwl/node": "12.3.0-beta.1",
"@nrwl/nx-cloud": "12.1.1-beta.5",
"@nrwl/nx-cloud": "12.1.1-beta.12",
"@nrwl/tao": "12.3.0-beta.1",
"@nrwl/web": "12.3.0-beta.1",
"@nrwl/workspace": "12.3.0-beta.1",

49
packages/linter/src/executors/eslint/hasher.ts
View File

@ -8,31 +8,30 @@ export default async function run(
taskGraph: TaskGraph,
hasher: Hasher
): Promise<Hash> {
return hasher.hashTaskWithDepsAndContext(task);
// if (task.overrides['hasTypeAwareRules'] === true) {
// return hasher.hashTaskWithDepsAndContext(task);
// }
// const sources = await hasher.hashSource(task);
// const deps = allDeps(task.id, taskGraph);
// const nxJson = readJsonFile('nx.json');
// const tags = deps
// .map((d) => (nxJson.projects[d].tags || []).join('|'))
// .join('|');
// const context = await hasher.hashContext();
// return {
// value: hasher.hashArray([
// sources,
// tags,
// context.implicitDeps.value,
// context.runtime.value,
// ]),
// details: {
// command: null,
// runtime: context.runtime.runtime,
// implicitDeps: context.implicitDeps.sources,
// sources: { [task.target.project]: sources },
// },
// };
if (task.overrides['hasTypeAwareRules'] === true) {
return hasher.hashTaskWithDepsAndContext(task);
}
const sources = await hasher.hashSource(task);
const deps = allDeps(task.id, taskGraph);
const nxJson = readJsonFile('nx.json');
const tags = deps
.map((d) => (nxJson.projects[d].tags || []).join('|'))
.join('|');
const context = await hasher.hashContext();
return {
value: hasher.hashArray([
sources,
tags,
context.implicitDeps.value,
context.runtime.value,
]),
details: {
command: null,
runtime: context.runtime.runtime,
implicitDeps: context.implicitDeps.sources,
sources: { [task.target.project]: sources },
},
};
}
function allDeps(taskId: string, taskGraph: TaskGraph) {

8
yarn.lock
View File

@ -2813,10 +2813,10 @@
webpack-merge "4.2.1"
webpack-node-externals "1.7.2"
"@nrwl/nx-cloud@12.1.1-beta.5":
version "12.1.1-beta.5"
resolved "https://registry.yarnpkg.com/@nrwl/nx-cloud/-/nx-cloud-12.1.1-beta.5.tgz#4eb1402711be37f273f71831cf6960098855ed2b"
integrity sha512-2eIGXyIClWM5cq7rzAszEsXuRchFP5Olt2A1x+O+yAdgb8M7DtpmtVnPmTCGRuD8RjBVRhDxFdX6+dOXuw5Sog==
"@nrwl/nx-cloud@12.1.1-beta.12":
version "12.1.1-beta.12"
resolved "https://registry.yarnpkg.com/@nrwl/nx-cloud/-/nx-cloud-12.1.1-beta.12.tgz#91c4b45ab71bc73d99014f54b3c84f3485c35328"
integrity sha512-ZMYidr1m9qxh5+tRCl3eDJCpoaMRc4ovHHKkOxN/6T4JxWE1JQPyKnRe4YYMvwX/OixV/SrppE5UM7nNdd9pcw==
dependencies:
axios "^0.21.1"
chalk "4.1.0"