Skip to content

Commit 056cf87

Browse files
LucDeCafLucDeCaf
committed
Merge branch 'isolate-demos' into 'chore/migrate-powerchat-demo' and resolve conflicts
2 parents f21dacd + 1c251e9 commit 056cf87

File tree

83 files changed

+69071
-35752
lines changed

Some content is hidden

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

83 files changed

+69071
-35752
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ dist
99
# Useful if running repository in VSCode dev container
1010
.pnpm-store
1111
__screenshots__
12+
# Backups should be restored before committing
13+
demos/**/package.json.bak

‎demos/angular-supabase-todolist/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@angular/router": "^19.2.4",
2525
"@angular/service-worker": "^19.2.4",
2626
"@journeyapps/wa-sqlite": "^1.3.2",
27-
"@powersync/web": "workspace:*",
27+
"@powersync/web": "^1.29.1",
2828
"@supabase/supabase-js": "^2.44.4",
2929
"rxjs": "~7.8.1",
3030
"tslib": "^2.6.3",

‎demos/angular-supabase-todolist/pnpm-workspace.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
packages:
2+
- .

‎demos/django-react-native-todolist/.npmrc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
@journeyapps:registry=https://registry.npmjs.org/
1+
@journeyapps:registry=https://registry.npmjs.org/
2+
node-linker=hoisted

‎demos/django-react-native-todolist/ios/Podfile.lock‎

Lines changed: 235 additions & 235 deletions
Large diffs are not rendered by default.

‎demos/django-react-native-todolist/ios/powersyncexample.xcodeproj/project.pbxproj‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -278,25 +278,25 @@
278278
"${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/ExpoConstants_privacy.bundle",
279279
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoFileSystem/ExpoFileSystem_privacy.bundle",
280280
"${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly/RCT-Folly_privacy.bundle",
281-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
282-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
283-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf",
284-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/Feather.ttf",
285-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf",
286-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf",
287-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf",
288-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf",
289-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/FontAwesome6_Brands.ttf",
290-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/FontAwesome6_Regular.ttf",
291-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/FontAwesome6_Solid.ttf",
292-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf",
293-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf",
294-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf",
295-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf",
296-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf",
297-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf",
298-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
299-
"${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
281+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
282+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
283+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf",
284+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf",
285+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf",
286+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf",
287+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf",
288+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf",
289+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome6_Brands.ttf",
290+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome6_Regular.ttf",
291+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome6_Solid.ttf",
292+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf",
293+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf",
294+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf",
295+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf",
296+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf",
297+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf",
298+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
299+
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
300300
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
301301
"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
302302
"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
@@ -489,7 +489,7 @@
489489
"$(inherited)",
490490
" ",
491491
);
492-
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
492+
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
493493
SDKROOT = iphoneos;
494494
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
495495
USE_HERMES = true;
@@ -544,7 +544,7 @@
544544
"$(inherited)",
545545
" ",
546546
);
547-
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
547+
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
548548
SDKROOT = iphoneos;
549549
USE_HERMES = true;
550550
VALIDATE_PRODUCT = YES;

‎demos/django-react-native-todolist/metro.config.js‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,14 @@ const path = require('node:path');
44

55
// Find the project and workspace directories
66
const projectRoot = __dirname;
7-
const workspaceRoot = path.resolve(projectRoot, '../..');
8-
97
const config = getDefaultConfig(projectRoot);
108

119
// 1. Watch all files within the monorepo
12-
config.watchFolders = [workspaceRoot];
10+
config.watchFolders = [projectRoot];
1311
// 2. Let Metro know where to resolve packages and in what order
14-
config.resolver.nodeModulesPaths = [
15-
path.resolve(projectRoot, 'node_modules'),
16-
path.resolve(workspaceRoot, 'node_modules')
17-
];
12+
config.resolver.nodeModulesPaths = [path.resolve(projectRoot, 'node_modules')];
1813
// #3 - Force resolving nested modules to the folders below
19-
config.resolver.disableHierarchicalLookup = true;
20-
config.resolver.unstable_enableSymlinks = true;
14+
// config.resolver.disableHierarchicalLookup = true;
15+
// config.resolver.unstable_enableSymlinks = true;
2116

2217
module.exports = config;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
"@expo/metro-runtime": "^4.0.1",
1313
"@expo/vector-icons": "^14.0.0",
1414
"@journeyapps/react-native-quick-sqlite": "^2.4.9",
15-
"@powersync/common": "workspace:*",
16-
"@powersync/react": "workspace:*",
17-
"@powersync/react-native": "workspace:*",
15+
"@powersync/common": "^1.43.1",
16+
"@powersync/react": "^1.8.2",
17+
"@powersync/react-native": "^1.27.1",
1818
"@react-native-community/async-storage": "^1.12.1",
1919
"@react-native-community/masked-view": "^0.1.11",
2020
"@react-navigation/drawer": "^7.1.1",

0 commit comments

Comments
 (0)