Skip to content

Commit 3549616

Browse files
author
Modder Me
authored
Merge pull request solidjs#119 from modderme123/master
switch to esm.sh (dev mode)
2 parents c927dec + f311b35 commit 3549616

File tree

9 files changed

+306
-316
lines changed

9 files changed

+306
-316
lines changed

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"@rollup/plugin-json": "^4.1.0",
3131
"@rollup/plugin-node-resolve": "^13.3.0",
3232
"@rollup/plugin-replace": "^4.0.0",
33+
"@solidjs/router": "^0.4.2",
3334
"@types/babel__standalone": "^7.1.4",
3435
"@types/dedent": "^0.7.0",
3536
"@types/fs-extra": "^9.0.13",
@@ -44,31 +45,30 @@
4445
"rollup-plugin-delete": "^2.0.0",
4546
"rollup-plugin-import-css": "^3.0.3",
4647
"rollup-plugin-windicss": "^1.8.7",
47-
"solid-app-router": "^0.4.1",
4848
"typescript": "^4.7.4",
49-
"vite": "^3.0.2",
49+
"vite": "^3.0.4",
5050
"vite-plugin-solid": "^2.3.0",
5151
"vite-plugin-windicss": "^1.8.7",
5252
"windicss": "^3.5.6",
53-
"workbox-cli": "^6.5.3"
53+
"workbox-cli": "^6.5.4"
5454
},
5555
"dependencies": {
5656
"@amoutonbrady/lz-string": "^0.0.1",
5757
"@babel/preset-typescript": "^7.18.6",
5858
"@babel/standalone": "^7.18.9",
59-
"@solid-primitives/media": "^2.0.0",
59+
"@solid-primitives/media": "^2.0.1",
6060
"@solid-primitives/scheduled": "^1.0.0",
61-
"babel-preset-solid": "1.4.6",
61+
"babel-preset-solid": "1.4.8",
6262
"dedent": "^0.7.0",
6363
"jszip": "^3.10.0",
6464
"monaco-editor-textmate": "^3.0.0",
6565
"monaco-textmate": "^3.0.1",
6666
"onigasm": "^2.2.5",
6767
"prettier": "^2.7.1",
68-
"rollup": "^2.77.0",
68+
"rollup": "^2.77.2",
6969
"solid-dismiss": "^1.2.1",
7070
"solid-heroicons": "^2.0.3",
71-
"solid-js": "1.4.7"
71+
"solid-js": "1.4.8"
7272
},
7373
"pnpm": {
7474
"patchedDependencies": {

playground/app.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Show, createSignal, JSX, on } from 'solid-js';
2-
import { Routes, Route, useSearchParams } from 'solid-app-router';
2+
import { Routes, Route, useSearchParams } from '@solidjs/router';
33
import { eventBus } from './utils/serviceWorker';
44
import { Update } from './components/update';
55
import { useZoom } from '../src/hooks/useZoom';

playground/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Router } from 'solid-app-router';
1+
import { Router } from '@solidjs/router';
22
import { render } from 'solid-js/web';
33
import { App } from './app';
44
import { AppContextProvider } from './context';

playground/pages/edit.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import CompilerWorker from '../../src/workers/compiler?worker';
55
import FormatterWorker from '../../src/workers/formatter?worker';
66
import onigasm from 'onigasm/lib/onigasm.wasm?url';
77
import { batch, createResource, createSignal, lazy, onCleanup, Show, Suspense } from 'solid-js';
8-
import { useMatch, useNavigate, useParams } from 'solid-app-router';
8+
import { useMatch, useNavigate, useParams } from '@solidjs/router';
99
import { API, useAppContext } from '../context';
1010
import { debounce } from '@solid-primitives/scheduled';
1111
import { defaultTabs } from '../../src';

playground/pages/home.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useLocation, useNavigate, useParams } from 'solid-app-router';
1+
import { useLocation, useNavigate, useParams } from '@solidjs/router';
22
import { Icon } from 'solid-heroicons';
33
import { eye, eyeOff, plus, x } from 'solid-heroicons/outline';
44
import { createEffect, createResource, For, Show, Suspense } from 'solid-js';

playground/pages/login.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Navigate, useSearchParams } from 'solid-app-router';
1+
import { Navigate, useSearchParams } from '@solidjs/router';
22
import { useAppContext } from '../context';
33

44
export const Login = () => {

0 commit comments

Comments
 (0)