Skip to content

Commit

Permalink
Update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
olgam4 committed Oct 1, 2022
1 parent b2aa133 commit 3c2eda6
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 62 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"postcss-import": "15.0.0",
"postcss-preset-env": "7.8.2",
"rollup": "2.79.1",
"solid-js": "1.5.6",
"solid-start": "0.1.1",
"solid-js": "1.5.7",
"solid-start": "0.1.2",
"solid-start-deno": "0.1.2",
"solid-start-static": "0.1.2",
"solid-testing-library": "0.3.0",
Expand Down
96 changes: 48 additions & 48 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 2 additions & 6 deletions src/entry-server.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
import { StartServer, createHandler, renderStream, renderSync } from 'solid-start/entry-server'
import { StartServer, createHandler, renderStream } from 'solid-start/entry-server'

const IS_TAURI = process.env.TAURI === '1'

export default createHandler(IS_TAURI ?
renderSync(event => <StartServer event={event} />)
: renderStream(event => <StartServer event={event} />))
export default createHandler(renderStream(event => <StartServer event={event} />))
10 changes: 4 additions & 6 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import deno from 'solid-start-deno'
import staticMode from 'solid-start-static'
import tsconfigPaths from 'vite-tsconfig-paths'
import { VitePWA } from 'vite-plugin-pwa'
import replace, {RollupReplaceOptions} from '@rollup/plugin-replace'
import replace, { RollupReplaceOptions } from '@rollup/plugin-replace'
import type { VitePWAOptions } from 'vite-plugin-pwa'
import AutoImport from 'unplugin-auto-import/vite'
// @ts-ignore
Expand Down Expand Up @@ -69,9 +69,7 @@ const autoImportOptions: Partial<AutoImportOptions> = {
],
}


const IS_TAURI = process.env.TAURI === '1'
console.log('IS_TAURI', IS_TAURI)
const IS_TAURI = process && process.env.TAURI === '1'

export default defineConfig({
test: {
Expand All @@ -81,8 +79,8 @@ export default defineConfig({
solid({ adapter: IS_TAURI ? staticMode() : deno() }),
tsconfigPaths(),
AutoImport(autoImportOptions),
IS_TAURI ? undefined : (() => VitePWA(pwaOptions))(),
IS_TAURI ? undefined : (() => replace(replaceOptions))(),
IS_TAURI ? undefined : VitePWA(pwaOptions),
IS_TAURI ? undefined : replace(replaceOptions),
],
build: {
target: ['esnext'],
Expand Down

0 comments on commit 3c2eda6

Please sign in to comment.