diff --git a/bin-src/register.js b/bin-src/register.js index 5031bb954..ae9010b3b 100755 --- a/bin-src/register.js +++ b/bin-src/register.js @@ -5,7 +5,7 @@ import { config } from 'dotenv'; import { main as initMain } from './init'; import { main } from './main'; import { main as traceMain } from './trace'; -import { main as trimMain } from './trim-stats-file'; +import { main as trimMain } from './trimStatsFile'; config(); diff --git a/bin-src/trace.ts b/bin-src/trace.ts index c6c314256..923b780c0 100644 --- a/bin-src/trace.ts +++ b/bin-src/trace.ts @@ -2,7 +2,7 @@ import meow from 'meow'; import { getDependentStoryFiles } from '../node-src/lib/getDependentStoryFiles'; import { isPackageManifestFile } from '../node-src/lib/utils'; -import { readStatsFile } from '../node-src/tasks/read-stats-file'; +import { readStatsFile } from '../node-src/tasks/readStatsFile'; import { Context } from '../node-src/types'; /** diff --git a/bin-src/trim-stats-file.test.ts b/bin-src/trimStatsFile.test.ts similarity index 90% rename from bin-src/trim-stats-file.test.ts rename to bin-src/trimStatsFile.test.ts index ce8b67d40..3b7fd1d14 100644 --- a/bin-src/trim-stats-file.test.ts +++ b/bin-src/trimStatsFile.test.ts @@ -1,7 +1,7 @@ import mockfs from 'mock-fs'; import { afterEach, describe, expect, it } from 'vitest'; -import { readStatsFile } from '../node-src/tasks/read-stats-file'; +import { readStatsFile } from '../node-src/tasks/readStatsFile'; import * as trimmedFile from './__mocks__/previewStatsJson/preview-stats.trimmed.json'; mockfs({ diff --git a/bin-src/trim-stats-file.ts b/bin-src/trimStatsFile.ts similarity index 96% rename from bin-src/trim-stats-file.ts rename to bin-src/trimStatsFile.ts index 1ca30c4d3..e016a6e38 100644 --- a/bin-src/trim-stats-file.ts +++ b/bin-src/trimStatsFile.ts @@ -1,6 +1,6 @@ import { outputFile } from 'fs-extra'; -import { readStatsFile } from '../node-src/tasks/read-stats-file'; +import { readStatsFile } from '../node-src/tasks/readStatsFile'; const dedupe = (array: T[]) => [...new Set(array)]; const isUserCode = ({ name, moduleName = name }: { name?: string; moduleName?: string }) => diff --git a/eslint.config.mjs b/eslint.config.mjs index deac13e00..871cd7c95 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -108,8 +108,19 @@ export default [ unicorn.configs['flat/recommended'], { rules: { - // TODO: Switch this to 'error' when we are ready to enforce this rule - 'unicorn/filename-case': ['off', { case: 'camelCase' }], + 'unicorn/filename-case': [ + 'error', + { + case: 'camelCase', + ignore: [ + // Allow capitalization in initialisms + String.raw`^.*DNS.*\.[jt]s$`, + String.raw`^.*CSF.*\.[jt]s$`, + String.raw`^.*TTY.*\.[jt]s$`, + String.raw`^.*CI.*\.[jt]s$`, + ], + }, + ], // Chromatic uses err as our catch convention. // This is baked into pino transforms as well. 'unicorn/prevent-abbreviations': [ diff --git a/node-src/__mocks__/dependencyChanges/berry-chalk-package.json b/node-src/__mocks__/dependencyChanges/berry-chalk-package.json index aa89b779a..d7d2919dc 100644 --- a/node-src/__mocks__/dependencyChanges/berry-chalk-package.json +++ b/node-src/__mocks__/dependencyChanges/berry-chalk-package.json @@ -59,7 +59,7 @@ "lint:package": "sort-package-json", "release": "node scripts/release.js", "trace": "node -r esm bin-src/trace.js", - "trim-stats": "node -r esm bin-src/trim-stats-file.js", + "trim-stats": "node -r esm bin-src/trimStatsFile.js", "storybook": "start-storybook -p 9009 -s static", "test": "jest", "prepare": "husky install && npm run build", diff --git a/node-src/__mocks__/dependencyChanges/berry-package.json b/node-src/__mocks__/dependencyChanges/berry-package.json index 68a466700..bf3c8b9f2 100644 --- a/node-src/__mocks__/dependencyChanges/berry-package.json +++ b/node-src/__mocks__/dependencyChanges/berry-package.json @@ -59,7 +59,7 @@ "lint:package": "sort-package-json", "release": "node scripts/release.js", "trace": "node -r esm bin-src/trace.js", - "trim-stats": "node -r esm bin-src/trim-stats-file.js", + "trim-stats": "node -r esm bin-src/trimStatsFile.js", "storybook": "start-storybook -p 9009 -s static", "test": "jest", "prepare": "husky install && npm run build", diff --git a/node-src/git/getParentCommits.test.ts b/node-src/git/getParentCommits.test.ts index 3c35c5823..ed5ee8661 100644 --- a/node-src/git/getParentCommits.test.ts +++ b/node-src/git/getParentCommits.test.ts @@ -8,13 +8,13 @@ import { beforeAll, describe, expect, it, vi } from 'vitest'; import generateGitRepository from './generateGitRepository'; import { getParentCommits } from './getParentCommits'; import { getCommit } from './git'; -import doubleLoopDescription from './mocks/double-loop'; -import longLineDescription from './mocks/long-line'; -import longLoopDescription from './mocks/long-loop'; -import createMockIndex from './mocks/mock-index'; -import simpleLoopDescription from './mocks/simple-loop'; -import threeParentsDescription from './mocks/three-parents'; -import twoRootsDescription from './mocks/two-roots'; +import doubleLoopDescription from './mocks/doubleLoop'; +import longLineDescription from './mocks/longLine'; +import longLoopDescription from './mocks/longLoop'; +import createMockIndex from './mocks/mockIndex'; +import simpleLoopDescription from './mocks/simpleLoop'; +import threeParentsDescription from './mocks/threeParents'; +import twoRootsDescription from './mocks/twoRoots'; const descriptions = { simpleLoop: simpleLoopDescription, diff --git a/node-src/git/mocks/double-loop.ts b/node-src/git/mocks/doubleLoop.ts similarity index 100% rename from node-src/git/mocks/double-loop.ts rename to node-src/git/mocks/doubleLoop.ts diff --git a/node-src/git/mocks/long-line.ts b/node-src/git/mocks/longLine.ts similarity index 100% rename from node-src/git/mocks/long-line.ts rename to node-src/git/mocks/longLine.ts diff --git a/node-src/git/mocks/long-loop.ts b/node-src/git/mocks/longLoop.ts similarity index 100% rename from node-src/git/mocks/long-loop.ts rename to node-src/git/mocks/longLoop.ts diff --git a/node-src/git/mocks/mock-index.ts b/node-src/git/mocks/mockIndex.ts similarity index 100% rename from node-src/git/mocks/mock-index.ts rename to node-src/git/mocks/mockIndex.ts diff --git a/node-src/git/mocks/simple-loop.ts b/node-src/git/mocks/simpleLoop.ts similarity index 100% rename from node-src/git/mocks/simple-loop.ts rename to node-src/git/mocks/simpleLoop.ts diff --git a/node-src/git/mocks/three-parents.ts b/node-src/git/mocks/threeParents.ts similarity index 100% rename from node-src/git/mocks/three-parents.ts rename to node-src/git/mocks/threeParents.ts diff --git a/node-src/git/mocks/two-roots.ts b/node-src/git/mocks/twoRoots.ts similarity index 100% rename from node-src/git/mocks/two-roots.ts rename to node-src/git/mocks/twoRoots.ts diff --git a/node-src/index.test.ts b/node-src/index.test.ts index 6d3e2cd50..66ca06d87 100644 --- a/node-src/index.test.ts +++ b/node-src/index.test.ts @@ -275,7 +275,7 @@ const mockStats = { }; const mockStatsFile = Readable.from([JSON.stringify(mockStats)]); -vi.mock('./tasks/read-stats-file', () => ({ +vi.mock('./tasks/readStatsFile', () => ({ readStatsFile: () => Promise.resolve(mockStats), })); diff --git a/node-src/index.ts b/node-src/index.ts index ab445752c..71f3e3a7f 100644 --- a/node-src/index.ts +++ b/node-src/index.ts @@ -12,8 +12,8 @@ import { getUncommittedHash, getUserEmail, } from './git/git'; -import GraphQLClient from './io/GraphQLClient'; -import HTTPClient from './io/HTTPClient'; +import GraphQLClient from './io/graphqlClient'; +import HTTPClient from './io/httpClient'; import checkForUpdates from './lib/checkForUpdates'; import checkPackageJson from './lib/checkPackageJson'; import { isE2EBuild } from './lib/e2e'; @@ -22,8 +22,8 @@ import { getConfiguration } from './lib/getConfiguration'; import getEnvironment from './lib/getEnvironment'; import getOptions from './lib/getOptions'; import { createLogger } from './lib/log'; -import LoggingRenderer from './lib/LoggingRenderer'; -import NonTTYRenderer from './lib/NonTTYRenderer'; +import LoggingRenderer from './lib/loggingRenderer'; +import NonTTYRenderer from './lib/nonTTYRenderer'; import parseArguments from './lib/parseArguments'; import { exitCodes, setExitCode } from './lib/setExitCode'; import { uploadMetadataFiles } from './lib/uploadMetadataFiles'; diff --git a/node-src/io/GraphQLClient.ts b/node-src/io/graphqlClient.ts similarity index 97% rename from node-src/io/GraphQLClient.ts rename to node-src/io/graphqlClient.ts index 0a2f7e246..81ea4e565 100644 --- a/node-src/io/GraphQLClient.ts +++ b/node-src/io/graphqlClient.ts @@ -1,7 +1,7 @@ import retry from 'async-retry'; import { InitialContext } from '..'; -import HTTPClient, { HTTPClientOptions } from './HTTPClient'; +import HTTPClient, { HTTPClientOptions } from './httpClient'; const RETRYABLE_ERROR_CODE = 'RETRYABLE_ERROR_CODE'; diff --git a/node-src/io/HTTPClient.ts b/node-src/io/httpClient.ts similarity index 100% rename from node-src/io/HTTPClient.ts rename to node-src/io/httpClient.ts diff --git a/node-src/lib/FileReaderBlob.ts b/node-src/lib/fileReaderBlob.ts similarity index 100% rename from node-src/lib/FileReaderBlob.ts rename to node-src/lib/fileReaderBlob.ts diff --git a/node-src/lib/LoggingRenderer.ts b/node-src/lib/loggingRenderer.ts similarity index 100% rename from node-src/lib/LoggingRenderer.ts rename to node-src/lib/loggingRenderer.ts diff --git a/node-src/lib/NonTTYRenderer.ts b/node-src/lib/nonTTYRenderer.ts similarity index 100% rename from node-src/lib/NonTTYRenderer.ts rename to node-src/lib/nonTTYRenderer.ts diff --git a/node-src/lib/uploadFiles.ts b/node-src/lib/uploadFiles.ts index 991dbbf8d..cd67465b5 100644 --- a/node-src/lib/uploadFiles.ts +++ b/node-src/lib/uploadFiles.ts @@ -4,7 +4,7 @@ import { FormData } from 'formdata-node'; import pLimit from 'p-limit'; import { Context, FileDesc, TargetInfo } from '../types'; -import { FileReaderBlob } from './FileReaderBlob'; +import { FileReaderBlob } from './fileReaderBlob'; /** * Upload Storybook build files to Chromatic. diff --git a/node-src/lib/uploadMetadataFiles.ts b/node-src/lib/uploadMetadataFiles.ts index 410c68058..b54a9cd19 100644 --- a/node-src/lib/uploadMetadataFiles.ts +++ b/node-src/lib/uploadMetadataFiles.ts @@ -2,7 +2,7 @@ import { stat, writeFileSync } from 'fs'; import path from 'path'; import { withFile } from 'tmp-promise'; -import { main as trimStatsFile } from '../../bin-src/trim-stats-file'; +import { main as trimStatsFile } from '../../bin-src/trimStatsFile'; import { Context, FileDesc } from '../types'; import metadataHtml from '../ui/html/metadata.html'; import uploadingMetadata from '../ui/messages/info/uploadingMetadata'; diff --git a/node-src/lib/uploadZip.ts b/node-src/lib/uploadZip.ts index 1d56239eb..906ef21ab 100644 --- a/node-src/lib/uploadZip.ts +++ b/node-src/lib/uploadZip.ts @@ -3,7 +3,7 @@ import { filesize } from 'filesize'; import { FormData } from 'formdata-node'; import { Context, TargetInfo } from '../types'; -import { FileReaderBlob } from './FileReaderBlob'; +import { FileReaderBlob } from './fileReaderBlob'; /** * Upload a zip to Chromatic instead of individual files. diff --git a/node-src/tasks/read-stats-file.ts b/node-src/tasks/readStatsFile.ts similarity index 100% rename from node-src/tasks/read-stats-file.ts rename to node-src/tasks/readStatsFile.ts diff --git a/node-src/tasks/upload.test.ts b/node-src/tasks/upload.test.ts index 8758ebaba..393bb45a9 100644 --- a/node-src/tasks/upload.test.ts +++ b/node-src/tasks/upload.test.ts @@ -22,7 +22,7 @@ vi.mock('../lib/compress'); vi.mock('../lib/getDependentStoryFiles'); vi.mock('../lib/findChangedDependencies'); vi.mock('../lib/findChangedPackageFiles'); -vi.mock('./read-stats-file', () => ({ +vi.mock('./readStatsFile', () => ({ readStatsFile: () => Promise.resolve({ modules: [ @@ -34,7 +34,7 @@ vi.mock('./read-stats-file', () => ({ }), })); -vi.mock('../lib/FileReaderBlob', () => ({ +vi.mock('../lib/fileReaderBlob', () => ({ // eslint-disable-next-line @typescript-eslint/no-extraneous-class FileReaderBlob: class { constructor(_path: string, length: number, onProgress: (delta: number) => void) { diff --git a/node-src/tasks/upload.ts b/node-src/tasks/upload.ts index b5d33faf0..4bbd2128d 100644 --- a/node-src/tasks/upload.ts +++ b/node-src/tasks/upload.ts @@ -31,7 +31,7 @@ import { uploading, validating, } from '../ui/tasks/upload'; -import { readStatsFile } from './read-stats-file'; +import { readStatsFile } from './readStatsFile'; interface PathSpec { pathname: string; diff --git a/node-src/types.ts b/node-src/types.ts index c6fface7d..23e1796e2 100644 --- a/node-src/types.ts +++ b/node-src/types.ts @@ -1,6 +1,6 @@ import { InitialContext } from '.'; -import GraphQLClient from './io/GraphQLClient'; -import HTTPClient from './io/HTTPClient'; +import GraphQLClient from './io/graphqlClient'; +import HTTPClient from './io/httpClient'; import type { Configuration } from './lib/getConfiguration'; import { Environment } from './lib/getEnvironment'; import { Logger } from './lib/log'; diff --git a/node-src/ui/messages/errors/graphqlError.stories.ts b/node-src/ui/messages/errors/graphqlError.stories.ts index 646bcbd40..674fdcd8d 100644 --- a/node-src/ui/messages/errors/graphqlError.stories.ts +++ b/node-src/ui/messages/errors/graphqlError.stories.ts @@ -1,4 +1,4 @@ -import { GraphQLError } from '../../../io/GraphQLClient'; +import { GraphQLError } from '../../../io/graphqlClient'; import graphqlError from './graphqlError'; export default { diff --git a/node-src/ui/messages/errors/graphqlError.ts b/node-src/ui/messages/errors/graphqlError.ts index 597c56f8f..d70f951ff 100644 --- a/node-src/ui/messages/errors/graphqlError.ts +++ b/node-src/ui/messages/errors/graphqlError.ts @@ -1,7 +1,7 @@ import chalk from 'chalk'; import { dedent } from 'ts-dedent'; -import { GraphQLError } from '../../../io/GraphQLClient'; +import { GraphQLError } from '../../../io/graphqlClient'; import { error as icon } from '../../components/icons'; import link from '../../components/link'; diff --git a/subdir/package.json b/subdir/package.json index 2f9671988..1ac82dfb2 100644 --- a/subdir/package.json +++ b/subdir/package.json @@ -4,7 +4,7 @@ "scripts": { "start": "start-storybook", "build": "build-storybook --webpack-stats-json --output-dir ../subdir-static", - "postbuild": "node -r esm ../bin-src/trim-stats-file.js ../subdir-static/preview-stats.json" + "postbuild": "node -r esm ../bin-src/trimStatsFile.js ../subdir-static/preview-stats.json" }, "dependencies": { "@storybook/react": "^6.3.7", diff --git a/test-stories/A.js b/test-stories/a.js similarity index 100% rename from test-stories/A.js rename to test-stories/a.js diff --git a/test-stories/AWrap.js b/test-stories/aWrap.js similarity index 100% rename from test-stories/AWrap.js rename to test-stories/aWrap.js diff --git a/test-stories/B.js b/test-stories/b.js similarity index 100% rename from test-stories/B.js rename to test-stories/b.js diff --git a/test-stories/Star.js b/test-stories/star.js similarity index 100% rename from test-stories/Star.js rename to test-stories/star.js diff --git a/test-stories/Tests.stories.js b/test-stories/tests.stories.js similarity index 96% rename from test-stories/Tests.stories.js rename to test-stories/tests.stories.js index 1cf9a9c98..6e309894e 100644 --- a/test-stories/Tests.stories.js +++ b/test-stories/tests.stories.js @@ -2,8 +2,8 @@ import React from 'react'; -import isChromatic from '..'; -import AComponent from './A'; +import isChromatic from '../isChromatic'; +import AComponent from './a'; export default { title: 'Tests',