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

fix(core): store relative file name in hash details #10166

Merged
merged 1 commit into from
Jun 6, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 30 additions & 0 deletions .husky/_/husky.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/sh
if [ -z "$husky_skip_init" ]; then
debug () {
[ "$HUSKY_DEBUG" = "1" ] && echo "husky (debug) - $1"
}

readonly hook_name="$(basename "$0")"
debug "starting $hook_name..."

if [ "$HUSKY" = "0" ]; then
debug "HUSKY env variable is set to 0, skipping hook"
exit 0
fi

if [ -f ~/.huskyrc ]; then
debug "sourcing ~/.huskyrc"
. ~/.huskyrc
fi

export readonly husky_skip_init=1
sh -e "$0" "$@"
exitCode="$?"

if [ $exitCode != 0 ]; then
echo "husky - $hook_name hook exited with code $exitCode (error)"
exit $exitCode
fi

exit 0
fi
5 changes: 5 additions & 0 deletions packages/nx/src/hasher/hasher.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// This must come before the Hasher import
import { DependencyType } from '../config/project-graph';
import { defaultFileHasher } from '../hasher/file-hasher';

jest.doMock('../utils/workspace-root', () => {
return {
Expand Down Expand Up @@ -56,6 +57,10 @@ describe('Hasher', () => {
}

beforeAll(() => {
jest
.spyOn(defaultFileHasher, 'hashFile')
.mockImplementation((p) => hashes[p]);

fs.readFileSync = (file) => {
if (file === 'workspace.json') {
return JSON.stringify(workSpaceJson);
Expand Down
21 changes: 6 additions & 15 deletions packages/nx/src/hasher/hasher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { resolveNewFormatWithInlineProjects } from '../config/workspaces';
import { exec } from 'child_process';
import { existsSync } from 'fs';
import * as minimatch from 'minimatch';
import { join } from 'path';
import { join, sep as pathSep } from 'path';
import { performance } from 'perf_hooks';
import { getRootTsConfigFileName } from '../utils/typescript';
import { workspaceRoot } from '../utils/workspace-root';
Expand All @@ -13,6 +13,7 @@ import { NxJsonConfiguration } from '../config/nx-json';
import { Task } from '../config/task-graph';
import { readJsonFile } from '../utils/fileutils';
import { ProjectsConfigurations } from '../config/workspace-json-project-json';
import { defaultFileHasher } from './file-hasher';

/**
* A data structure returned by the default hasher.
Expand Down Expand Up @@ -248,20 +249,10 @@ export class Hasher {
];

const fileHashes = [
...fileNames
.map((maybeRelativePath) => {
// Normalize the path to always be absolute and starting with workspaceRoot so we can check it exists
if (!maybeRelativePath.startsWith(workspaceRoot)) {
return join(workspaceRoot, maybeRelativePath);
}
return maybeRelativePath;
})
.filter((file) => existsSync(file))
.map((file) => {
// we should use default file hasher here
const hash = this.hashing.hashFile(file);
return { file, hash };
}),
...fileNames.map((file) => ({
file,
hash: defaultFileHasher.hashFile(file),
})),
...this.hashNxJson(),
];

Expand Down