Skip to content

Commit

Permalink
chore: extend lint rules to root
Browse files Browse the repository at this point in the history
  • Loading branch information
juanpicado committed Apr 9, 2021
1 parent e61bd6c commit 9ed932e
Show file tree
Hide file tree
Showing 41 changed files with 84 additions and 160 deletions.
1 change: 0 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@
"@typescript-eslint/ban-ts-ignore": 0,
"@typescript-eslint/no-var-requires": 0,
"@typescript-eslint/no-inferrable-types": 0,
"@typescript-eslint/interface-name-prefix": 0,
"@typescript-eslint/no-empty-function": 0,
"@typescript-eslint/no-this-alias": 0,
"@typescript-eslint/no-use-before-define": 0,
Expand Down
2 changes: 1 addition & 1 deletion debug/bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// this file aims to help local debugging with hot transpilation
// it requires BABEL_ENV=registry set as env variable
require('@babel/register')({
extensions: [".ts", ".js"]
extensions: ['.ts', '.js'],
});
require('../packages/cli/src/index');
7 changes: 1 addition & 6 deletions jest/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ module.exports = {
},
verbose: false,
collectCoverage: true,
collectCoverageFrom: [
"src/**/*.ts",
"!**/node_modules/**",
"!**/partials/**",
"!**/fixture/**",
],
collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**', '!**/partials/**', '!**/fixture/**'],
coveragePathIgnorePatterns: ['node_modules', 'fixtures'],
};
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"clean": "pnpm recursive run clean",
"build": "pnpm recursive run build",
"docker": "docker build -t verdaccio/verdaccio:local . --no-cache",
"lint": "eslint \"packages/**/@(src|tests|test)/**\"",
"lint": "eslint . --ext .js,.ts,.tsx,.jsx",
"test": "pnpm recursive test",
"test:e2e:cli": "cross-env NODE_ENV=test jest --config ./test/e2e-cli/jest.config.e2e.cli.js --passWithNoTests",
"website:lint": "cd website && yarn lint",
Expand Down
20 changes: 10 additions & 10 deletions packages/api/__mocks__/@verdaccio/logger/index.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
const setup = jest.fn();
const logger = {
const logger = {
child: jest.fn(() => ({
debug: jest.fn(),
trace: jest.fn(),
warn: jest.fn(),
info: jest.fn(),
error: jest.fn(),
trace: jest.fn(),
warn: jest.fn(),
info: jest.fn(),
error: jest.fn(),
fatal: jest.fn(),
})),
debug: jest.fn(),
trace: jest.fn(),
warn: jest.fn(),
info: jest.fn(),
error: jest.fn(),
trace: jest.fn(),
warn: jest.fn(),
info: jest.fn(),
error: jest.fn(),
fatal: jest.fn(),
};

export { setup, logger }
export { setup, logger };
2 changes: 1 addition & 1 deletion packages/api/types/custom.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Logger, RemoteUser } from "@verdaccio/types";
import { Logger, RemoteUser } from '@verdaccio/types';

declare global {
namespace Express {
Expand Down
1 change: 0 additions & 1 deletion packages/loaders/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
const config = require('../../jest/config');

module.exports = Object.assign({}, config, {});

1 change: 0 additions & 1 deletion packages/logger-prettify/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
const config = require('../../jest/config');

module.exports = Object.assign({}, config, {});

1 change: 0 additions & 1 deletion packages/logger/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ const config = require('../../jest/config');
module.exports = Object.assign({}, config, {
verbose: true,
});

3 changes: 1 addition & 2 deletions packages/middleware/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const config = require('../../jest/config');

module.exports = Object.assign({}, config, {
collectCoverage: true
collectCoverage: true,
});

4 changes: 2 additions & 2 deletions packages/middleware/types/custom.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// <reference types="node" />

import { Logger, RemoteUser } from "@verdaccio/types";
import * as http from "http";
import * as http from 'http';
import { Logger, RemoteUser } from '@verdaccio/types';

declare global {
namespace Express {
Expand Down
3 changes: 1 addition & 2 deletions packages/mock/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const config = require('../../jest/config');

module.exports = Object.assign({}, config, {
collectCoverage: true
collectCoverage: true,
});

3 changes: 1 addition & 2 deletions packages/node-api/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const config = require('../../jest/config');

module.exports = Object.assign({}, config, {
collectCoverage: true
collectCoverage: true,
});

3 changes: 1 addition & 2 deletions packages/proxy/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const config = require('../../jest/config');

module.exports = Object.assign({}, config, {
collectCoverage: true
collectCoverage: true,
});

3 changes: 1 addition & 2 deletions packages/server/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const config = require('../../jest/config');

module.exports = Object.assign({}, config, {
setupFilesAfterEnv: ['./jest.setup.js']
setupFilesAfterEnv: ['./jest.setup.js'],
});

2 changes: 1 addition & 1 deletion packages/server/types/custom.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Logger, RemoteUser } from "@verdaccio/types";
import { Logger, RemoteUser } from '@verdaccio/types';

declare global {
namespace Express {
Expand Down
3 changes: 1 addition & 2 deletions packages/store/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ const config = require('../../jest/config');

module.exports = Object.assign({}, config, {
// FIXME: coverage fails here
collectCoverage: true
collectCoverage: true,
});

2 changes: 1 addition & 1 deletion packages/types/custom.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Logger, RemoteUser } from "@verdaccio/types";
import { Logger, RemoteUser } from '@verdaccio/types';

declare global {
namespace Express {
Expand Down
17 changes: 8 additions & 9 deletions packages/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ import {
Package,
IPluginStorageFilter,
Author,
AuthPluginPackage,
AuthPluginPackage,
Token,
ITokenActions,
TokenFilter
TokenFilter,
} from '@verdaccio/types';
import lunrMutable from 'lunr-mutable-indexes';
import {NextFunction, Request, Response} from 'express';
import { NextFunction, Request, Response } from 'express';

export type StringValue = verdaccio$StringValue;

Expand All @@ -42,13 +42,13 @@ export interface LegacyPackageList {
export type PackageAccessAddOn = PackageAccess & {
// FIXME: should be published on @verdaccio/types
unpublish?: string[];
}
};

export type MatchedPackage = PackageAccess | void;

export type JWTPayload = RemoteUser & {
password?: string;
}
};

export interface AESPayload {
user: string;
Expand Down Expand Up @@ -92,10 +92,10 @@ export interface Profile {
fullname: string;
}

export type $RequestExtend = Request & {remote_user?: any; log: Logger}
export type $ResponseExtend = Response & {cookies?: any}
export type $RequestExtend = Request & { remote_user?: any; log: Logger };
export type $ResponseExtend = Response & { cookies?: any };
export type $NextFunctionVer = NextFunction & any;
export type $SidebarPackage = Package & {latest: any}
export type $SidebarPackage = Package & { latest: any };

export interface IAuthWebUI {
jwtEncrypt(user: RemoteUser, signOptions: JWTSignOptions): Promise<string>;
Expand Down Expand Up @@ -194,4 +194,3 @@ export interface Styles {
}

export type AuthorAvatar = Author & { avatar?: string };

2 changes: 1 addition & 1 deletion packages/verdaccio/debug/bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// this file aims to help local debugging with hot transpilation
// it requires BABEL_ENV=registry set as env variable
require('@babel/register')({
extensions: [".ts"]
extensions: ['.ts'],
});
require('@verdaccio/cli');
14 changes: 3 additions & 11 deletions packages/verdaccio/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = {
// Some unit tests rely on data folders that look like packages. This confuses jest-hast-map
// when it tries to scan for package.json files.
transform: {
'^.+\\.[t|j]sx?$': 'babel-jest'
'^.+\\.[t|j]sx?$': 'babel-jest',
},
modulePathIgnorePatterns: [
'<rootDir>/test/unit/partials/mock-store/.*/package.json',
Expand All @@ -28,14 +28,6 @@ module.exports = {
'<rootDir>/build',
'<rootDir>/.vscode/',
],
testPathIgnorePatterns: [
'__snapshots__',
'<rootDir>/build',
],
coveragePathIgnorePatterns: [
'node_modules',
'fixtures',
'<rootDir>/src/api/debug',
'<rootDir>/test',
]
testPathIgnorePatterns: ['__snapshots__', '<rootDir>/build'],
coveragePathIgnorePatterns: ['node_modules', 'fixtures', '<rootDir>/src/api/debug', '<rootDir>/test'],
};
1 change: 0 additions & 1 deletion packages/web/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
const config = require('../../jest/config');

module.exports = Object.assign({}, config, {});

2 changes: 1 addition & 1 deletion packages/web/types/custom.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Logger, RemoteUser } from "@verdaccio/types";
import { Logger, RemoteUser } from '@verdaccio/types';

declare global {
namespace Express {
Expand Down
2 changes: 1 addition & 1 deletion scripts/run-verdaccio.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
// this file aims to help local debugging with hot transpilation
// it requires BABEL_ENV=registry set as env variable
require('@babel/register')({
extensions: [".ts", ".js"]
extensions: ['.ts', '.js'],
});
require('../src/lib/cli');
4 changes: 2 additions & 2 deletions scripts/trigger-release.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const octokit = new Octokit({
const [repoOwner, repoName] = process.env.GITHUB_REPOSITORY.split('/');

getStdin()
.then(changelog =>
.then((changelog) =>
octokit.repos.createRelease({
owner: repoOwner,
repo: repoName,
Expand All @@ -24,7 +24,7 @@ getStdin()
draft: false,
})
)
.catch(err => {
.catch((err) => {
// eslint-disable-next-line no-console
console.error(err);
process.exit(1);
Expand Down
1 change: 1 addition & 0 deletions test/e2e-cli/.eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"rules": {
"no-console": 0,
"@typescript-eslint/no-var-requires": 0,
"@typescript-eslint/explicit-member-accessibility": 0
}
Expand Down
2 changes: 1 addition & 1 deletion test/e2e-cli/env_babel.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require('@babel/register')({
extensions: [".ts", ".js"]
extensions: ['.ts', '.js'],
});
module.exports = require('./setup/test_environment');
2 changes: 1 addition & 1 deletion test/e2e-cli/env_setup.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require('@babel/register')({
extensions: [".ts", ".js"]
extensions: ['.ts', '.js'],
});
module.exports = require('./setup/setup');
2 changes: 1 addition & 1 deletion test/e2e-cli/env_teardown.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require('@babel/register')({
extensions: [".ts", ".js"]
extensions: ['.ts', '.js'],
});
module.exports = require('./setup/teardown');
2 changes: 1 addition & 1 deletion test/e2e-cli/jest.config.e2e.cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ module.exports = {
testEnvironment: './env_babel.js',
globalSetup: './env_setup.js',
globalTeardown: './env_teardown.js',
testRegex: '(/test/e2e.*\\.spec)\\.ts'
testRegex: '(/test/e2e.*\\.spec)\\.ts',
};
4 changes: 2 additions & 2 deletions test/e2e-cli/projects/basic/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = function() {
const message = "this is a basic project";
module.exports = function () {
const message = 'this is a basic project';
console.log(message);

return message;
Expand Down
4 changes: 2 additions & 2 deletions test/e2e-cli/projects/scoped_basic/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = function() {
const message = "this is a scoped basic project";
module.exports = function () {
const message = 'this is a scoped basic project';
console.log(message);

return message;
Expand Down
37 changes: 10 additions & 27 deletions test/e2e-cli/setup/setup.ts
Original file line number Diff line number Diff line change
@@ -1,44 +1,27 @@
import fs from 'fs';
import path from 'path';
import os from 'os';
import { green } from 'kleur';
import { spawn } from 'child_process';
import { yellow } from 'kleur';
import { npm } from '../utils/process';
import * as __global from '../utils/global.js';

module.exports = async () => {
const tempRoot = fs.mkdtempSync(path.join(fs.realpathSync(os.tmpdir()), 'verdaccio-cli-e2e-'));
const tempConfigFile = path.join(tempRoot, 'verdaccio.yaml');
__global.addItem('dir-root', tempRoot);
console.log(green(`Global temp root folder: ${tempRoot}`));
fs.copyFileSync(path.join(__dirname, '../config/_bootstrap_verdaccio.yaml'), tempConfigFile);
console.log(green(`global temp root conf: ${tempConfigFile}`));
console.log(yellow(`Add temp root folder: ${tempRoot}`));
fs.copyFileSync(path.join(__dirname, '../config/_bootstrap_verdaccio.yaml'), path.join(tempRoot, 'verdaccio.yaml'));
// @ts-ignore
global.__namespace = __global;
console.log(`current directory: ${process.cwd()}`);
const rootVerdaccio = path.resolve('./bin/verdaccio');
console.log(green(`verdaccio root path: ${rootVerdaccio}`));
// @ts-ignore
global.registryProcess = spawn('node', [path.resolve('./bin/verdaccio'), '-c', './verdaccio.yaml'], {
cwd: tempRoot,
// stdio: 'pipe'
});

// @ts-ignore
global.registryProcess.stdout.on('data', (data) => {
console.log(`stdout: ${data}`);
});

// @ts-ignore
global.registryProcess.stderr.on('data', (data) => {
console.log(`stderr: ${data}`);
});

// @ts-ignore
global.registryProcess.on('close', (code) => {
console.log(`child process exited with code ${code}`);
});
global.registryProcess = spawn(
'node',
[require.resolve('verdaccio/bin/verdaccio'), '-c', './verdaccio.yaml'],
// @ts-ignore
{ cwd: tempRoot, silence: true }
);

// publish current build version on local registry
await npm('publish', '--registry', 'http://localhost:4873', '--verbose');
await npm('publish', '--registry', 'http://localhost:4873');
};
2 changes: 1 addition & 1 deletion test/e2e-cli/setup/test_environment.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const fs = require('fs');
import os from 'os';
import path from 'path';
import NodeEnvironment from 'jest-environment-node';
const fs = require('fs');
const __global = require('../utils/global');

class E2ECliTestEnvironment extends NodeEnvironment {
Expand Down
Loading

0 comments on commit 9ed932e

Please sign in to comment.