Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/build update #30

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ LLMLOG.md
.turbo/
**/*/.turbo
tsconfig.tsbuildinfo
dist/
55 changes: 35 additions & 20 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "jest.config.js",
"scripts": {
"build": "turbo run build",
"build:package": "turbo run build:package --filter=@open-rpc/logs-react^... --filter=@open-rpc/inspector^...",
"build:package": "turbo run build:package --filter=@open-rpc/monaco-editor-react --filter=@open-rpc/docs-react --filter=@open-rpc/logs-react --filter=@open-rpc/inspector --filter=@open-rpc/playground",
"test": "turbo run test",
"lint": "turbo run lint",
"watch": "turbo run build test --watch",
Expand Down
4 changes: 0 additions & 4 deletions packages/docs-react/.turbo/turbo-build.log

This file was deleted.

1 change: 1 addition & 0 deletions packages/docs-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"scripts": {
"lint": "eslint 'src/**/*.{ts,tsx}'",
"build": "tsc --project tsconfig.json && cp src/ContentDescriptor/ContentDescriptor.css build/ContentDescriptor/",
"build:package": "tsc --build tsconfig.json && cp src/ContentDescriptor/ContentDescriptor.css build/ContentDescriptor/",
"test": "jest",
"start": "react-scripts start",
"clean": "rm -rf build coverage",
Expand Down
32 changes: 0 additions & 32 deletions packages/inspector/.turbo/turbo-build$colon$package.log

This file was deleted.

4 changes: 2 additions & 2 deletions packages/inspector/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"build": "rescripts build",
"lint": "eslint 'src/**/*.{ts,tsx}'",
"test": "jest",
"build:package": "tsc --build tsconfig.json",
"build:package": "tsc --build tsconfig.json && cp -r src/*.css build/",
"clean": "rm -rf build coverage",
"format": "prettier --write 'src/**/*.{ts,tsx,js,jsx,json,md}'"
},
Expand Down Expand Up @@ -57,7 +57,7 @@
"@material-ui/lab": "4.0.0-alpha.47",
"@monaco-editor/react": "^4.0.0",
"@open-rpc/client-js": "^1.6.3",
"@open-rpc/logs-react": "workspace:*",
"@open-rpc/logs-react": "*",
"@open-rpc/meta-schema": "^1.14.9",
"@open-rpc/schema-utils-js": "^1.14.3",
"@rehooks/window-size": "^1.0.2",
Expand Down
7 changes: 6 additions & 1 deletion packages/inspector/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,9 @@ import App from "./containers/App";
import "./App.css";
import "./splitpane.css";

ReactDOM.render(<App />, document.getElementById("root"));
import {default as Inspector} from "./containers/Inspector";
export default Inspector;

if (typeof document !== 'undefined') {
ReactDOM.render(<App />, document.getElementById("root"));
}
3 changes: 2 additions & 1 deletion packages/inspector/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
"include": ["src"],
"references": [
{ "path": "../logs-react" }
]
],
"include": ["src/**/*", "src/**/*.css"]
}
4 changes: 0 additions & 4 deletions packages/logs-react/.turbo/turbo-build$colon$package.log

This file was deleted.

25 changes: 0 additions & 25 deletions packages/logs-react/.turbo/turbo-build.log

This file was deleted.

12 changes: 7 additions & 5 deletions packages/logs-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
"version": "0.0.0-development",
"description": "",
"main": "build/index.js",
"module": "build/index.js",
"types": "build/index.d.ts",
"module": "build/exports.js",
"types": "build/exports.d.ts",
"exports": {
".": {
"types": "./build/index.d.ts",
"import": "./build/index.js"
"types": "./build/exports.d.ts",
"import": "./build/exports.js",
"default": "./build/exports.js",
"require": "./build/exports.js"
}
},
"homepage": "https://open-rpc.github.io/logs-react/",
Expand All @@ -21,7 +23,7 @@
"scripts": {
"start": "vite",
"build": "vite build",
"build:package": "tsc --build tsconfig.json && cp -r src/**/*.css build/",
"build:package": "tsc --build tsconfig.json && cd src && find . -name '*.css' -exec cp -v --parents -t ../build {} +",
"lint": "eslint 'src/**/*.{ts,tsx}'",
"test": "jest",
"clean": "rm -rf build coverage",
Expand Down
5 changes: 3 additions & 2 deletions packages/logs-react/src/exports.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import JSONRPCLogger, {IJSONRPCLog} from "./components/logsReact/logsReact";
export type JSONRPCLog = IJSONRPCLog;
import JSONRPCLogger from "./components/logsReact/logsReact";
export type { IJSONRPCLog as JSONRPCLog } from "./components/logsReact/logsReact";
export { JSONRPCLogger };
export default JSONRPCLogger;
17 changes: 16 additions & 1 deletion packages/logs-react/src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
import ReactDOM from "react-dom";
import React from "react";
import MyApp from "./containers/MyApp";
import JSONRPCLogger from "./components/logsReact/logsReact";

ReactDOM.render(<MyApp />, document.getElementById("root"));
// NOTE: This isn't what we want to do here, but it allows us to cross package build
//TODO: ReactDOM.render(<MyApp />, document.getElementById("root"));

import type { IJSONRPCLog } from "./components/logsReact/logsReact";

export type { IJSONRPCLog as JSONRPCLog };
export { JSONRPCLogger };
export default JSONRPCLogger;

// Keep the app rendering for development
if (typeof document !== 'undefined') {
const MyApp = require('./containers/MyApp').default;
const ReactDOM = require('react-dom');
ReactDOM.render(<MyApp />, document.getElementById("root"));
}
1 change: 0 additions & 1 deletion packages/logs-react/src/react-app-env.d.ts

This file was deleted.

8 changes: 6 additions & 2 deletions packages/logs-react/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
"compilerOptions": {
"outDir": "./build",
"rootDir": "./src",
"composite": true
"composite": true,
"paths": {
"@/*": ["./src/exports"],
"@exports": ["./src/exports"]
}
},
"include": ["src"]
"include": ["src/**/*", "src/**/*.css"]
}
14 changes: 14 additions & 0 deletions packages/monaco-editor-react/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
indent_style = space
indent_size = 2
tab_width = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
4 changes: 4 additions & 0 deletions packages/monaco-editor-react/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node_modules
build
coverage
*.tgz
1 change: 1 addition & 0 deletions packages/monaco-editor-react/.nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
18.20.5
3 changes: 3 additions & 0 deletions packages/monaco-editor-react/.releaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"tagFormat": "${version}"
}
Loading
Loading