Skip to content

Commit 18d69fd

Browse files
committed
Merge branch 'main' into ft/rich/1
2 parents 1291510 + e821eb6 commit 18d69fd

Some content is hidden

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

52 files changed

+683
-2368
lines changed

docs/docs/develop/dev-environment/index.mdx

+21
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,27 @@
44

55
🚨 Only Yarn v3 is supported - npm, pnpm, yarn v1... will not work, this is due to JupyterLab requirements.
66

7+
Create a `.yarnrc.yml` file in the root of your project to use `node_modules`.
8+
9+
```yaml
10+
enableImmutableInstalls: false
11+
enableInlineBuilds: false
12+
enableTelemetry: false
13+
httpTimeout: 60000
14+
nodeLinker: node-modules
15+
npmRegistryServer: "https://registry.yarnpkg.com"
16+
17+
# This will fix the build error with @lerna/legacy-package-management
18+
# See https://github.com/lerna/repro/pull/11
19+
packageExtensions:
20+
"@lerna/legacy-package-management@*":
21+
dependencies:
22+
"@lerna/child-process": "*"
23+
"js-yaml": "*"
24+
"rimraf": "*"
25+
peerDependencies:
26+
"nx": "*"
27+
```
728
:::
829
930
Choose the way you want to develop Jupyter UI:

packages/react/.storybook/custom.css

-11
This file was deleted.

packages/react/.storybook/main.ts

-139
This file was deleted.

packages/react/.storybook/manager.ts

-12
This file was deleted.

packages/react/.storybook/preview-head.html

-31
This file was deleted.

packages/react/.storybook/preview.tsx

-70
This file was deleted.

packages/react/.storybook/theme.ts

-13
This file was deleted.

packages/react/package.json

+6-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@datalayer/jupyter-react",
3+
<<<<<<< HEAD
34
"version": "0.19.4",
5+
=======
6+
"version": "0.19.7",
7+
>>>>>>> main
48
"description": "Jupyter React - React.js components 100% compatible with Jupyter.",
59
"license": "MIT",
610
"main": "lib/index.js",
@@ -59,10 +63,7 @@
5963
"typedoc": "typedoc ./src",
6064
"watch": "run-p watch:src watch:labextension",
6165
"watch:labextension": "jupyter labextension watch .",
62-
"watch:src": "tsc -w",
63-
"storybook": "storybook dev -p 6006",
64-
"storybook:ci": "storybook dev -p 6006 --ci --quiet",
65-
"build:storybook": "storybook build"
66+
"watch:src": "tsc -w"
6667
},
6768
"dependencies": {
6869
"@codemirror/lang-python": "^6.0.1",
@@ -72,6 +73,7 @@
7273
"@jupyter-widgets/html-manager": "^1.0.0",
7374
"@jupyter-widgets/jupyterlab-manager": "^5.0.0",
7475
"@jupyter-widgets/output": "^6.0.0",
76+
"@jupyter/collaboration": "^3.1.0",
7577
"@jupyter/web-components": "^0.15.3",
7678
"@jupyter/ydoc": "3.0.2",
7779
"@jupyterlab/application": "^4.0.0",
@@ -170,16 +172,6 @@
170172
"@mermaid-js/mermaid-zenuml": "0.2.0",
171173
"@playwright/test": "^1.40.1",
172174
"@primer/octicons-react": "^19.8.0",
173-
"@storybook/addon-essentials": "^8.0.10",
174-
"@storybook/addon-interactions": "^8.0.10",
175-
"@storybook/addon-links": "^8.0.10",
176-
"@storybook/addon-onboarding": "^8.0.10",
177-
"@storybook/addon-themes": "^8.0.10",
178-
"@storybook/blocks": "^8.0.10",
179-
"@storybook/manager-api": "^8.0.10",
180-
"@storybook/react": "^8.0.10",
181-
"@storybook/react-webpack5": "^8.0.10",
182-
"@storybook/test": "^8.0.10",
183175
"@types/codemirror": "^5.60.4",
184176
"@types/jest": "^29.4.0",
185177
"@types/marked": "^4.0.1",
@@ -219,7 +211,6 @@
219211
"raw-loader": "4.0.2",
220212
"rimraf": "^3.0.2",
221213
"source-map-loader": "^5.0.0",
222-
"storybook": "^8.0.10",
223214
"stream": "^0.0.2",
224215
"stream-browserify": "^2.0.2",
225216
"style-loader": "^2.0.0",
@@ -296,7 +287,6 @@
296287
"**/*.d.ts",
297288
"tests",
298289
"**/__tests__",
299-
"stories",
300290
"playwright.config.ts"
301291
],
302292
"eslintConfig": {

0 commit comments

Comments
 (0)