Skip to content

Commit

Permalink
eth-json-rpc-provider migration - B2: Replace typescript, jest conf…
Browse files Browse the repository at this point in the history
…ig files. (#1765)

## Explanation

This PR implements the following incremental step in the process for
migrating `eth-json-rpc-provider` into the core monorepo:

***

### Phase B: Staging in `migrated-packages/`
#### 2. Replace config files.
- [x] Update `tsconfig*.json`, `typedoc.json`, `jest.config.js` to
extend from corresponding files in root. Copy contents of corresponding
files in other non-root packages.
  - [x] Keep TypeScript compiler flags. 
- [x] Add tsconfig reference paths for non-root packages that are
upstream dependencies of the migration target.
  - [x] Keep Jest coverage threshold values. 
  - [x] Add `deepmerge` as a devDependency.

***

See #1551 (comment)
for an outline of the entire process.

## References

- Contributes to #1685
- Contributes to #1551

## Changelog

N/A

## Checklist

- [x] I've updated the test suite for new or updated code as appropriate
- [x] I've updated documentation (JSDoc, Markdown, etc.) for new or
updated code as appropriate
- [x] I've highlighted breaking changes using the "BREAKING" category
above as appropriate
  • Loading branch information
MajorLift authored Oct 5, 2023
1 parent deb3012 commit 5e1044c
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 203 deletions.
194 changes: 8 additions & 186 deletions merged-packages/eth-json-rpc-provider/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,16 @@
* https://jestjs.io/docs/configuration
*/

module.exports = {
// All imported modules in your tests should be mocked automatically
// automock: false,
const merge = require('deepmerge');
const path = require('path');

// Stop running tests after `n` failures
// bail: 0,
const baseConfig = require('../../jest.config.packages');

// The directory where Jest should store its cached dependency information
// cacheDirectory: "/private/var/folders/fk/c3y07g0576j8_2s9m01pk4qw0000gn/T/jest_dx",
const displayName = path.basename(__dirname);

// Automatically clear mock calls, instances and results before every test.
// This does not remove any mock implementation that may have been provided,
// so we disable it.
// clearMocks: true,

// Indicates whether the coverage information should be collected while executing the test
collectCoverage: true,

// An array of glob patterns indicating a set of files for which coverage information should be collected
collectCoverageFrom: ['./src/**/*.ts'],

// The directory where Jest should output its coverage files
coverageDirectory: 'coverage',

// An array of regexp pattern strings used to skip coverage collection
// coveragePathIgnorePatterns: [
// "/node_modules/"
// ],

// Indicates which provider should be used to instrument code for coverage
coverageProvider: 'babel',

// A list of reporter names that Jest uses when writing coverage reports
coverageReporters: ['html', 'json-summary', 'text'],
module.exports = merge(baseConfig, {
// The display name when running multiple projects
displayName,

// An object that configures minimum threshold enforcement for coverage results
coverageThreshold: {
Expand All @@ -47,158 +23,4 @@ module.exports = {
statements: 100,
},
},

// A path to a custom dependency extractor
// dependencyExtractor: undefined,

// Make calling deprecated APIs throw helpful error messages
// errorOnDeprecated: false,

// Force coverage collection from ignored files using an array of glob patterns
// forceCoverageMatch: [],

// A path to a module which exports an async function that is triggered once before all test suites
// globalSetup: undefined,

// A path to a module which exports an async function that is triggered once after all test suites
// globalTeardown: undefined,

// A set of global variables that need to be available in all test environments
// globals: {},

// The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
// maxWorkers: "50%",

// An array of directory names to be searched recursively up from the requiring module's location
// moduleDirectories: [
// "node_modules"
// ],

// An array of file extensions your modules use
// moduleFileExtensions: [
// "js",
// "jsx",
// "ts",
// "tsx",
// "json",
// "node"
// ],

// A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
// moduleNameMapper: {},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],

// Activates notifications for test results
// notify: false,

// An enum that specifies notification mode. Requires { notify: true }
// notifyMode: "failure-change",

// A preset that is used as a base for Jest's configuration
preset: 'ts-jest',

// Run tests from one or more projects
// projects: undefined,

// Use this configuration option to add custom reporters to Jest
// reporters: undefined,

// "resetMocks" resets all mocks, including mocked modules, to jest.fn(),
// between each test case.
resetMocks: true,

// Reset the module registry before running each individual test
// resetModules: false,

// A path to a custom resolver
// resolver: undefined,

// "restoreMocks" restores all mocks created using jest.spyOn to their
// original implementations, between each test. It does not affect mocked
// modules.
restoreMocks: true,

// The root directory that Jest should scan for tests and modules within
// rootDir: undefined,

// A list of paths to directories that Jest should use to search for files in
// roots: [
// "<rootDir>"
// ],

// Allows you to use a custom runner instead of Jest's default test runner
// runner: "jest-runner",

// The paths to modules that run some code to configure or set up the testing environment before each test
// setupFiles: [],

// A list of paths to modules that run some code to configure or set up the testing framework before each test
// setupFilesAfterEnv: [],

// The number of seconds after which a test is considered as slow and reported as such in the results.
// slowTestThreshold: 5,

// A list of paths to snapshot serializer modules Jest should use for snapshot testing
// snapshotSerializers: [],

// The test environment that will be used for testing
// testEnvironment: "jest-environment-node",

// Options that will be passed to the testEnvironment
// testEnvironmentOptions: {},

// Adds a location field to test results
// testLocationInResults: false,

// The glob patterns Jest uses to detect test files
// testMatch: [
// "**/__tests__/**/*.[jt]s?(x)",
// "**/?(*.)+(spec|test).[tj]s?(x)"
// ],

// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
// testPathIgnorePatterns: [
// "/node_modules/"
// ],

// The regexp pattern or array of patterns that Jest uses to detect test files
// testRegex: [],

// This option allows the use of a custom results processor
// testResultsProcessor: undefined,

// This option allows use of a custom test runner
// testRunner: "jest-circus/runner",

// Reduce the default test timeout from 5s to 2.5s
testTimeout: 2500,

// This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
// testURL: "http://localhost",

// Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
// timers: "real",

// A map from regular expressions to paths to transformers
// transform: undefined,

// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
// transformIgnorePatterns: [
// "/node_modules/",
// "\\.pnp\\.[^\\/]+$"
// ],

// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
// unmockedModulePathPatterns: undefined,

// Indicates whether each individual test should be reported during the run
// verbose: undefined,

// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
// watchPathIgnorePatterns: [],

// Whether to use watchman for file crawling
// watchman: true,
};
});
15 changes: 6 additions & 9 deletions merged-packages/eth-json-rpc-provider/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
{
"extends": "./tsconfig.json",
"extends": "../../tsconfig.packages.build.json",
"compilerOptions": {
"declaration": true,
"inlineSources": true,
"noEmit": false,
"outDir": "dist",
"rootDir": "src",
"sourceMap": true
"baseUrl": "./",
"outDir": "./dist",
"rootDir": "./src"
},
"include": ["./src/**/*.ts"],
"exclude": ["./src/**/*.test.ts"]
"references": [],
"include": ["../../types", "./src"]
}
12 changes: 5 additions & 7 deletions merged-packages/eth-json-rpc-provider/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{
"extends": "../../tsconfig.packages.json",
"compilerOptions": {
"esModuleInterop": true,
"baseUrl": "./",
"rootDir": "../..",
"exactOptionalPropertyTypes": true,
"forceConsistentCasingInFileNames": true,
"lib": ["ES2020"],
"module": "CommonJS",
"moduleResolution": "node",
"noEmit": true,
"noErrorTruncation": true,
"noUncheckedIndexedAccess": true,
"strict": true,
"target": "es2017"
},
"exclude": ["./dist/**/*"]
"references": [],
"include": ["../../types", "../../tests", "./src", "./tests"]
}
3 changes: 2 additions & 1 deletion merged-packages/eth-json-rpc-provider/typedoc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"entryPoints": ["./src/index.ts"],
"excludePrivate": true,
"hideGenerator": true,
"out": "docs"
"out": "docs",
"tsconfig": "./tsconfig.build.json"
}

0 comments on commit 5e1044c

Please sign in to comment.