Skip to content

Commit 5496019

Browse files
authored
feat: Logging cleanup demos (#577)
1 parent 6807df6 commit 5496019

File tree

42 files changed

+105
-151
lines changed

Some content is hidden

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

42 files changed

+105
-151
lines changed

demos/angular-supabase-todolist/angular.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"customWebpackConfig": {
2121
"path": "./extra-webpack.config.js"
2222
},
23-
"allowedCommonJsDependencies": ["js-logger", "ws"],
23+
"allowedCommonJsDependencies": ["ws"],
2424
"outputPath": "dist",
2525
"index": "src/index.html",
2626
"main": "src/main.ts",

demos/django-react-native-todolist/app/index.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import { ActivityIndicator, View } from 'react-native';
33
import { router } from 'expo-router';
4-
import Logger from 'js-logger';
4+
import { createBaseLogger, LogLevel } from '@powersync/react-native';
55
/**
66
* This is the entry point when the app loads.
77
* Checks for a Supabase session.
@@ -10,8 +10,9 @@ import Logger from 'js-logger';
1010
*/
1111
const App = () => {
1212
React.useEffect(() => {
13-
Logger.useDefaults();
14-
Logger.setLevel(Logger.DEBUG);
13+
const logger = createBaseLogger();
14+
logger.useDefaults();
15+
logger.setLevel(LogLevel.DEBUG);
1516

1617
setImmediate(() => router.replace('signin'));
1718
}, []);

demos/django-react-native-todolist/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
"expo-router": "4.0.20",
2929
"expo-splash-screen": "~0.29.22",
3030
"expo-status-bar": "~2.0.1",
31-
"js-logger": "^1.6.1",
3231
"lodash": "^4.17.21",
3332
"react": "18.3.1",
3433
"react-native": "0.76.9",

demos/example-capacitor/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"@journeyapps/wa-sqlite": "^1.2.0",
2727
"@powersync/react": "workspace:*",
2828
"@powersync/web": "workspace:*",
29-
"js-logger": "^1.6.1",
3029
"react": "^18.2.0",
3130
"react-dom": "^18.2.0",
3231
"react-router-dom": "^6.23.0"

demos/example-capacitor/src/components/providers/SystemProvider.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { PowerSyncContext } from '@powersync/react';
2-
import { PowerSyncDatabase } from '@powersync/web';
2+
import { PowerSyncDatabase, createBaseLogger, LogLevel } from '@powersync/web';
33
import { CircularProgress } from '@mui/material';
4-
import Logger from 'js-logger';
54
import React, { Suspense } from 'react';
65
import { AppSchema } from '../../library/powersync/AppSchema.js';
76
import { BackendConnector } from '../../library/powersync/BackendConnector.js';
87
import { Capacitor } from '@capacitor/core';
98

10-
Logger.useDefaults();
11-
Logger.setLevel(Logger.DEBUG);
9+
const logger = createBaseLogger();
10+
logger.useDefaults();
11+
logger.setLevel(LogLevel.DEBUG);
1212

1313
const platform = Capacitor.getPlatform();
1414
const isIOs = platform === 'ios';

demos/example-capacitor/vite.config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export default defineConfig({
1919
// https://github.com/vitejs/vite/issues/11672#issuecomment-1415820673
2020
exclude: ['@journeyapps/wa-sqlite', '@powersync/web'],
2121
include: []
22-
// include: ['@powersync/web > js-logger'], // <-- Include `js-logger` when it isn't installed and imported.
2322
},
2423
plugins: [wasm(), topLevelAwait()],
2524
worker: {

demos/example-electron-node/src/main/index.ts

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
import fs from 'node:fs';
22
import { Worker } from 'node:worker_threads';
33

4-
import { PowerSyncDatabase, SyncStreamConnectionMethod } from '@powersync/node';
4+
import {
5+
createBaseLogger,
6+
createLogger,
7+
LogLevel,
8+
PowerSyncDatabase,
9+
SyncStreamConnectionMethod
10+
} from '@powersync/node';
511
import { app, BrowserWindow, ipcMain, MessagePortMain } from 'electron';
612
import { AppSchema, BackendConnector } from './powersync';
7-
import { default as Logger } from 'js-logger';
813

9-
const logger = Logger.get('PowerSyncDemo');
10-
Logger.useDefaults({ defaultLevel: logger.WARN });
14+
const baseLogger = createBaseLogger();
15+
baseLogger.useDefaults({ defaultLevel: LogLevel.WARN });
16+
17+
const logger = createLogger('PowerSyncDemo');
1118

1219
// This allows TypeScript to pick up the magic constants that's auto-generated by Forge's Webpack
1320
// plugin that tells the Electron app where to look for the Webpack-bundled app code (depending on
@@ -71,7 +78,7 @@ app.whenReady().then(() => {
7178
const unregister = database.registerListener({
7279
statusChanged(status) {
7380
port.postMessage(status.toJSON());
74-
},
81+
}
7582
});
7683
port.once('close', unregister);
7784
};
@@ -80,31 +87,36 @@ app.whenReady().then(() => {
8087
const abort = new AbortController();
8188
port.once('close', () => abort.abort());
8289

83-
database.watchWithCallback(sql, args, {
84-
onResult(results) {
85-
port.postMessage(results.rows._array);
86-
},
87-
onError(error) {
88-
console.error(`Watch ${sql} with ${args} failed`, error);
90+
database.watchWithCallback(
91+
sql,
92+
args,
93+
{
94+
onResult(results) {
95+
port.postMessage(results.rows._array);
96+
},
97+
onError(error) {
98+
console.error(`Watch ${sql} with ${args} failed`, error);
99+
}
89100
},
90-
}, {signal: abort.signal});
101+
{ signal: abort.signal }
102+
);
91103
};
92104

93105
ipcMain.on('port', (portEvent) => {
94106
const [port] = portEvent.ports;
95107
port.start();
96108

97109
port.on('message', (event) => {
98-
const {method, payload} = event.data;
110+
const { method, payload } = event.data;
99111
switch (method) {
100112
case 'syncStatus':
101113
forwardSyncStatus(port);
102114
break;
103115
case 'watch':
104-
const {sql, args} = payload;
116+
const { sql, args } = payload;
105117
forwardWatchResults(sql, args, port);
106118
break;
107-
};
119+
}
108120
});
109121
});
110122

demos/example-electron/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"@powersync/react": "workspace:*",
3030
"@powersync/web": "workspace:*",
3131
"electron-squirrel-startup": "^1.0.0",
32-
"js-logger": "^1.6.1",
3332
"react": "^18.2.0",
3433
"react-dom": "^18.2.0",
3534
"react-router-dom": "^6.23.0"

demos/example-electron/src/components/providers/SystemProvider.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { PowerSyncContext } from '@powersync/react';
2-
import { PowerSyncDatabase } from '@powersync/web';
2+
import { createBaseLogger, LogLevel, PowerSyncDatabase } from '@powersync/web';
33
import { CircularProgress } from '@mui/material';
4-
import Logger from 'js-logger';
54
import React, { Suspense } from 'react';
65
import { AppSchema } from '../../library/powersync/AppSchema.js';
76
import { BackendConnector } from '../../library/powersync/BackendConnector.js';
87

9-
Logger.useDefaults();
10-
Logger.setLevel(Logger.DEBUG);
8+
const logger = createBaseLogger();
9+
logger.useDefaults();
10+
logger.setLevel(LogLevel.DEBUG);
1111

1212
const powerSync = new PowerSyncDatabase({
1313
database: { dbFilename: 'powersync2.db' },

demos/example-electron/vite.renderer.config.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ export default defineConfig((env) => {
2525
// Don't optimize these packages as they contain web workers and WASM files.
2626
// https://github.com/vitejs/vite/issues/11672#issuecomment-1415820673
2727
exclude: ['@journeyapps/wa-sqlite', '@powersync/web'],
28-
include: [],
29-
// include: ['@powersync/web > js-logger'], // <-- Include `js-logger` when it isn't installed and imported.
28+
include: []
3029
},
3130
plugins: [
3231
// @ts-expect-error there is TS issue that doesn't actually affect the runtime

0 commit comments

Comments
 (0)