Replace @stlite/stlite-kernel usage wiht @stlite/kernel

whitphx · Oct 1, 2022 · bd11c4d · bd11c4d
1 parent d1b9323
commit bd11c4d
Show file tree

Hide file tree

Showing 18 changed files with 32 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -3,11 +3,11 @@ mountable := packages/mountable/build/*
 sharing := packages/sharing/build/*
 sharing-common := packages/sharing-common/dist/*
 sharing-editor := packages/sharing-editor/build/*
-stlite_kernel := packages/stlite-kernel/dist/*
-pyarrow_wheel := packages/stlite-kernel/py/stlite-pyarrow/dist/stlite_pyarrow-0.1.0-py3-none-any.whl
-tornado_wheel := packages/stlite-kernel/py/tornado/dist/tornado-6.2-py3-none-any.whl
+kernel := packages/kernel/dist/*
+pyarrow_wheel := packages/kernel/py/stlite-pyarrow/dist/stlite_pyarrow-0.1.0-py3-none-any.whl
+tornado_wheel := packages/kernel/py/tornado/dist/tornado-6.2-py3-none-any.whl
 streamlit_proto := streamlit/frontend/src/autogen
-streamlit_wheel := packages/stlite-kernel/py/streamlit/lib/dist/streamlit-1.12.0-py2.py3-none-any.whl
+streamlit_wheel := packages/kernel/py/streamlit/lib/dist/streamlit-1.12.0-py2.py3-none-any.whl
 
 .PHONY: all
 all: init mountable playground sharing sharing-editor
@@ -45,14 +45,14 @@ $(GIT_SUBMODULES): %/.git: .gitmodules
 
 .PHONY: mountable
 mountable: $(mountable)
-$(mountable): packages/mountable/src/*.ts packages/mountable/src/*.tsx $(stlite_kernel) $(streamlit_wheel)
+$(mountable): packages/mountable/src/*.ts packages/mountable/src/*.tsx $(kernel) $(streamlit_wheel)
 	cd packages/mountable; \
 	yarn build
 	@touch $@
 
 .PHONY: sharing
 sharing: $(sharing)
-$(sharing): packages/sharing/src/*.ts packages/sharing/src/*.tsx $(stlite_kernel) $(streamlit_wheel) $(sharing-common) yarn_install
+$(sharing): packages/sharing/src/*.ts packages/sharing/src/*.tsx $(kernel) $(streamlit_wheel) $(sharing-common) yarn_install
 	cd packages/sharing; \
 	yarn build
 	@touch $@
@@ -71,26 +71,26 @@ $(sharing-editor): packages/sharing-editor/src/*.ts packages/sharing-editor/src/
 
 .PHONY: playground
 playground: $(playground)
-$(playground): packages/playground/src/*.ts packages/playground/src/*.tsx packages/playground/public/* $(stlite_kernel) $(streamlit_wheel)
+$(playground): packages/playground/src/*.ts packages/playground/src/*.tsx packages/playground/public/* $(kernel) $(streamlit_wheel)
 	cd packages/playground; \
 	yarn build
 	@touch $@
 
-.PHONY: stlite-kernel
-stlite-kernel: $(stlite_kernel)
-$(stlite_kernel): packages/stlite-kernel/src/*.ts $(pyarrow_wheel) $(tornado_wheel) $(streamlit_wheel) $(streamlit_proto)
-	cd packages/stlite-kernel; \
+.PHONY: kernel
+kernel: $(kernel)
+$(kernel): packages/kernel/src/*.ts $(pyarrow_wheel) $(tornado_wheel) $(streamlit_wheel) $(streamlit_proto)
+	cd packages/kernel; \
 	yarn build
 	@touch $@
 
-$(pyarrow_wheel): $(VENV) packages/stlite-kernel/py/stlite-pyarrow/pyarrow/*.py
+$(pyarrow_wheel): $(VENV) packages/kernel/py/stlite-pyarrow/pyarrow/*.py
 	. $(VENV)/bin/activate && \
-	cd packages/stlite-kernel/py/stlite-pyarrow && \
+	cd packages/kernel/py/stlite-pyarrow && \
 	poetry build
 
-$(tornado_wheel): $(VENV) packages/stlite-kernel/py/tornado/tornado/*.py
+$(tornado_wheel): $(VENV) packages/kernel/py/tornado/tornado/*.py
 	. $(VENV)/bin/activate && \
-	cd packages/stlite-kernel/py/tornado && \
+	cd packages/kernel/py/tornado && \
 	TORNADO_EXTENSION=0 python -m build --wheel
 	@touch $@
 

diff --git a/packages/desktop/bin/dump_snapshot.ts b/packages/desktop/bin/dump_snapshot.ts
@@ -104,9 +104,7 @@ yargs(hideBin(process.argv))
   })
   .parseAsync()
   .then(async (args) => {
-    const stliteKernelDir = path.dirname(
-      require.resolve("@stlite/stlite-kernel")
-    ); // -> /path/to/stlite-kernel/dist
+    const stliteKernelDir = path.dirname(require.resolve("@stlite/kernel")); // -> /path/to/stlite-kernel/dist
     const stliteKernelPyDir = path.resolve(stliteKernelDir, "../py"); // -> /path/to/stlite-kernel/py
     await createSitePackagesSnapshot({
       localWheelPaths: {

diff --git a/packages/desktop/package.json b/packages/desktop/package.json
@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "@craco/craco": "^6.1.2",
-    "@stlite/stlite-kernel": "^0.8.0",
+    "@stlite/kernel": "^0.8.0",
     "@testing-library/react": "^11.2.7",
     "@testing-library/user-event": "^13.1.9",
     "@types/jest": "^26.0.19",

diff --git a/packages/desktop/src/App.tsx b/packages/desktop/src/App.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react";
-import { StliteKernel, StliteKernelOptions } from "@stlite/stlite-kernel";
+import { StliteKernel, StliteKernelOptions } from "@stlite/kernel";
 import StreamlitApp from "./StreamlitApp";
 
 let pyodideEntrypointUrl: string | undefined;

diff --git a/packages/desktop/src/StreamlitApp.tsx b/packages/desktop/src/StreamlitApp.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { StliteKernel, StliteKernelProvider } from "@stlite/stlite-kernel";
+import { StliteKernel, StliteKernelProvider } from "@stlite/kernel";
 
 import ThemedApp from "streamlit-browser/src/ThemedApp";
 import { Client as Styletron } from "styletron-engine-atomic";

diff --git a/packages/kernel/package.json b/packages/kernel/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@stlite/stlite-kernel",
+  "name": "@stlite/kernel",
   "description": "",
   "version": "0.8.0",
   "license": "Apache-2.0",

diff --git a/packages/mountable/package.json b/packages/mountable/package.json
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@babel/core": "7.12.3",
     "@pmmmwh/react-refresh-webpack-plugin": "0.4.3",
-    "@stlite/stlite-kernel": "^0.8.0",
+    "@stlite/kernel": "^0.8.0",
     "@svgr/webpack": "5.5.0",
     "@testing-library/react": "^11.2.7",
     "@testing-library/user-event": "^13.1.9",

diff --git a/packages/mountable/src/App.tsx b/packages/mountable/src/App.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { StliteKernel, StliteKernelProvider } from "@stlite/stlite-kernel";
+import { StliteKernel, StliteKernelProvider } from "@stlite/kernel";
 
 import ThemedApp from "streamlit-browser/src/ThemedApp";
 import { Client as Styletron } from "styletron-engine-atomic";

diff --git a/packages/mountable/src/index.tsx b/packages/mountable/src/index.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import ReactDOM from "react-dom";
 import App from "./App";
-import { StliteKernel } from "@stlite/stlite-kernel";
+import { StliteKernel } from "@stlite/kernel";
 import { getParentUrl } from "./url";
 import { canonicalizeMountOptions, MountOptions } from "./options";
 

diff --git a/packages/mountable/src/options.ts b/packages/mountable/src/options.ts
@@ -1,4 +1,4 @@
-import { StliteKernelOptions } from "@stlite/stlite-kernel";
+import { StliteKernelOptions } from "@stlite/kernel";
 
 type SimplifiedFiles = Record<string, string | ArrayBufferView>;
 export interface SimplifiedStliteKernelOptions {

diff --git a/packages/playground/package.json b/packages/playground/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@craco/craco": "^6.1.2",
     "@monaco-editor/react": "^4.4.5",
-    "@stlite/stlite-kernel": "^0.8.0",
+    "@stlite/kernel": "^0.8.0",
     "@testing-library/react": "^11.2.7",
     "@testing-library/user-event": "^13.1.9",
     "@types/jest": "^26.0.19",

diff --git a/packages/playground/src/App.tsx b/packages/playground/src/App.tsx
@@ -8,7 +8,7 @@ import {
   StliteKernel,
   StliteKernelOptions,
   StliteKernelProvider,
-} from "@stlite/stlite-kernel";
+} from "@stlite/kernel";
 
 import { Id as ToastId, Slide, toast } from "react-toastify";
 

diff --git a/packages/sharing/package.json b/packages/sharing/package.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "@craco/craco": "^6.1.2",
     "@stlite/sharing-common": "^0.8.0",
-    "@stlite/stlite-kernel": "^0.8.0",
+    "@stlite/kernel": "^0.8.0",
     "@testing-library/react": "^11.2.7",
     "@testing-library/user-event": "^13.1.9",
     "@types/jest": "^26.0.19",

diff --git a/packages/sharing/src/App.tsx b/packages/sharing/src/App.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react";
-import { StliteKernel, StliteKernelOptions } from "@stlite/stlite-kernel";
+import { StliteKernel, StliteKernelOptions } from "@stlite/kernel";
 import {
   AppData,
   extractAppDataFromUrl,

diff --git a/packages/sharing/src/StreamlitApp.tsx b/packages/sharing/src/StreamlitApp.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { StliteKernel, StliteKernelProvider } from "@stlite/stlite-kernel";
+import { StliteKernel, StliteKernelProvider } from "@stlite/kernel";
 
 import ThemedApp from "streamlit-browser/src/ThemedApp";
 import { Client as Styletron } from "styletron-engine-atomic";

diff --git a/packages/toy-app/package.json b/packages/toy-app/package.json
@@ -3,7 +3,7 @@
   "version": "0.8.0",
   "private": true,
   "dependencies": {
-    "@stlite/stlite-kernel": "^0.8.0",
+    "@stlite/kernel": "^0.8.0",
     "@testing-library/react": "^11.2.7",
     "@testing-library/user-event": "^13.1.9",
     "@types/jest": "^26.0.19",

diff --git a/packages/toy-app/src/App.tsx b/packages/toy-app/src/App.tsx
@@ -5,7 +5,7 @@ import {
   StliteKernel,
   ConnectionManager,
   ConnectionState,
-} from "@stlite/stlite-kernel";
+} from "@stlite/kernel";
 import { BackMsg } from "streamlit-browser/src/autogen/proto";
 
 function App() {

diff --git a/streamlit b/streamlit