Build/update all the things (#303)

* build: devDependencies, yarn, node

* build: typescript+ts-jest compatibility

* ci: drop node@12, run on 14,16,18

* build: adjust linter

* test: fix assumption based on node version
This commit is contained in:
Marc 2023-03-22 00:15:39 -04:00 committed by GitHub
parent 0f82bfbdb5
commit 0a2e11a67e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 3023 additions and 2650 deletions

View file

@ -7,7 +7,7 @@ module.exports = {
"plugin:@typescript-eslint/eslint-recommended", "plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended" "plugin:@typescript-eslint/recommended"
], ],
settings: { parserOptions: {
'import/resolver': { node: { extensions: ['.ts'] }} project: ['./tsconfig.eslint.json']
} }
} }

View file

@ -14,7 +14,7 @@ jobs:
- name: Use Node.js 12.x - name: Use Node.js 12.x
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version: 12.x node-version: 18
- run: yarn - run: yarn
- run: yarn lint - run: yarn lint
test: test:
@ -22,7 +22,7 @@ jobs:
strategy: strategy:
matrix: matrix:
node-version: [12.x, 14.x] node-version: [14, 16, 18]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -42,7 +42,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
node-version: [12.x, 14.x] node-version: [14, 16, 18]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

2
.nvmrc
View file

@ -1 +1 @@
14 18.13.0

873
.yarn/releases/yarn-3.4.1.cjs vendored Executable file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1 +1 @@
yarnPath: .yarn/releases/yarn-sources.cjs yarnPath: .yarn/releases/yarn-3.4.1.cjs

View file

@ -1,8 +1,5 @@
/** @type {import('ts-jest').JestConfigWithTsJest} */
module.exports = { module.exports = {
transformIgnorePatterns: ['.test.js'], preset: 'ts-jest',
transform: { testEnvironment: 'node',
'^.+\\.ts$': 'ts-jest', };
},
roots: ['<rootDir>/tests'],
testMatch: ['**/*.test.ts'],
}

View file

@ -39,20 +39,20 @@
"types:watch": "yarn types --watch" "types:watch": "yarn types --watch"
}, },
"devDependencies": { "devDependencies": {
"@tophat/eslint-config": "0.9.0", "@tophat/eslint-config": "^6.0.1",
"@types/jest": "26.0.23", "@types/jest": "^29.5.0",
"@types/node": "14.17.2", "@types/node": "^18.15.5",
"@typescript-eslint/eslint-plugin": "^4.26.0", "@typescript-eslint/eslint-plugin": "^5.56.0",
"@typescript-eslint/parser": "^4.26.0", "@typescript-eslint/parser": "^5.56.0",
"eslint": "^7.0.0", "eslint": "^8.36.0",
"eslint-config-prettier": "8.3.0", "eslint-config-prettier": "^8.8.0",
"eslint-import-resolver-node": "^0.3.4", "eslint-import-resolver-node": "^0.3.7",
"eslint-plugin-import": "^2.22.1", "eslint-plugin-import": "^2.27.5",
"eslint-plugin-jest": "^24.1.5", "eslint-plugin-jest": "^27.2.1",
"eslint-plugin-prettier": "3.4.0", "eslint-plugin-prettier": "^4.2.1",
"jest": "27.0.4", "jest": "^29.5.0",
"prettier": "2.3.1", "prettier": "^2.8.5",
"ts-jest": "27.0.3", "ts-jest": "^29.0.5",
"typescript": "^4.3.2" "typescript": "^4.3.0"
} }
} }

View file

@ -1,15 +1,16 @@
import { existsSync } from 'fs' import { existsSync } from 'fs'
import { join, resolve } from 'path' import { join, resolve } from 'path'
import { assertInPackageRoot } from './invariants'
import logger from './logger'
import { import {
createOrUpdateManifest, createOrUpdateManifest,
getCurrentPackageStats, getCurrentPackageStats,
getPreviousPackageStats, getPreviousPackageStats,
mergeDefaultArguments, mergeDefaultArguments,
} from './utils' } from './utils'
import type { PackwatchArguments } from './types' import type { PackwatchArguments } from './types'
import { assertInPackageRoot } from './invariants'
import logger from './logger'
const MANIFEST_FILENAME = '.packwatch.json' const MANIFEST_FILENAME = '.packwatch.json'

View file

@ -2,7 +2,7 @@ import { spawnSync } from 'child_process'
import { readFileSync, writeFileSync } from 'fs' import { readFileSync, writeFileSync } from 'fs'
import { join, resolve } from 'path' import { join, resolve } from 'path'
import { PackwatchArguments, Report } from './types' import { type PackwatchArguments, type Report } from './types'
const PACKAGE_SIZE_PATT = /package size:\s*([0-9]+\.?[0-9]*\s+[A-Za-z]{1,2})/ const PACKAGE_SIZE_PATT = /package size:\s*([0-9]+\.?[0-9]*\s+[A-Za-z]{1,2})/
const UNPACKED_SIZE_PATT = /unpacked size:\s*([0-9]+\.?[0-9]*\s+[A-Za-z]{1,2})/ const UNPACKED_SIZE_PATT = /unpacked size:\s*([0-9]+\.?[0-9]*\s+[A-Za-z]{1,2})/

View file

@ -2,11 +2,20 @@ import { promises as fs } from 'fs'
import { tmpdir } from 'os' import { tmpdir } from 'os'
import { join, resolve } from 'path' import { join, resolve } from 'path'
import type { Report } from '../src/types'
import packwatch from '../src' import packwatch from '../src'
import type { Report } from '../src/types'
let workspace: string | null let workspace: string | null
function getActualPackageSizeByNodeVersion(nodeVersion: string): string {
if (nodeVersion.startsWith('v14')) return '160'
else if (nodeVersion.startsWith('v16')) return '157'
else if (nodeVersion.startsWith('v18')) return '157'
return 'unknown'
}
async function prepareWorkspace(): Promise<string> { async function prepareWorkspace(): Promise<string> {
const workspacePath = await fs.mkdtemp(`${tmpdir()}/`) const workspacePath = await fs.mkdtemp(`${tmpdir()}/`)
workspace = workspacePath workspace = workspacePath
@ -40,6 +49,7 @@ async function createManifest(
} }
describe('Packwatch', () => { describe('Packwatch', () => {
const actualSize = getActualPackageSizeByNodeVersion(process.version)
afterEach(async () => { afterEach(async () => {
jest.restoreAllMocks() jest.restoreAllMocks()
@ -79,8 +89,8 @@ describe('Packwatch', () => {
{ encoding: 'utf8' }, { encoding: 'utf8' },
) )
expect(generatedManifest).toEqual( expect(generatedManifest).toBe(
'{"limit":"160 B","packageSize":"160 B","unpackedSize":"68 B"}', `{"limit":"${actualSize} B","packageSize":"${actualSize} B","unpackedSize":"68 B"}`,
) )
}) })
@ -131,9 +141,9 @@ describe('Packwatch', () => {
const mockLogger = jest.spyOn(console, 'log') const mockLogger = jest.spyOn(console, 'log')
await createPackageJson(workspacePath) await createPackageJson(workspacePath)
await createManifest(workspacePath, { await createManifest(workspacePath, {
limit: '160B', limit: `${actualSize}B`,
packageSize: '160B', packageSize: `${actualSize}B`,
packageSizeBytes: 160, packageSizeBytes: Number(actualSize),
unpackedSize: '150B', unpackedSize: '150B',
unpackedSizeBytes: 150, unpackedSizeBytes: 150,
}) })
@ -141,7 +151,7 @@ describe('Packwatch', () => {
expect(mockLogger.mock.calls).toHaveLength(1) expect(mockLogger.mock.calls).toHaveLength(1)
expect(mockLogger.mock.calls[0][0]).toEqual( expect(mockLogger.mock.calls[0][0]).toEqual(
expect.stringMatching( expect.stringMatching(
/Nothing to report! Your package is the same size as the latest manifest reports! \(Limit: 160B\)/, /Nothing to report! Your package is the same size as the latest manifest reports!/,
), ),
) )
}) })
@ -152,8 +162,8 @@ describe('Packwatch', () => {
await createPackageJson(workspacePath) await createPackageJson(workspacePath)
await createManifest(workspacePath, { await createManifest(workspacePath, {
limit: '170B', limit: '170B',
packageSize: '160B', packageSize: `${actualSize}B`,
packageSizeBytes: 160, packageSizeBytes: Number(actualSize),
unpackedSize: '150B', unpackedSize: '150B',
unpackedSizeBytes: 150, unpackedSizeBytes: 150,
}) })

7
tsconfig.eslint.json Normal file
View file

@ -0,0 +1,7 @@
{
"extends": "./tsconfig.json",
"include": ["src", "tests", ".eslintrc.js"],
"exclude": [
"dist/**/*"
]
}

View file

@ -1,73 +1,22 @@
{ {
"compilerOptions": { "compilerOptions": {
/* Visit https://aka.ms/tsconfig.json to read more about this file */ "target": "es5",
"module": "commonjs",
/* Basic Options */ "allowJs": false,
// "incremental": true, /* Enable incremental compilation */ "declaration": true,
"target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */ "declarationMap": true,
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */ "sourceMap": true,
// "lib": [], /* Specify library files to be included in the compilation. */ "outDir": "./dist",
"allowJs": false, /* Allow javascript files to be compiled. */ "rootDir": "./",
// "checkJs": true, /* Report errors in .js files. */ "removeComments": true,
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */ "strict": true,
"declaration": true, /* Generates corresponding '.d.ts' file. */ "esModuleInterop": true,
"declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ "skipLibCheck": true,
"sourceMap": true, /* Generates corresponding '.map' file. */ "forceConsistentCasingInFileNames": true
// "outFile": "./", /* Concatenate and emit output to single file. */
"outDir": "./dist", /* Redirect output structure to the directory. */
"rootDir": "./src", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
"removeComments": true, /* Do not emit comments to output. */
// "noEmit": true, /* Do not emit outputs. */
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
/* Strict Type-Checking Options */
"strict": true, /* Enable all strict type-checking options. */
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
/* Additional Checks */
// "noUnusedLocals": true, /* Report errors on unused locals. */
// "noUnusedParameters": true, /* Report errors on unused parameters. */
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
// "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an 'override' modifier. */
// "noPropertyAccessFromIndexSignature": true, /* Require undeclared properties from index signatures to use element accesses. */
/* Module Resolution Options */
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
// "types": [], /* Type declaration files to be included in compilation. */
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
/* Source Map Options */
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
/* Experimental Options */
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
/* Advanced Options */
"skipLibCheck": true, /* Skip type checking of declaration files. */
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
}, },
"exclude": ["dist/**/*", "tests/**/*"] "include": ["src", ".eslintrc.js"],
"exclude": [
"dist/**/*",
"tests/**/*"
]
} }

3999
yarn.lock

File diff suppressed because it is too large Load diff