Skip to content

Commit 8cd272e

Browse files
+ replacement for release test
1 parent e72f635 commit 8cd272e

File tree

9 files changed

+48
-46
lines changed

9 files changed

+48
-46
lines changed

README.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<div align="right">
2-
<a href="https://www.npmjs.com/package/@mismerge/core"><img src="https://img.shields.io/npm/v/%40mismerge%2Fcore?color=6a7fec&labelColor=171d27&logo=npm&logoColor=white" alt="npm"></a>
3-
<a href="https://bundlephobia.com/package/@mismerge/core"><img src="https://img.shields.io/bundlephobia/min/%40mismerge%2Fcore?color=6a7fec&labelColor=171d27&logo=javascript&logoColor=white" alt="bundle"></a>
4-
<a href="https://github.com/BearToCode/mismerge/blob/master/LICENSE"><img src="https://img.shields.io/github/license/beartocode/mismerge?color=6a7fec&labelColor=171d27&logo=git&logoColor=white" alt="license"></a>
5-
<a href="http://beartocode.github.io/mismerge/"><img src="https://img.shields.io/badge/available-red?label=demo&color=6a7fec&labelColor=171d27&logo=svelte&logoColor=white" alt="demo"></a>
2+
<a href="https://www.npmjs.com/package/@getjoystick/mismerge-core"><img src="https://img.shields.io/npm/v/%40mismerge%2Fcore?color=6a7fec&labelColor=171d27&logo=npm&logoColor=white" alt="npm"></a>
3+
<a href="https://bundlephobia.com/package/@getjoystick/mismerge-core"><img src="https://img.shields.io/bundlephobia/min/%40mismerge%2Fcore?color=6a7fec&labelColor=171d27&logo=javascript&logoColor=white" alt="bundle"></a>
4+
<a href="https://github.com/getjoystick/mismerge/blob/master/LICENSE"><img src="https://img.shields.io/github/license/getjoystick/mismerge?color=6a7fec&labelColor=171d27&logo=git&logoColor=white" alt="license"></a>
5+
<a href="http://getjoystick.github.io/mismerge/"><img src="https://img.shields.io/badge/available-red?label=demo&color=6a7fec&labelColor=171d27&logo=svelte&logoColor=white" alt="demo"></a>
66
</div>
77

8-
<img alt="banner" src="https://raw.githubusercontent.com/BearToCode/mismerge/master/images/banner-light.png#gh-light-mode-only" />
9-
<img alt="banner" src="https://raw.githubusercontent.com/BearToCode/mismerge/master/images/banner-dark.png#gh-dark-mode-only" />
8+
<img alt="banner" src="https://raw.githubusercontent.com/getjoystick/mismerge/master/images/banner-light.png#gh-light-mode-only" />
9+
<img alt="banner" src="https://raw.githubusercontent.com/getjoystick/mismerge/master/images/banner-dark.png#gh-dark-mode-only" />
1010

1111
## A web-based merge editor
1212

13-
Mismerge is a modern two-way and one-way merge editor for the web, built with Svelte. You can [visit the demo](https://beartocode.github.io/mismerge/) and start merging now, or use it as a component for your project.
13+
Mismerge is a modern two-way and one-way merge editor for the web, built with Svelte. You can [visit the demo](https://getjoystick.github.io/mismerge/) and start merging now, or use it as a component for your project.
1414

1515
## Features
1616

@@ -27,19 +27,19 @@ Mismerge is a modern two-way and one-way merge editor for the web, built with Sv
2727
## Installation
2828

2929
```
30-
npm i @mismerge/core
30+
npm i @getjoystick/mismerge-core
3131
```
3232

3333
## Usage
3434

3535
```svelte
3636
<script>
37-
import { MisMerge3 } from '@mismerge/core';
37+
import { MisMerge3 } from '@getjoystick/mismerge-core';
3838
// Core styles, required for the editor to work properly
39-
import '@mismerge/core/styles.css';
39+
import '@getjoystick/mismerge-core/styles.css';
4040
41-
import '@mismerge/core/light.css';
42-
// Or '@mismerge/core/dark.css';
41+
import '@getjoystick/mismerge-core/light.css';
42+
// Or '@getjoystick/mismerge-core/dark.css';
4343
4444
let lhs = 'foo';
4545
let ctr = 'bar';
@@ -83,7 +83,7 @@ You need to provide your own syntax highlighter. Example and demo using [Shiki-J
8383

8484
```svelte
8585
<script>
86-
import { DefaultDarkColors } from '@mismerge/core';
86+
import { DefaultDarkColors } from '@getjoystick/mismerge-core';
8787
// ...
8888
</script>
8989
@@ -92,7 +92,7 @@ You need to provide your own syntax highlighter. Example and demo using [Shiki-J
9292

9393
### Styles
9494

95-
If you want to customize the editor styles, you can copy the default [light](https://github.com/BearToCode/mismerge/blob/master/packages/core/src/lib/styles/light.css) or [dark](https://github.com/BearToCode/mismerge/blob/master/packages/core/src/lib/styles/dark.css) theme and adapt it to your need.
95+
If you want to customize the editor styles, you can copy the default [light](https://github.com/getjoystick/mismerge/blob/master/packages/core/src/lib/styles/light.css) or [dark](https://github.com/getjoystick/mismerge/blob/master/packages/core/src/lib/styles/dark.css) theme and adapt it to your need.
9696

9797
Here is a basic explanation of how the the rendered html looks like:
9898

@@ -186,7 +186,7 @@ Events:
186186
Clone the repo:
187187

188188
```
189-
git clone https://github.com/BearToCode/mismerge.git
189+
git clone https://github.com/getjoystick/mismerge.git
190190
cd mismerge
191191
```
192192

demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"vite-plugin-dynamic-import": "^1.5.0"
2525
},
2626
"dependencies": {
27-
"@mismerge/core": "file:../packages/core",
27+
"@getjoystick/mismerge-core": "file:../packages/core",
2828
"dedent": "^1.5.1"
2929
},
3030
"type": "module"

demo/src/lib/components/Footer.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
</script>
33

44
<div class="footer">
5-
<a href="https://www.npmjs.com/package/@mismerge/core">
5+
<a href="https://www.npmjs.com/package/@getjoystick/mismerge-core">
66
<iconify-icon icon="gg:npm" />
77
</a>
88

9-
<a href="https://github.com/BearToCode/mismerge">
9+
<a href="https://github.com/getjoystick/mismerge">
1010
<iconify-icon icon="ri:github-fill" />
1111
</a>
1212
</div>

demo/src/routes/+page.svelte

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
MisMerge3,
88
type EditorColors,
99
DefaultLightColors
10-
} from '@mismerge/core';
10+
} from '@getjoystick/mismerge-core';
1111
import {
1212
component,
1313
ctr,
@@ -23,14 +23,14 @@
2323
} from '$lib/stores';
2424
import { loadDynamicStylesheet } from '$lib/dynamic-css';
2525
import Toolbar from '$lib/components/Toolbar.svelte';
26-
import mismergeLightStyle from '@mismerge/core/light.css?raw';
27-
import mismergeDarkStyle from '@mismerge/core/dark.css?raw';
26+
import mismergeLightStyle from '@getjoystick/mismerge-core/light.css?raw';
27+
import mismergeDarkStyle from '@getjoystick/mismerge-core/dark.css?raw';
2828
import codeLightStyle from '$lib/styles/code-light.css?raw';
2929
import codeDarkStyle from '$lib/styles/code-dark.css?raw';
3030
import Footer from '$lib/components/Footer.svelte';
3131
3232
import '$lib/styles/styles.css';
33-
import '@mismerge/core/styles.css';
33+
import '@getjoystick/mismerge-core/styles.css';
3434
3535
let mounted = false;
3636
let unloadStylesheets: (() => void)[] = [];

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"type": "module",
44
"module": "esnext",
55
"license": "MIT",
6-
"author": "BearToCode",
6+
"author": "getjoystick",
77
"private": true,
88
"repository": {
99
"type": "git",
10-
"url": "https://github.com/BearToCode/mismerge.git"
10+
"url": "https://github.com/getjoystick/mismerge.git"
1111
},
1212
"scripts": {
1313
"core": "cd packages/core && npm run dev",

packages/core/README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<div align="right">
2-
<a href="https://www.npmjs.com/package/@mismerge/core"><img src="https://img.shields.io/npm/v/%40mismerge%2Fcore?color=6a7fec&labelColor=171d27&logo=npm&logoColor=white" alt="npm"></a>
3-
<a href="https://bundlephobia.com/package/@mismerge/core"><img src="https://img.shields.io/bundlephobia/min/%40mismerge%2Fcore?color=6a7fec&labelColor=171d27&logo=javascript&logoColor=white" alt="bundle"></a>
4-
<a href="https://github.com/BearToCode/mismerge/blob/master/LICENSE"><img src="https://img.shields.io/github/license/beartocode/mismerge?color=6a7fec&labelColor=171d27&logo=git&logoColor=white" alt="license"></a>
5-
<a href="http://beartocode.github.io/mismerge/"><img src="https://img.shields.io/badge/available-red?label=demo&color=6a7fec&labelColor=171d27&logo=svelte&logoColor=white" alt="demo"></a>
2+
<a href="https://www.npmjs.com/package/@getjoystick/mismerge-core"><img src="https://img.shields.io/npm/v/%40mismerge%2Fcore?color=6a7fec&labelColor=171d27&logo=npm&logoColor=white" alt="npm"></a>
3+
<a href="https://bundlephobia.com/package/@getjoystick/mismerge-core"><img src="https://img.shields.io/bundlephobia/min/%40mismerge%2Fcore?color=6a7fec&labelColor=171d27&logo=javascript&logoColor=white" alt="bundle"></a>
4+
<a href="https://github.com/getjoystick/mismerge/blob/master/LICENSE"><img src="https://img.shields.io/github/license/getjoystick/mismerge?color=6a7fec&labelColor=171d27&logo=git&logoColor=white" alt="license"></a>
5+
<a href="http://getjoystick.github.io/mismerge/"><img src="https://img.shields.io/badge/available-red?label=demo&color=6a7fec&labelColor=171d27&logo=svelte&logoColor=white" alt="demo"></a>
66
</div>
77

8-
<img alt="banner" src="https://raw.githubusercontent.com/BearToCode/mismerge/master/images/banner-light.png" />
8+
<img alt="banner" src="https://raw.githubusercontent.com/getjoystick/mismerge/master/images/banner-light.png" />
99

1010
## A web-based merge editor
1111

12-
Mismerge is a modern two-way and one-way merge editor for the web, built with Svelte. You can [visit the demo](https://beartocode.github.io/mismerge/) and start merging now, or use it as a component for you project.
12+
Mismerge is a modern two-way and one-way merge editor for the web, built with Svelte. You can [visit the demo](https://getjoystick.github.io/mismerge/) and start merging now, or use it as a component for you project.
1313

1414
## Features
1515

@@ -26,19 +26,19 @@ Mismerge is a modern two-way and one-way merge editor for the web, built with Sv
2626
## Installation
2727

2828
```
29-
npm i @mismerge/core
29+
npm i @getjoystick/mismerge-core
3030
```
3131

3232
## Usage
3333

3434
```svelte
3535
<script>
36-
import { MisMerge3 } from '@mismerge/core';
36+
import { MisMerge3 } from '@getjoystick/mismerge-core';
3737
// Core styles, required for the editor to work properly
38-
import '@mismerge/core/styles.css';
38+
import '@getjoystick/mismerge-core/styles.css';
3939
40-
import '@mismerge/core/light.css';
41-
// Or '@mismerge/core/dark.css';
40+
import '@getjoystick/mismerge-core/light.css';
41+
// Or '@getjoystick/mismerge-core/dark.css';
4242
4343
let lhs = 'foo';
4444
let ctr = 'bar';
@@ -82,7 +82,7 @@ You need to provide your own syntax highlighter. Example and demo using [Shiki-J
8282

8383
```svelte
8484
<script>
85-
import { DefaultDarkColors } from '@mismerge/core';
85+
import { DefaultDarkColors } from '@getjoystick/mismerge-core';
8686
// ...
8787
</script>
8888
@@ -91,7 +91,7 @@ You need to provide your own syntax highlighter. Example and demo using [Shiki-J
9191

9292
### Styles
9393

94-
If you want to customize the editor styles, you can copy the default [light](https://github.com/BearToCode/mismerge/blob/master/packages/core/src/lib/styles/light.css) or [dark](https://github.com/BearToCode/mismerge/blob/master/packages/core/src/lib/styles/dark.css) theme and adapt it to your need.
94+
If you want to customize the editor styles, you can copy the default [light](https://github.com/getjoystick/mismerge/blob/master/packages/core/src/lib/styles/light.css) or [dark](https://github.com/getjoystick/mismerge/blob/master/packages/core/src/lib/styles/dark.css) theme and adapt it to your need.
9595

9696
Here is a basic explanation of how the the rendered html looks like:
9797

@@ -185,7 +185,7 @@ Events:
185185
Clone the repo:
186186

187187
```
188-
git clone https://github.com/BearToCode/mismerge.git
188+
git clone https://github.com/getjoystick/mismerge.git
189189
cd mismerge
190190
```
191191

packages/core/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"name": "@mismerge/core",
2+
"name": "@getjoystick/mismerge-core",
33
"version": "0.0.1",
44
"description": "A modern merge editor for the Web",
55
"license": "MIT",
66
"repository": {
77
"type": "git",
8-
"url": "https://github.com/BearToCode/mismerge.git"
8+
"url": "https://github.com/getjoystick/mismerge.git"
99
},
10-
"author": "BearToCode",
10+
"author": "getjoystick",
1111
"scripts": {
1212
"dev": "vite dev",
1313
"build": "vite build && npm run package",
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
export const browser = typeof window !== 'undefined';
2-
export const dev = process.env.NODE_ENV !== 'production';
1+
import { DEV, BROWSER } from 'esm-env';
2+
3+
export const browser = BROWSER;
4+
export const dev = DEV;

0 commit comments

Comments
 (0)