Skip to content

Commit 1c56e6f

Browse files
committed
Merge: merge 4.0.0 features
1 parent 1f2f22a commit 1c56e6f

File tree

1,742 files changed

+67290
-110650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,742 files changed

+67290
-110650
lines changed

.eslintignore

+15-7
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,32 @@ dev_mode/workspaces
1717
docs/_build
1818
docs/api
1919
docs/build
20-
examples/chrome-example-test.js
20+
examples/example.spec.ts
2121
examples/federated/core_package/index.template.js
22+
examples/federated/core_package/index.js
23+
examples/federated/labextensions
24+
galata/playwright-report
2225
jupyterlab/chrome-test.js
2326
jupyterlab/geckodriver
27+
jupyterlab/staging/yarn.js
28+
jupyterlab/staging/index.js
29+
jupyterlab/staging/webpack.config.js
2430
packages/extensionmanager-extension/examples/listings
2531
packages/nbconvert-css/raw.js
32+
packages/services/dist
2633
packages/ui-components/src/icon/iconimports.ts
27-
packages/ui-components/storybook-static
28-
jupyterlab/staging/yarn.js
29-
jupyterlab/staging/index.js
3034
tsconfigdoc.json
31-
galata/playwright-report
32-
examples/federated/core_package/index.js
33-
examples/federated/labextensions
35+
36+
#TypeDoc
37+
typedoc-theme/
3438

3539
# jetbrains IDE stuff
3640
.idea/
3741

3842
# ms IDE stuff
3943
.history/
4044
.vscode/
45+
46+
# generated LSP interfaces
47+
packages/lsp/src/_*
48+
packages/lsp/schema.js

.eslintrc.js

+105-12
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,41 @@ module.exports = {
77
'jest/globals': true
88
},
99
globals: {
10-
JSX: 'readonly'
10+
BigInt: 'readonly',
11+
HTMLCollectionOf: 'readonly',
12+
JSX: 'readonly',
13+
NodeJS: 'readonly',
14+
RequestInit: 'readonly',
15+
RequestInfo: 'readonly'
1116
},
1217
root: true,
1318
extends: [
1419
'eslint:recommended',
1520
'plugin:@typescript-eslint/eslint-recommended',
1621
'plugin:@typescript-eslint/recommended',
17-
'prettier/@typescript-eslint',
18-
'plugin:react/recommended',
19-
'plugin:jest/recommended'
22+
'prettier',
23+
'plugin:react/recommended'
2024
],
2125
parser: '@typescript-eslint/parser',
22-
parserOptions: {
23-
project: 'tsconfig.eslint.json'
24-
},
25-
plugins: ['@typescript-eslint', 'jest'],
26+
plugins: ['@typescript-eslint'],
27+
overrides: [
28+
{
29+
files: ['packages/**/*.spec.ts', 'testutils/**/*.spec.ts'],
30+
plugins: ['jest'],
31+
extends: ['plugin:jest/recommended'],
32+
rules: {
33+
'jest/no-conditional-expect': 'warn',
34+
'jest/valid-title': 'warn',
35+
'jest/no-standalone-expect': [
36+
'error',
37+
{
38+
additionalTestBlockFunctions: ['it']
39+
}
40+
]
41+
}
42+
}
43+
],
2644
rules: {
27-
'@typescript-eslint/no-floating-promises': ['error', { ignoreVoid: true }],
2845
'@typescript-eslint/naming-convention': [
2946
'error',
3047
{
@@ -38,7 +55,6 @@ module.exports = {
3855
],
3956
'@typescript-eslint/no-unused-vars': ['warn', { args: 'none' }],
4057
'@typescript-eslint/no-use-before-define': 'off',
41-
'@typescript-eslint/camelcase': 'off',
4258
'@typescript-eslint/no-explicit-any': 'off',
4359
'@typescript-eslint/no-non-null-assertion': 'off',
4460
'@typescript-eslint/no-namespace': 'off',
@@ -51,8 +67,85 @@ module.exports = {
5167
'@typescript-eslint/no-empty-interface': 'off',
5268
'@typescript-eslint/triple-slash-reference': 'warn',
5369
'@typescript-eslint/no-inferrable-types': 'off',
54-
'jest/no-conditional-expect': 'warn',
55-
'jest/valid-title': 'warn',
70+
camelcase: [
71+
'error',
72+
{
73+
allow: [
74+
'__webpack_public_path__',
75+
'__webpack_share_scopes__',
76+
'__webpack_init_sharing__',
77+
'allow_stdin',
78+
'allowed_extensions',
79+
'allowed_extensions_uris',
80+
'blocked_extensions',
81+
'blocked_extensions_uris',
82+
'bundles_extension',
83+
'cell_type',
84+
'clear_output',
85+
'codemirror_mode',
86+
'comm_close',
87+
'comm_id',
88+
'comm_msg',
89+
'comm_open',
90+
'copy_from',
91+
'creation_date',
92+
'cursor_end',
93+
'cursor_pos',
94+
'cursor_start',
95+
'detail_level',
96+
'display_data',
97+
'display_id',
98+
'display_name',
99+
'embed_options',
100+
'execute_input',
101+
'execute_result',
102+
'execution_count',
103+
'execution_state',
104+
'extension_data',
105+
'extension_name',
106+
'file_extension',
107+
'help_links',
108+
'hist_access_type',
109+
'implementation_version',
110+
'installed_version',
111+
'jlab_core',
112+
'jupyterlab_extensions',
113+
'jupyterlab_mime_extensions',
114+
'kernel_spec',
115+
'language_info',
116+
'last_modified',
117+
'last_update_date',
118+
'latest_version',
119+
'lineWrap_type',
120+
'msg_type',
121+
'msg_id',
122+
'msgid_plural',
123+
'nbconverter_exporter',
124+
'nbformat_minor',
125+
'orig_nbformat',
126+
'output_mimetype',
127+
'output_type',
128+
'outputs_hidden',
129+
'parent_header',
130+
'pf_re',
131+
'pkg_type',
132+
'protocol_version',
133+
'pygments_lexer',
134+
'request_seq',
135+
'slide_type',
136+
'source_hidden',
137+
'shutdown_reply',
138+
'stop_on_error',
139+
'store_history',
140+
'target_name',
141+
'target_module',
142+
'UNSAFE_componentWillUpdate',
143+
'UNSAFE_componentWillReceiveProps',
144+
'user_expressions'
145+
]
146+
}
147+
],
148+
'id-match': ['error', '^[a-zA-Z_]+[a-zA-Z0-9_]*$'], // https://certitude.consulting/blog/en/invisible-backdoor/
56149
'no-inner-declarations': 'off',
57150
'no-prototype-builtins': 'off',
58151
'no-control-regex': 'warn',

.gitignore

+12-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# project files
22
coverage/
3+
.eslintcache
4+
.stylelintcache
35

46
dev_mode/listings
57
dev_mode/schemas
@@ -9,6 +11,7 @@ dev_mode/workspaces
911
dev_mode/stats.json
1012

1113
docs/_build
14+
docs/source/user/commands_list.md
1215
docs/api
1316
**/docs/source/_build
1417

@@ -28,9 +31,12 @@ jupyterlab/style.js
2831
jupyterlab/tests/**/static
2932
jupyterlab/tests/**/labextension
3033

34+
ui-tests/test-output
35+
3136
# Remove after next release
3237
jupyterlab/imports.css
3338

39+
packages/codemirror/test/foo*.js
3440
packages/nbconvert-css/style/
3541
packages/services/examples/node/config.json
3642
packages/services/examples/browser/tmp
@@ -43,6 +49,7 @@ tests/**/.cache-loader
4349
galata/benchmark-results
4450
galata/playwright-report
4551
galata/test-results
52+
galata/*benchmark-expected.json
4653

4754
package_json.tar.gz
4855

@@ -53,7 +60,6 @@ node_modules
5360
*.tsbuildinfo
5461
lerna-debug.log
5562
yarn-error.log
56-
storybook-static
5763

5864
# python
5965
.cache
@@ -117,9 +123,10 @@ junit.xml
117123
# ms IDE stuff
118124
*.code-workspace
119125
.history
120-
.vscode
121-
.vs
126+
.vscode/*
127+
!.vscode/extension.json
122128

123129
.jupyter_releaser_checkout
124-
jupyterhub_cookie_secret
125-
jupyterhub.sqlite
130+
131+
# generated LSP interfaces
132+
packages/lsp/src/_*

.gitpod.yml

+21-10
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,28 @@ github:
1717
# add a label once the prebuild is ready to pull requests (defaults to false)
1818
addLabel: false
1919
tasks:
20-
- init: pip3 install -e . && yarn install && yarn run build
21-
# for some reason,have to re-install on start, or else it doesn't find the python package
20+
- name: dev-mode
21+
init: |
22+
pip3 install -e ".[docs,test]"
23+
jlpm install
24+
jlpm run build
25+
gp sync-done setup
2226
# Set no token and allow any origin, so that you can open it in a new tab
2327
# Disable iframe security so can load in the editor as well
24-
command: >
25-
pip3 install -e . &&
26-
jupyter lab
27-
--dev-mode
28-
--watch
29-
--LabApp.token=''
30-
--LabApp.allow_origin=*
31-
--LabApp.tornado_settings='{"headers": {"Content-Security-Policy": "frame-ancestors *"}}'
28+
command: |
29+
jupyter lab --dev-mode --watch --LabApp.token='' --LabApp.allow_origin=* --LabApp.tornado_settings='{"headers": {"Content-Security-Policy": "frame-ancestors *"}}'
30+
- name: documentation
31+
init: |
32+
gp sync-await setup
33+
cd docs
34+
make html
35+
command: |
36+
cd build/html
37+
python -m http.server 8000
3238
ports:
3339
- port: 8888
40+
- port: 8000
41+
42+
vscode:
43+
extensions:
44+
- esbenp.prettier-vscode

.meeseeksdev.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
special:
22
everyone:
3-
can:
3+
can:
44
- say
55
- tag
6-
- untag
6+
- untag

.prettierignore

+13-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
**/build
22
**/node_modules
33
**/lib
4+
**/dist
45
**/package.json
56
**/static
67
**/.ipynb_checkpoints
@@ -18,17 +19,18 @@ examples/app/build
1819
examples/app/themes
1920
examples/app/schemas
2021
examples/federated/core_package/index.template.js
22+
examples/federated/core_package/index.js
23+
examples/federated/labextensions
24+
galata/playwright-report
2125
jupyterlab/schemas
2226
jupyterlab/themes
2327
jupyterlab/geckodriver
2428
jupyterlab/staging/yarn.js
2529
jupyterlab/staging/index.js
30+
jupyterlab/staging/webpack.config.js
2631
packages/ui-components/src/icon/iconimports.ts
27-
packages/extensionmanager/examples/listings
2832
tsconfigdoc.json
29-
galata/playwright-report
30-
examples/federated/core_package/index.js
31-
examples/federated/labextensions
33+
typedoc-theme
3234

3335
# jetbrains IDE stuff
3436
.idea/
@@ -39,3 +41,10 @@ examples/federated/labextensions
3941

4042
# autogenerated from a lot of css in jlab
4143
packages/nbconvert-css/style/index.css
44+
45+
# autogenerated files for documentation
46+
docs/source/user/commands_list.md
47+
galata/test/documentation/commands.test.ts-snapshots/commandsList-documentation-linux.json
48+
49+
# generated LSP interfaces
50+
packages/lsp/src/_

.prettierrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
"singleQuote": true,
33
"trailingComma": "none",
44
"arrowParens": "avoid"
5-
}
5+
}

0 commit comments

Comments
 (0)