Skip to content

Commit d0ba0b0

Browse files
committed
Working build
1 parent 2fe50bb commit d0ba0b0

File tree

7 files changed

+63
-32
lines changed

7 files changed

+63
-32
lines changed

package-lock.json

Lines changed: 32 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
{
22
"name": "jderobot-ide-interface",
3-
"version": "0.1.0",
3+
"version": "0.1.1",
44
"main": "dist/main.js",
55
"typings": "dist/index.d.ts",
6-
"files": ["dist"],
6+
"files": [
7+
"dist"
8+
],
79
"scripts": {
810
"test": "echo \"Error: no test specified\" && exit 1",
911
"storybook": "storybook dev -p 6006",
@@ -48,6 +50,7 @@
4850
"re-resizable": "^6.11.2",
4951
"react-spinners": "^0.17.0",
5052
"sass-loader": "^16.0.5",
53+
"ts-loader": "^9.5.2",
5154
"tsconfig-paths-webpack-plugin": "^4.2.0",
5255
"webpack-bundle-tracker": "^3.2.1"
5356
}

src/components/FileEditor/TextEditor.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ const FileEditor = ({
261261
onChange={(newContent: any) => {
262262
setFileContent(newContent);
263263
}}
264+
// @ts-ignore
264265
options={editorOptions}
265266
beforeMount={handleEditorDidMount}
266267
onMount={handleEditorMount}

src/components/FileEditor/extras.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Monaco } from "@monaco-editor/react";
22
import { my_snippets, Snippet } from "./snippets";
33
import {CommsManager} from "jderobot-commsmanager";
4+
import { ignoreSsrWarning } from "storybook/internal/theming";
45

56
interface Position {
67
lineNumber: number;
@@ -36,6 +37,7 @@ export const monacoEditorSnippet = (monaco: Monaco, manager: CommsManager| null)
3637
// Register a completion item provider for the new language
3738
monaco.languages.registerCompletionItemProvider("python", {
3839
triggerCharacters: [".", "("],
40+
// @ts-ignore
3941
provideCompletionItems: async (model: any, position: Position) => {
4042
lock = true;
4143

src/utils/themeProvider.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ const defaultTheme: Theme = {
3535
const ThemeContext = createContext(defaultTheme)
3636
export const useTheme = () => useContext(ThemeContext) ?? defaultTheme
3737

38-
export const ThemeProvider: React.FC<ThemeProviderProps> = (props) => {
38+
export const ThemeProvider = ({theme, children}:ThemeProviderProps) => {
3939
return (
40-
<ThemeContext.Provider value={merge(defaultTheme, props.theme)}>
41-
{props.children}
40+
<ThemeContext.Provider value={merge(defaultTheme, theme)}>
41+
{children}
4242
</ThemeContext.Provider>
4343
)
4444
}

tsconfig.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
"moduleResolution": "node",
2222
"baseUrl": "./",
2323
"declaration": true,
24-
"emitDeclarationOnly": true,
2524
"outDir": "./dist",
26-
"declarationDir": "types",
2725
"esModuleInterop": true,
2826
"forceConsistentCasingInFileNames": true,
2927
"strict": true,
@@ -32,10 +30,12 @@
3230
"noFallthroughCasesInSwitch": true,
3331
"resolveJsonModule": true,
3432
"isolatedModules": true,
35-
"noEmit": true,
33+
"noEmit": false,
34+
"emitDeclarationOnly": false
3635
},
3736
"include": [
3837
"src",
3938
"svg.d.ts"
4039
]
41-
}
40+
}
41+

webpack.config.js

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,14 @@ module.exports = {
2424
},
2525
resolve: {
2626
alias: aliases(),
27-
extensions: [".js", ".jsx",".ts", ".tsx", ".json"],
27+
extensions: [".js", ".jsx", ".ts", ".tsx", ".json"],
2828
modules: ["node_modules", path.resolve(__dirname, "node_modules")],
2929
},
3030
module: {
3131
rules: [
3232
{
3333
test: /\.css$/,
34-
use: [
35-
'style-loader',
36-
'css-loader'
37-
]
34+
use: ["style-loader", "css-loader"],
3835
},
3936
{
4037
test: /\.(js|jsx|ts|tsx)$/,
@@ -52,23 +49,29 @@ module.exports = {
5249
},
5350
],
5451
},
52+
{
53+
test: /\.tsx?$/,
54+
use: "ts-loader",
55+
exclude: /node_modules/,
56+
},
5557
{
5658
test: /\.(png|jpg|gif)$/,
5759
type: "asset/resource",
5860
},
5961
{
6062
test: /\.svg$/i,
6163
issuer: /\.[jt]sx?$/,
62-
use: [{
63-
loader: '@svgr/webpack',
64-
options: {
65-
svgoConfig: {
66-
plugins: [
67-
{ name: 'preset-default', removeViewBox: false },
68-
],
64+
use: [
65+
{
66+
loader: "@svgr/webpack",
67+
options: {
68+
svgoConfig: {
69+
plugins: [{ name: "preset-default", removeViewBox: false }],
70+
},
6971
},
7072
},
71-
}, 'file-loader']
73+
"file-loader",
74+
],
7275
},
7376
],
7477
},

0 commit comments

Comments
 (0)