Skip to content

Commit 0e1068d

Browse files
authored
Move ESLint and Prettier scripts to the top-level (#117)
1 parent ad9f95f commit 0e1068d

25 files changed

+90
-115
lines changed

packages/common/.eslintignore renamed to .eslintignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ dist
33
coverage
44
**/*.d.ts
55
package.json
6-
**/__tests__/
6+
**/__tests__/
7+
lib

.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ const eslintBase = require('./eslint-base');
22

33
// eslintBase.parserOptions.project = 'tsconfig-base.json';
44

5-
module.exports = eslintBase;
5+
module.exports = eslintBase;

.lintstagedrc

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"packages/**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}": [
3+
"prettier --write",
4+
"git add"
5+
]
6+
}
7+

.prettierignore

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
node_modules
2+
**/node_modules
3+
**/lib
4+
**/build
5+
**/static
6+
mamba_gator/navigator
File renamed without changes.

binder/workspace.json

+33-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,33 @@
1-
{"data":{"layout-restorer:data":{"main":{"dock":{"type":"tab-area","currentIndex":1,"widgets":["conda-env:conda-env"]},"mode":"multiple-document","current":"conda-env:conda-env"},"left":{"collapsed":true,"widgets":["filebrowser","running-sessions","command-palette","jp-property-inspector","tab-manager","extensionmanager.main-view"]},"right":{"collapsed":true,"widgets":[]}},"jupyterlab-tour:state":{"tutorialsDone":["jupyterlab-tour:welcome"],"version":"2.1.1"},"conda-env:conda-env":{"data":{}}},"metadata":{"id":"/lab"}}
1+
{
2+
"data": {
3+
"layout-restorer:data": {
4+
"main": {
5+
"dock": {
6+
"type": "tab-area",
7+
"currentIndex": 1,
8+
"widgets": ["conda-env:conda-env"]
9+
},
10+
"mode": "multiple-document",
11+
"current": "conda-env:conda-env"
12+
},
13+
"left": {
14+
"collapsed": true,
15+
"widgets": [
16+
"filebrowser",
17+
"running-sessions",
18+
"command-palette",
19+
"jp-property-inspector",
20+
"tab-manager",
21+
"extensionmanager.main-view"
22+
]
23+
},
24+
"right": { "collapsed": true, "widgets": [] }
25+
},
26+
"jupyterlab-tour:state": {
27+
"tutorialsDone": ["jupyterlab-tour:welcome"],
28+
"version": "2.1.1"
29+
},
30+
"conda-env:conda-env": { "data": {} }
31+
},
32+
"metadata": { "id": "/lab" }
33+
}

eslint-base.js

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
module.exports = {
22
extends: [
3-
"eslint:recommended",
4-
"plugin:@typescript-eslint/eslint-recommended",
5-
"plugin:@typescript-eslint/recommended",
6-
"plugin:prettier/recommended",
7-
"plugin:react/recommended"
3+
'eslint:recommended',
4+
'plugin:@typescript-eslint/eslint-recommended',
5+
'plugin:@typescript-eslint/recommended',
6+
'plugin:prettier/recommended',
7+
'plugin:react/recommended'
88
],
9-
parser: "@typescript-eslint/parser",
9+
parser: '@typescript-eslint/parser',
1010
parserOptions: {
11-
project: "tsconfig.json",
12-
sourceType: "module"
11+
project: 'tsconfig.eslint.json',
12+
sourceType: 'module'
1313
},
14-
plugins: ["@typescript-eslint"],
14+
plugins: ['@typescript-eslint'],
1515
rules: {
16-
"@typescript-eslint/camelcase": "off",
17-
"@typescript-eslint/interface-name-prefix": [
18-
"error",
19-
{ prefixWithI: "always" }
16+
'@typescript-eslint/camelcase': 'off',
17+
'@typescript-eslint/interface-name-prefix': [
18+
'error',
19+
{ prefixWithI: 'always' }
2020
],
21-
"@typescript-eslint/no-explicit-any": "off",
22-
"@typescript-eslint/no-namespace": "off",
23-
"@typescript-eslint/no-unused-vars": ["warn", { args: "none" }],
24-
"@typescript-eslint/no-use-before-define": "off",
25-
"@typescript-eslint/quotes": [
26-
"error",
27-
"single",
21+
'@typescript-eslint/no-explicit-any': 'off',
22+
'@typescript-eslint/no-namespace': 'off',
23+
'@typescript-eslint/no-unused-vars': ['warn', { args: 'none' }],
24+
'@typescript-eslint/no-use-before-define': 'off',
25+
'@typescript-eslint/quotes': [
26+
'error',
27+
'single',
2828
{ avoidEscape: true, allowTemplateLiterals: false }
2929
],
30-
curly: ["error", "all"],
31-
eqeqeq: "error",
32-
"prefer-arrow-callback": "error"
30+
curly: ['error', 'all'],
31+
eqeqeq: 'error',
32+
'prefer-arrow-callback': 'error'
3333
},
3434
settings: {
3535
react: {
36-
version: "detect"
36+
version: 'detect'
3737
}
3838
}
3939
};

package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
"build": "lerna run build",
1414
"build:dev": "lerna run build:dev",
1515
"clean": "lerna run clean",
16-
"eslint": "lerna run eslint",
17-
"eslint:check": "lerna run eslint:check",
16+
"eslint": "eslint . --fix --ext .ts,.tsx",
17+
"eslint:check": "eslint . --ext .ts,.tsx",
1818
"install": "lerna bootstrap",
19+
"prettier": "npx prettier --write \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
20+
"prettier:check": "npx prettier --list-different \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
1921
"publish": "yarn run clean && yarn run build && lerna publish",
2022
"test": "yarn run eslint:check && lerna run test && yarn run lint && coverage run -m pytest mamba_gator && coverage report",
2123
"lint": "flake8 setup.py mamba_gator"

packages/common/.eslintrc.js

-9
This file was deleted.

packages/common/.lintstagedrc

-7
This file was deleted.

packages/common/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,8 @@
2929
"build": "tsc --project .",
3030
"build:dev": "yarn run build",
3131
"clean": "rimraf lib tsconfig.tsbuildinfo",
32-
"eslint": "eslint . --fix --ext .ts,.tsx",
33-
"eslint:check": "eslint . --ext .ts,.tsx",
3432
"lab:link": "jupyter labextension link . --no-build",
3533
"prepare": "yarn run clean && yarn run build",
36-
"prettier": "npx prettier --write \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
3734
"test": "jest --coverage",
3835
"watch": "tsc -w"
3936
},

packages/labextension/.eslintignore

-6
This file was deleted.

packages/labextension/.eslintrc.js

-9
This file was deleted.

packages/labextension/.lintstagedrc

-7
This file was deleted.

packages/labextension/.prettierrc

-3
This file was deleted.

packages/labextension/babel.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports = require("@jupyterlab/testutils/lib/babel.config");
1+
module.exports = require('@jupyterlab/testutils/lib/babel.config');

packages/labextension/jest.config.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const jestJupyterLab = require("@jupyterlab/testutils/lib/jest-config");
1+
const jestJupyterLab = require('@jupyterlab/testutils/lib/jest-config');
22

33
const jlabConfig = jestJupyterLab(__dirname);
44

@@ -21,14 +21,14 @@ module.exports = {
2121
testPathIgnorePatterns,
2222
transform,
2323
automock: false,
24-
collectCoverageFrom: ["src/**.{ts,tsx}", "!src/*.d.ts"],
25-
coverageDirectory: "coverage",
26-
coverageReporters: ["lcov", "text"],
24+
collectCoverageFrom: ['src/**.{ts,tsx}', '!src/*.d.ts'],
25+
coverageDirectory: 'coverage',
26+
coverageReporters: ['lcov', 'text'],
2727
globals: {
28-
"ts-jest": {
29-
tsConfig: "tsconfig.json"
28+
'ts-jest': {
29+
tsConfig: 'tsconfig.json'
3030
}
3131
},
32-
testRegex: "src/.*/.*.spec.ts[x]?$",
33-
transformIgnorePatterns: ["/node_modules/(?!(@jupyterlab/.*)/)"]
32+
testRegex: 'src/.*/.*.spec.ts[x]?$',
33+
transformIgnorePatterns: ['/node_modules/(?!(@jupyterlab/.*)/)']
3434
};

packages/labextension/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,8 @@
3232
"build": "jlpm run clean && mkdirp ../../mamba_gator/labextension && cd ../../mamba_gator/labextension && npm pack ../../packages/labextension",
3333
"clean:dev": "rimraf lib tsconfig.tsbuildinfo",
3434
"clean": "jlpm run clean:dev && rimraf ../../mamba_gator/labextension",
35-
"eslint": "eslint . --fix --ext .ts,.tsx",
36-
"eslint:check": "eslint . --ext .ts,.tsx",
3735
"lab:link": "jupyter labextension link . --no-build",
3836
"prepare": "jlpm run clean:dev && jlpm run build:dev",
39-
"prettier": "npx prettier --write \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
4037
"test": "",
4138
"watch": "tsc -w"
4239
},

packages/navigator/.eslintignore

-4
This file was deleted.

packages/navigator/.eslintrc.js

-9
This file was deleted.

packages/navigator/.lintstagedrc

-7
This file was deleted.

packages/navigator/.prettierignore

-3
This file was deleted.

packages/navigator/.prettierrc

-3
This file was deleted.

packages/navigator/package.json

-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
"build:dev": "tsc && webpack -d",
2121
"clean": "rimraf lib tsconfig.tsbuildinfo ../../mamba_gator/navigator/static/*.* ../../mamba_gator/nbextension/static/*.*",
2222
"prepublishOnly": "yarn run build",
23-
"prettier": "prettier --write '**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}'",
24-
"prettier:check": "prettier --list-different \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
25-
"eslint": "eslint . --ext .ts,.tsx --fix",
26-
"eslint:check": "eslint . --ext .ts,.tsx",
2723
"test": "",
2824
"watch:ts": "tsc -w --listEmittedFiles",
2925
"watch:webpack": "webpack --watch",

tsconfig.eslint.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"extends": "./tsconfig-base",
3+
"include": ["packages/**/*"]
4+
}

0 commit comments

Comments
 (0)