Skip to content

Commit 9e3a982

Browse files
committed
Merge origin
2 parents 9b563dd + 99d8bff commit 9e3a982

File tree

440 files changed

+3909
-3186
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

440 files changed

+3909
-3186
lines changed

.eslintrc.json

+15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
{
22
"extends": ["@excalidraw/eslint-config", "react-app"],
33
"rules": {
4+
"import/order": [
5+
"warn",
6+
{
7+
"groups": ["builtin", "external", "internal", "parent", "sibling", "index", "object", "type"],
8+
"pathGroups": [
9+
{
10+
"pattern": "@excalidraw/**",
11+
"group": "external",
12+
"position": "after"
13+
}
14+
],
15+
"newlines-between": "always-and-inside-groups",
16+
"warnOnUnassignedImports": true
17+
}
18+
],
419
"import/no-anonymous-default-export": "off",
520
"no-restricted-globals": "off",
621
"@typescript-eslint/consistent-type-imports": [

dev-docs/docs/@excalidraw/excalidraw/development.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ To start the example app using the `@excalidraw/excalidraw` package, follow the
2424

2525
[http://localhost:3001](http://localhost:3001) will open in your default browser.
2626

27-
This is the same example as the [CodeSandbox](https://codesandbox.io/p/sandbox/github/excalidraw/excalidraw/tree/mrazator/release-v18/examples/with-script-in-browser) example.
27+
This is the same example as the [CodeSandbox](https://codesandbox.io/p/sandbox/github/excalidraw/excalidraw/tree/master/examples/with-script-in-browser) example.
2828

2929
## Releasing
3030

dev-docs/docs/@excalidraw/excalidraw/installation.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ Excalidraw takes _100%_ of `width` and `height` of the containing block so make
5252

5353
## Demo
5454

55-
Go to [CodeSandbox](https://codesandbox.io/p/sandbox/github/excalidraw/excalidraw/tree/mrazator/release-v18/examples/with-script-in-browser) example.
55+
Go to [CodeSandbox](https://codesandbox.io/p/sandbox/github/excalidraw/excalidraw/tree/master/examples/with-script-in-browser) example.

dev-docs/docs/@excalidraw/excalidraw/integration.mdx

+3-3
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ If you are using `pages router` then importing the wrapper dynamically would wor
131131
{/* Link should be updated to point to the latest! */}
132132
Here is a [source code](https://github.com/excalidraw/excalidraw/tree/master/examples/with-nextjs) for the example with app and pages router. You you can try it out [here](https://excalidraw-package-example-with-nextjs.vercel.app/).
133133

134-
The `types` are available at `@excalidraw/excalidraw/types`, check [CodeSandbox](https://codesandbox.io/p/sandbox/github/excalidraw/excalidraw/tree/mrazator/release-v18/examples/with-script-in-browser) example for details.
134+
The `types` are available at `@excalidraw/excalidraw/types`, check [CodeSandbox](https://codesandbox.io/p/sandbox/github/excalidraw/excalidraw/tree/master/examples/with-script-in-browser) example for details.
135135

136136
### Preact
137137

@@ -206,7 +206,7 @@ import TabItem from "@theme/TabItem";
206206

207207
```js showLineNumbers
208208
// See https://www.npmjs.com/package/@excalidraw/excalidraw documentation.
209-
import * as ExcalidrawLib from 'https://esm.sh/@excalidraw/[email protected]-rc.1/dist/dev/index.js?external=react,react-dom';
209+
import * as ExcalidrawLib from 'https://esm.sh/@excalidraw/[email protected]/dist/dev/index.js?external=react,react-dom';
210210
import React from "https://esm.sh/[email protected]";
211211
import ReactDOM from "https://esm.sh/[email protected]"
212212

@@ -235,4 +235,4 @@ root.render(React.createElement(App));
235235
</TabItem>
236236
</Tabs>
237237

238-
You can try it out [here](https://jsfiddle.net/64y130L8/1/).
238+
You can try it out [here](https://jsfiddle.net/vfn6dm14/3/).

dev-docs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@docusaurus/core": "2.2.0",
1919
"@docusaurus/preset-classic": "2.2.0",
2020
"@docusaurus/theme-live-codeblock": "2.2.0",
21-
"@excalidraw/excalidraw": "0.18.0-rc.5",
21+
"@excalidraw/excalidraw": "0.18.0",
2222
"@mdx-js/react": "^1.6.22",
2323
"clsx": "^1.2.1",
2424
"docusaurus-plugin-sass": "0.2.3",

dev-docs/src/components/Homepage/index.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import React from "react";
21
import clsx from "clsx";
2+
import React from "react";
3+
34
import styles from "./styles.module.css";
45

56
const FeatureList = [

dev-docs/src/components/Homepage/index.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import React from "react";
21
import clsx from "clsx";
2+
import React from "react";
3+
34
import styles from "./styles.module.css";
45

56
type FeatureItem = {

dev-docs/src/pages/index.tsx

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import React from "react";
2-
import clsx from "clsx";
3-
import Layout from "@theme/Layout";
41
import Link from "@docusaurus/Link";
52
import useDocusaurusContext from "@docusaurus/useDocusaurusContext";
6-
import styles from "./index.module.css";
73
import HomepageFeatures from "@site/src/components/Homepage";
4+
import Layout from "@theme/Layout";
5+
import clsx from "clsx";
6+
import React from "react";
7+
8+
import styles from "./index.module.css";
89

910
function HomepageHeader() {
1011
const { siteConfig } = useDocusaurusContext();

dev-docs/src/theme/MDXComponents.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Import the original mapper
2-
import MDXComponents from "@theme-original/MDXComponents";
32
import Highlight from "@site/src/components/Highlight";
3+
import MDXComponents from "@theme-original/MDXComponents";
44

55
export default {
66
// Re-use the default mapping

dev-docs/src/theme/ReactLiveScope/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if (ExecutionEnvironment.canUseDOM) {
1212
const Excalidraw = React.forwardRef((props, ref) => {
1313
if (!window.EXCALIDRAW_ASSET_PATH) {
1414
window.EXCALIDRAW_ASSET_PATH =
15-
"https://esm.sh/@excalidraw/[email protected]-rc.5/dist/prod/";
15+
"https://esm.sh/@excalidraw/[email protected]/dist/prod/";
1616
}
1717

1818
const { colorMode } = useColorMode();

0 commit comments

Comments
 (0)