Skip to content

Commit e8a55b3

Browse files
committed
sideEffects false; material-code imports; add tscheck for demo;
1 parent ee5cabf commit e8a55b3

16 files changed

+122
-120
lines changed

.eslintrc

+17-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,23 @@
143143
"warn",
144144
"never"
145145
],
146-
"semi-style": "off"
146+
"semi-style": "off",
147+
"no-restricted-imports": [
148+
"error",
149+
{
150+
"paths": [
151+
"@mui/material",
152+
"@mui/icon-material",
153+
"@ui-schema/kit-codemirror",
154+
"@ui-schema/materia-code"
155+
],
156+
"patterns": [
157+
"@mui/*/*/*",
158+
"@ui-schema/kit-codemirror/*/*",
159+
"@ui-schema/materia-code/*/*/*"
160+
]
161+
}
162+
]
147163
}
148164
}
149165
]

package-lock.json

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+3-8
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
"doc-gen": "lerna run doc-gen",
2020
"page-index": "lerna run page-index",
2121
"dtsgen": "lerna run dtsgen",
22+
"tscheck": "lerna run tscheck",
2223
"profile": "cross-env NODE_OPTIONS='--max-old-space-size=4096' NODE_ENV=production node packerConfig.js --build --profile",
2324
"clean": "npm run clean-dist && lerna clean -y",
2425
"clean-dist": "node packerConfig.js --clean",
2526
"clean-lock": "rimraf --glob packages/*/package-lock.json",
2627
"bootstrap": "lerna bootstrap --force-local",
27-
"hoist": "lerna bootstrap --hoist -- --legacy-peer-deps",
2828
"link": "lerna link --force-local",
29-
"check": "npm run lint && npm run test",
29+
"check": "npm run lint && npm run tscheck && npm run test",
3030
"lint": "cross-env NODE_ENV=test NODE_OPTIONS=\"--max-old-space-size=8192\" eslint -c=.eslintrc --ext=.tsx,.ts --max-warnings=0 'packages'",
3131
"test": "jest -c=\"jest.config.ts\" --passWithNoTests",
3232
"tdd": "npm test -- --watch --watchman --coverage=false",
@@ -42,15 +42,10 @@
4242
"eslint-plugin-jsx-a11y": "^6.5.1",
4343
"eslint-plugin-react-hooks": "^4.3.0",
4444
"lerna": "^3.22.1",
45-
"lerna-packer": "0.10.1",
45+
"lerna-packer": "0.10.2",
4646
"merge-dirs": "^0.2.1",
4747
"sloc": "^0.2.1",
4848
"ts-node": "^10.9.2",
4949
"typescript": "~5.3.3"
50-
},
51-
"jest-runner-eslint": {
52-
"cliOptions": {
53-
"maxWarnings": 0
54-
}
5550
}
5651
}

packages/demo/package-lock.json

+9-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/demo/package.json

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"homepage": "",
77
"author": "Michael Becker <michael@bemit.codes>",
88
"license": "MIT",
9+
"scripts": {
10+
"tscheck": "tsc --noEmit"
11+
},
912
"dependencies": {
1013
"@mui/material": "^5.1",
1114
"@mui/icons-material": "^5.1",

packages/demo/src/components/Layout.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { PageHome } from '../pages/PageHome'
44
import { PageDemoWidget } from '../pages/PageDemoWidget'
55
import { PageDemoLangSelectable } from '../pages/PageDemoLangSelectable'
66
import { PageDemoComponent } from '../pages/PageDemoComponent'
7-
import { Button } from '@mui/material'
7+
import Button from '@mui/material/Button'
88
import { PageDemoComponentMui } from '../pages/PageDemoComponentMui'
99

1010
export const Layout: React.ComponentType<{ setTheme: React.Dispatch<React.SetStateAction<'dark' | 'light'>> }> = ({setTheme}) => {

packages/demo/src/pages/PageDemoComponent.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { closeBrackets, autocompletion, closeBracketsKeymap, completionKeymap }
1919
import { lintKeymap } from '@codemirror/lint'
2020
import { Compartment, EditorState } from '@codemirror/state'
2121
import { useTheme } from '@mui/material/styles'
22-
import { Button } from '@mui/material'
22+
import Button from '@mui/material/Button'
2323

2424
export const PageDemoComponent: React.ComponentType = () => {
2525
return <>

packages/demo/src/pages/PageDemoComponentMui.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { javascript } from '@codemirror/lang-javascript'
2323
import { html } from '@codemirror/lang-html'
2424
import { css } from '@codemirror/lang-css'
2525
import { MuiCodeMirrorStyleProps, useEditorTheme, useHighlightStyle } from '@ui-schema/material-code'
26-
import { useExtension } from '@ui-schema/kit-codemirror'
26+
import { useExtension } from '@ui-schema/kit-codemirror/useExtension'
2727

2828
export const PageDemoComponentMui: React.ComponentType = () => {
2929
return <>

packages/demo/tsconfig.json

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"extends": "../tsconfig.json",
3+
"include": [
4+
"src"
5+
],
6+
"compilerOptions": {
7+
"module": "ES2020",
8+
"moduleResolution": "Bundler",
9+
"outDir": "build/dts"
10+
}
11+
}

packages/kit-codemirror/package-lock.json

+21-42
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/kit-codemirror/package.json

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ui-schema/kit-codemirror",
3-
"version": "0.1.1",
3+
"version": "0.1.2",
44
"description": "CodeMirror v6 as React Component, with hooks and stuff - but only the necessities.",
55
"homepage": "https://ui-schema.bemit.codes/docs/kit-codemirror/kit-codemirror",
66
"author": {
@@ -28,25 +28,26 @@
2828
"bugs": {
2929
"url": "https://github.com/ui-schema/react-codemirror/issues"
3030
},
31+
"main": "./index.js",
32+
"module": "./esm/index.js",
33+
"types": "./index.d.ts",
34+
"scripts": {
35+
"dtsgen": "tsc -d --emitDeclarationOnly --pretty && merge-dirs build/dts build && rm -rf build/dts && rm -rf build/**/*.test.*"
36+
},
37+
"sideEffects": false,
3138
"devDependencies": {
3239
"@codemirror/state": "^6.0.0",
3340
"@codemirror/view": "^6.0.0",
34-
"@types/react": "^17.0",
35-
"react": "^17.0",
36-
"react-dom": "^17.0"
41+
"@types/react": "^18.0",
42+
"react": "^18.0",
43+
"react-dom": "^18.0"
3744
},
3845
"peerDependencies": {
3946
"@codemirror/state": "^6.0.0",
4047
"@codemirror/view": "^6.0.0",
4148
"react": "^17.0 || ^18.0",
4249
"react-dom": "^17.0 || ^18.0"
4350
},
44-
"main": "./index.js",
45-
"module": "./esm/index.js",
46-
"types": "./index.d.ts",
47-
"scripts": {
48-
"dtsgen": "tsc -d --emitDeclarationOnly --pretty && merge-dirs build/dts build && rm -rf build/dts && rm -rf build/**/*.test.*"
49-
},
5051
"publishConfig": {
5152
"access": "public"
5253
}

0 commit comments

Comments
 (0)