Merge branch 'develop'

.editorconfig

@@ -13,7 +13,7 @@ tab_width = 4
 trim_trailing_whitespace = true
 ij_continuation_indent_size = 4
 
-[{*.cjs,*.js,*.ts,*.jsx,*.tsx}]
+[{*.cjs,*.js,*.mjs,*.ts,*.jsx,*.tsx}]
 max_line_length = 240
 ij_continuation_indent_size = 4
 ij_javascript_align_imports = false
@@ -34,7 +34,7 @@ ij_javascript_array_initializer_wrap = off
 ij_javascript_assignment_wrap = off
 ij_javascript_binary_operation_sign_on_next_line = false
 ij_javascript_binary_operation_wrap = off
-ij_javascript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/**
+ij_javascript_blacklist_imports = rxjs/Rx, node_modules/**, **/node_modules/**, @angular/material, @angular/material/typings/**
 ij_javascript_blank_lines_after_imports = 1
 ij_javascript_blank_lines_around_class = 1
 ij_javascript_blank_lines_around_field = 0
@@ -153,7 +153,7 @@ ij_javascript_spaces_within_brackets = false
 ij_javascript_spaces_within_catch_parentheses = false
 ij_javascript_spaces_within_for_parentheses = false
 ij_javascript_spaces_within_if_parentheses = false
-ij_javascript_spaces_within_imports = false
+ij_javascript_spaces_within_imports = true
 ij_javascript_spaces_within_interpolation_expressions = false
 ij_javascript_spaces_within_method_call_parentheses = false
 ij_javascript_spaces_within_method_parentheses = false

babel.config.json

@@ -21,6 +21,16 @@
                 "@babel/preset-env",
                 "@babel/preset-react",
                 "@babel/preset-typescript"
+            ],
+            "plugins": [
+                [
+                    "babel-plugin-replace-import-extension",
+                    {
+                        "extMapping": {
+                            ".js": ".cjs"
+                        }
+                    }
+                ]
             ]
         },
         "test": {

package.json

@@ -7,22 +7,22 @@
     "scripts": {
         "start": "npm run clean-dist && npm run serve -- demo",
         "docs": "npm run serve -- docs",
-        "serve": "cross-env NODE_ENV=development node packerConfig.js --serve",
+        "serve": "cross-env NODE_ENV=development node packerConfig.mjs --serve",
         "prebuild": "npm run clean-dist && npm run static-gen",
         "build_": "npm run build-all && npm run dtsgen",
         "build": "npm run build-babel && npm run dtsgen && npm run build-webpack",
-        "build-all": "cross-env NODE_ENV=production CI=true node packerConfig.js --build --babel --webpack",
-        "build-babel": "cross-env NODE_ENV=production CI=true node packerConfig.js --build --babel",
-        "build-webpack": "cross-env NODE_ENV=production CI=true node packerConfig.js --build --webpack",
+        "build-all": "cross-env NODE_ENV=production CI=true node packerConfig.mjs --build --babel --webpack",
+        "build-babel": "cross-env NODE_ENV=production CI=true node packerConfig.mjs --build --babel",
+        "build-webpack": "cross-env NODE_ENV=production CI=true node packerConfig.mjs --build --webpack",
         "static-gen": "npm run sitemaps && npm run doc-gen && npm run page-index",
         "sitemaps": "lerna run sitemap",
         "doc-gen": "lerna run doc-gen",
         "page-index": "lerna run page-index",
         "dtsgen": "lerna run dtsgen",
         "tscheck": "lerna run tscheck",
-        "profile": "cross-env NODE_OPTIONS='--max-old-space-size=4096' NODE_ENV=production node packerConfig.js --build --profile",
+        "profile": "cross-env NODE_OPTIONS='--max-old-space-size=4096' NODE_ENV=production node packerConfig.mjs --build --profile",
         "clean": "npm run clean-dist && lerna clean -y",
-        "clean-dist": "node packerConfig.js --clean",
+        "clean-dist": "node packerConfig.mjs --clean",
         "clean-lock": "rimraf --glob packages/*/package-lock.json",
         "bootstrap": "lerna bootstrap --force-local",
         "link": "lerna link --force-local",
@@ -38,6 +38,7 @@
     "license": "MIT",
     "devDependencies": {
         "babel-plugin-named-asset-import": "^0.3.8",
+        "babel-plugin-replace-import-extension": "^1.1.4",
         "cross-env": "^6.0.3",
         "eslint-plugin-jsx-a11y": "^6.5.1",
         "eslint-plugin-react-hooks": "^4.3.0",

packages/demo/package.json

@@ -29,8 +29,8 @@
         "@codemirror/language": "^6.1.0",
         "@ui-schema/dictionary": "~0.0.10",
         "@ui-schema/ds-material": "~0.4.0-alpha.5",
-        "@ui-schema/kit-codemirror": "~0.1.0",
-        "@ui-schema/material-code": "~0.4.3",
+        "@ui-schema/kit-codemirror": "~0.2.0",
+        "@ui-schema/material-code": "~0.4.5",
         "@ui-schema/ui-schema": "~0.4.1",
         "immutable": "^4.0.0",
         "react": "^18.0",

packages/kit-codemirror/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ui-schema/kit-codemirror",
-    "version": "0.1.2",
+    "version": "0.2.0",
     "description": "CodeMirror v6 as React Component, with hooks and stuff - but only the necessities.",
     "homepage": "https://ui-schema.bemit.codes/docs/kit-codemirror/kit-codemirror",
     "author": {
@@ -28,11 +28,24 @@
     "bugs": {
         "url": "https://github.com/ui-schema/react-codemirror/issues"
     },
-    "main": "./index.js",
-    "module": "./esm/index.js",
+    "type": "module",
+    "main": "./index.cjs",
+    "module": "./index.js",
     "types": "./index.d.ts",
+    "exports": {
+        ".": {
+            "types": "./index.d.ts",
+            "import": "./index.js",
+            "require": "./index.cjs"
+        },
+        "./*": {
+            "types": "./*/index.d.ts",
+            "import": "./*/index.js",
+            "require": "./*/index.cjs"
+        }
+    },
     "scripts": {
-        "dtsgen": "tsc -d --emitDeclarationOnly --pretty && merge-dirs build/dts build && rm -rf build/dts && rm -rf build/**/*.test.*"
+        "dtsgen": "tsc -d --emitDeclarationOnly --pretty && merge-dirs build/dts/kit-codemirror/src build && rm -rf build/dts && rm -rf build/**/*.test.*"
     },
     "sideEffects": false,
     "devDependencies": {

packages/kit-codemirror/src/CodeMirror/index.ts

@@ -1 +1 @@
-export * from './CodeMirror'
+export * from './CodeMirror.js'

packages/kit-codemirror/src/createEditorView/index.ts

@@ -1 +1 @@
-export * from './createEditorView'
+export * from './createEditorView.js'

packages/kit-codemirror/src/index.ts

@@ -1,5 +1,5 @@
-export * from './CodeMirror'
-export * from './createEditorView'
-export * from './useCodeMirror'
-export * from './useEditorClasses'
-export * from './useExtension'
+export * from './CodeMirror/index.js'
+export * from './createEditorView/index.js'
+export * from './useCodeMirror/index.js'
+export * from './useEditorClasses/index.js'
+export * from './useExtension/index.js'

packages/kit-codemirror/src/useCodeMirror/index.ts

@@ -1 +1 @@
-export * from './useCodeMirror'
+export * from './useCodeMirror.js'

packages/kit-codemirror/src/useEditorClasses/index.ts

@@ -1 +1 @@
-export * from './useEditorClasses'
+export * from './useEditorClasses.js'

packages/kit-codemirror/src/useExtension/index.ts

@@ -1 +1 @@
-export * from './useExtension'
+export * from './useExtension.js'

packages/kit-codemirror/tsconfig.json

@@ -4,6 +4,8 @@
         "src"
     ],
     "compilerOptions": {
-        "outDir": "build/dts"
+        "outDir": "build/dts",
+        "module": "Node16",
+        "moduleResolution": "Node16"
     }
 }

packages/material-code/package.json

@@ -51,7 +51,7 @@
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.0.0",
         "@codemirror/language": "^6.1.0",
-        "@ui-schema/kit-codemirror": "~0.1.0-alpha.1",
+        "@ui-schema/kit-codemirror": "~0.2.0",
         "@ui-schema/ds-material": "~0.4.0-alpha",
         "@ui-schema/ui-schema": "~0.4.0-alpha",
         "immutable": "^4.0.0",
@@ -64,7 +64,7 @@
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.0.0",
         "@codemirror/language": "^6.1.0",
-        "@ui-schema/kit-codemirror": "~0.1.0-alpha.1",
+        "@ui-schema/kit-codemirror": "~0.1.0-alpha.1 || ~0.2.0",
         "@ui-schema/ds-material": "~0.4.0-alpha",
         "@ui-schema/ui-schema": "~0.4.0-alpha",
         "immutable": "^4.0.0",

packages/tsconfig.json

@@ -1,30 +1,30 @@
 {
     "compilerOptions": {
-        "module": "esnext",
-        "target": "es2015",
+        "module": "ESNext",
+        "target": "ES2022",
         "jsx": "preserve",
         "removeComments": false,
-        "moduleResolution": "node",
+        "moduleResolution": "Bundler",
         "forceConsistentCasingInFileNames": true,
         "strict": true,
-        "noEmit": false,
         "experimentalDecorators": true,
         "baseUrl": "./",
+        "rootDir": "./",
         "allowSyntheticDefaultImports": true,
         "noErrorTruncation": true,
-        "allowJs": true,
+        "allowJs": false,
         "declaration": true,
-        "resolveJsonModule": true,
+        "resolveJsonModule": false,
         "skipLibCheck": true,
         "noUnusedLocals": true,
         "noImplicitAny": false,
         "noUnusedParameters": true,
         "paths": {
             "@ui-schema/kit-codemirror": [
-                "kit-codemirror/src"
+                "kit-codemirror/src/index.ts"
             ],
             "@ui-schema/kit-codemirror/*": [
-                "kit-codemirror/src/*"
+                "kit-codemirror/src/*/index.ts"
             ],
             "@ui-schema/material-code": [
                 "material-code/src"