Merge pull request #1820 from Nozbe/update-deps2

Update deps - RN0.73

.eslintrc.js

@@ -1,12 +1,17 @@
 const config = {
   env: {
     es6: true,
+    // configure globals
     jest: true,
+    browser: true,
+    commonjs: true,
+    node: true,
   },
-  plugins: ['flowtype', '@typescript-eslint'],
+  plugins: ['import', '@typescript-eslint'],
   extends: [
-    // https://github.com/airbnb/javascript
-    'airbnb',
+    'eslint:recommended',
+    'plugin:react/recommended',
+    'plugin:react-hooks/recommended',
     'plugin:flowtype/recommended',
     'prettier',
     'plugin:jest/recommended',
@@ -19,85 +24,17 @@ const config = {
     },
   },
   rules: {
-    curly: ['error', 'all'],
-    'class-methods-use-this': 'off',
-    'comma-dangle': ['error', 'always-multiline'],
     'no-console': ['error'],
-    'no-unused-expressions': 'off',
-    'no-param-reassign': [
-      'error',
-      {
-        props: false,
-      },
-    ],
-    'no-useless-escape': 'off',
-    'func-names': 'off',
-    'no-underscore-dangle': 'off',
     'no-unused-vars': [
       'error',
       {
         argsIgnorePattern: '^_',
       },
     ],
-    'no-else-return': [
-      'error',
-      {
-        allowElseIf: true,
-      },
-    ],
-    // formatting (off - formatting is Prettier's job)
-    semi: ['error', 'never'],
-    'arrow-parens': 'off',
-    'react/jsx-closing-bracket-location': 'off',
-    'react/jsx-first-prop-new-line': 'off',
-    'operator-linebreak': 'off',
-    'object-curly-newline': 'off',
-    'function-paren-newline': 'off',
-    'max-classes-per-file': 'off',
-    camelcase: 'off',
-    'react/jsx-indent': 'off',
-    quotes: 'off',
-    'react/jsx-curly-newline': 'off',
-    'lines-between-class-members': 'off',
-    'one-var': 'off',
-    'arrow-body-style': 'off',
-    // react
-    'react/prop-types': 'off',
-    'react/jsx-filename-extension': 'off',
-    'react/jsx-indent-props': ['error'],
-    'react/prefer-stateless-function': [
-      1,
-      {
-        ignorePureComponents: true,
-      },
-    ],
-    'react/jsx-boolean-value': ['error', 'always'],
-    'react/no-unused-prop-types': 'off',
-    'react/destructuring-assignment': 'off',
-    'react/jsx-one-expression-per-line': 'off',
-    'import/prefer-default-export': 'off',
-    'import/named': 'off', // doesn't seem to work with Flow
-    'import/no-extraneous-dependencies': 'off',
     'import/no-cycle': 'error',
     'jest/no-large-snapshots': 'warn',
     'jest/no-disabled-tests': 'off',
     'jest/expect-expect': 'off',
-    'global-require': 'off',
-    'no-plusplus': 'off',
-    'prefer-object-spread': 'off',
-    'react/jsx-props-no-spreading': 'off',
-    'react/jsx-no-bind': 'off',
-    'flowtype/space-after-type-colon': 'off',
-    'flowtype/generic-spacing': 'off',
-    'flowtype/delimiter-dangle': ['error', 'always-multiline'],
-    'flowtype/require-return-type': [
-      'error',
-      'always',
-      {
-        excludeArrowFunctions: true,
-        annotateUndefined: 'always',
-      },
-    ],
   },
   overrides: [
     {
@@ -112,16 +49,9 @@ const config = {
       parser: '@typescript-eslint/parser',
       rules: {
         'flowtype/no-types-missing-file-annotation': 'off',
-        'no-unused-vars': 'off',
       },
     },
   ],
-  globals: {
-    document: true,
-    window: true,
-    self: true,
-    globalThis: true,
-  },
 }
 
 module.exports = config

.flowconfig

@@ -6,8 +6,13 @@
 <PROJECT_ROOT>/react-native-copy
 <PROJECT_ROOT>/src/**/*.ts
 .*/node_modules/react\-native/.*
+.*/node_modules/@react\-native/.*
 .*/node_modules/fbjs/**
 .*/node_modules/resolve/test/resolver/**
+.*/node_modules/metro\-config/.*
+.*/node_modules/metro\-config/.*
+.*/node_modules/hermes\-estree/.*
+.*/node_modules/metro/.*
 
 [libs]
 flow-typed/

.github/workflows/ci.yml

@@ -95,8 +95,11 @@ jobs:
           # arch: x86_64
           working-directory: ./native/androidTest
           script: ./gradlew connectedAndroidTest
-      - run: yarn ktlint
+      # - run: yarn ktlint
   windows:
+    # FIXME: Windows port is unmaintained. If you're interested in sponsoring continued maintenance,
+    # please email me!
+    if: false
     runs-on: windows-2022
     name: Windows tests
     steps:

CHANGELOG-Unreleased.md

@@ -20,10 +20,12 @@
 
 ### Changes
 
+- Minimum supported Node.js version is now 18.x
 - Improved Model diagnostic errors now always contain `table#id` of offending record
 - Update `better-sqlite3` to 11.x
 - Update sqlite (used by Android in JSI mode) to 3.46.0
 - [docs] Improved Android installation docs
+- [docs] Removed examples from the codebase as they were unmaintained
 
 ### Internal
 

Gemfile

@@ -6,8 +6,9 @@ gem 'pry'
 
 # Cocoapods 1.15 introduced a bug which break the build. (RN 0.72) We will remove the upper
 # bound in the template on Cocoapods with next React Native release.
-gem 'cocoapods', '1.15.2'
-gem 'activesupport', '>= 6.1.7.3', '< 7.1.0' # temporary?
+gem 'cocoapods', '>= 1.13', '< 1.15'
+gem 'activesupport', '>= 6.1.7.5', '< 7.1.0' # temporary?
+gem 'xcodeproj', '< 1.26.0'
 
 # NOTE: TEMPORARY, for darwin-arm64 compatibility
 gem 'ffi', '>1.14.2'

Gemfile.lock

@@ -18,18 +18,18 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     base64 (0.2.0)
     claide (1.1.0)
-    cocoapods (1.15.2)
+    cocoapods (1.14.3)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.15.2)
+      cocoapods-core (= 1.14.3)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -44,7 +44,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
       xcodeproj (>= 1.23.0, < 2.0)
-    cocoapods-core (1.15.2)
+    cocoapods-core (1.14.3)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -86,31 +86,32 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.7)
-    rexml (3.2.9)
+    rexml (3.3.4)
       strscan
     ruby-macho (2.5.1)
     strscan (3.1.0)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.24.0)
+    xcodeproj (1.25.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
+      rexml (>= 3.3.2, < 4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 6.1.7.3, < 7.1.0)
-  cocoapods (= 1.15.2)
+  activesupport (>= 6.1.7.5, < 7.1.0)
+  cocoapods (>= 1.13, < 1.15)
   ethon!
   ffi (> 1.14.2)
   pry
+  xcodeproj (< 1.26.0)
 
 RUBY VERSION
    ruby 2.7.2p137

README.md

@@ -30,7 +30,7 @@
 | ⚛️ | **Optimized for React.** Easily plug data into components |
 | 🧰 | **Framework-agnostic.** Use JS API to plug into other UI frameworks |
 | ⏱ | **Fast.** And getting faster with every release! |
-| ✅ | **Proven.** Powers [Nozbe Teams](https://nozbe.com/teams) since 2017 (and [many others](#who-uses-watermelondb)) |
+| ✅ | **Proven.** Powers [Nozbe](https://nozbe.com/teams) since 2017 (and [many others](#who-uses-watermelondb)) |
 | ✨ | **Reactive.** (Optional) [RxJS](https://github.com/ReactiveX/rxjs) API |
 | 🔗 | **Relational.** Built on rock-solid [SQLite](https://www.sqlite.org) foundation |
 | ⚠️ | **Static typing** with [Flow](https://flow.org) or [TypeScript](https://typescriptlang.org) |
@@ -47,9 +47,9 @@ Watermelon fixes it **by being lazy**. Nothing is loaded until it's requested. A
 
 But unlike using SQLite directly, Watermelon is **fully observable**. So whenever you change a record, all UI that depends on it will automatically re-render. For example, completing a task in a to-do app will re-render the task component, the list (to reorder), and all relevant task counters. [**Learn more**](https://www.youtube.com/watch?v=UlZ1QnFF4Cw).
 
-| <a href="https://www.youtube.com/watch?v=UlZ1QnFF4Cw"><img src="https://github.com/Nozbe/WatermelonDB/raw/master/assets/watermelon-talk-thumbnail.jpg" alt="React Native EU: Next-generation React Databases" width="300" /></a> | <a href="https://watermelondb.now.sh/"><img src="https://github.com/Nozbe/WatermelonDB/raw/master/assets/watermelon-demo-thumbnail.png" alt="WatermelonDB Demo" width="300" /></a> |
+| <a href="https://www.youtube.com/watch?v=UlZ1QnFF4Cw"><img src="https://github.com/Nozbe/WatermelonDB/raw/master/assets/watermelon-talk-thumbnail.jpg" alt="React Native EU: Next-generation React Databases" width="300" /></a> |
 | ---- | --- |
-| <p align="center"><a href="https://www.youtube.com/watch?v=UlZ1QnFF4Cw">📺 <strong>Next-generation React databases</strong><br/>(a talk about WatermelonDB)</a></p> | <p align="center"><a href="https://watermelondb.now.sh/">✨ <strong>Check out web Demo</strong></a></p> |
+| <p align="center"><a href="https://www.youtube.com/watch?v=UlZ1QnFF4Cw">📺 <strong>Next-generation React databases</strong><br/>(a talk about WatermelonDB)</a></p> |
 
 ## Usage
 

docs-website/docs/docs/Implementation/Publishing.md

@@ -30,29 +30,3 @@ npm run release --skip-checks
 ```
 
 Don't use `yarn release` (or `yarn publish`) — it won't work (yarn doesn't support NPM 2FA).
-
-### Step 5: Update demo/example code
-
-```bash
-cd examples/native
-yarn upgrade-interactive --latest
-yarn dev
-yarn start:ios
-yarn start:android
-```
-
-web:
-
-```bash
-cd ../web
-yarn upgrade-interactive --latest
-yarn dev
-# check out if web works
-```
-
-Then deploy updated web demo:
-
-```bash
-now
-now alias watermelondb-xxxxxxxxx.now.sh watermelondb
-```

docs-website/docs/docs/Installation.mdx

@@ -34,7 +34,7 @@ npm install @nozbe/watermelondb
 
 ### iOS (React Native)
 
-At least Xcode 13.x and iOS 15 are recommended (earlier versions are not tested for compatibility).
+At least Xcode 15.x is recommended for building (earlier versions are likely to work, but not tested for compatibility).
 
 1. **Set up Babel config in your project**
 
@@ -334,7 +334,9 @@ This guide assumes you use Webpack as your bundler.
 
 ## Windows (React Native)
 
-WatermelonDB has **experimental** support for [React Native Windows](https://microsoft.github.io/react-native-windows/).
+WatermelonDB has **experimental** support for [React Native Windows](https://microsoft.github.io/react-native-windows/), added in v0.27.
+
+NOTE: As of v0.28, Windows support is not maintained due to lack of resources, minimal demand, and difficulty maintaining support over React Native upgrades. If you're interested in sponsoring Windows support, please email me.
 
 To set up:
 

docs-website/docs/docs/README.md

@@ -52,9 +52,9 @@ Watermelon fixes it **by being lazy**. Nothing is loaded until it's requested. A
 
 But unlike using SQLite directly, Watermelon is **fully observable**. So whenever you change a record, all UI that depends on it will automatically re-render. For example, completing a task in a to-do app will re-render the task component, the list (to reorder), and all relevant task counters. [**Learn more**](https://www.youtube.com/watch?v=UlZ1QnFF4Cw).
 
-| <a href="https://www.youtube.com/watch?v=UlZ1QnFF4Cw"><img src="https://github.com/Nozbe/WatermelonDB/raw/master/assets/watermelon-talk-thumbnail.jpg" alt="React Native EU: Next-generation React Databases" width="300" /></a> | <a href="https://watermelondb.now.sh/"><img src="https://github.com/Nozbe/WatermelonDB/raw/master/assets/watermelon-demo-thumbnail.png" alt="WatermelonDB Demo" width="300" /></a> |
+| <a href="https://www.youtube.com/watch?v=UlZ1QnFF4Cw"><img src="https://github.com/Nozbe/WatermelonDB/raw/master/assets/watermelon-talk-thumbnail.jpg" alt="React Native EU: Next-generation React Databases" width="300" /></a> |
 | ---- | --- |
-| <p align="center"><a href="https://www.youtube.com/watch?v=UlZ1QnFF4Cw">📺 <strong>Next-generation React databases</strong><br/>(a talk about WatermelonDB)</a></p> | <p align="center"><a href="https://watermelondb.now.sh/">✨ <strong>Check out web Demo</strong></a></p> |
+| <p align="center"><a href="https://www.youtube.com/watch?v=UlZ1QnFF4Cw">📺 <strong>Next-generation React databases</strong><br/>(a talk about WatermelonDB)</a></p> |
 
 ## Usage