Skip to content

Commit 0a6d246

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/docs/follow-redirects-1.15.4
2 parents bdcc679 + 904d1c6 commit 0a6d246

13 files changed

+85
-59
lines changed

.all-contributorsrc

+9
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,15 @@
608608
"code",
609609
"bug"
610610
]
611+
},
612+
{
613+
"login": "altynbek132",
614+
"name": "Altynbek Aidarbekov",
615+
"avatar_url": "https://avatars.githubusercontent.com/u/48729942?v=4",
616+
"profile": "https://github.com/altynbek132",
617+
"contributions": [
618+
"code"
619+
]
611620
}
612621
],
613622
"contributorsPerLine": 7,

README.md

+11-3
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,15 @@ console log, a network call to re-rendering the UI.
5656

5757
We are very thankful to our sponsors to make us part of their _Open Source Software (OSS)_ program. [[Become a sponsor](https://opencollective.com/mobx#sponsor)]
5858

59-
- [<img src="https://raw.githubusercontent.com/mobxjs/mobx.dart/master/docs/src/images/publicis-sapient-sponsor.png" height="64">](https://publicis.sapient.com)
60-
- [<img src="https://raw.githubusercontent.com/mobxjs/mobx.dart/master/docs/src/images/wunderdog-sponsor.png" height="64">](https://wunderdog.fi)
59+
- [<img src="https://raw.githubusercontent.com/mobxjs/mobx.dart/main/docs/src/images/vyuh-sponsor.png" height="64">](https://vyuh.tech)
60+
- [<img src="https://raw.githubusercontent.com/mobxjs/mobx.dart/main/docs/src/images/algolia-sponsor.png" height="64">](https://algolia.com)
6161
- [<img src="https://www.netlify.com/img/global/badges/netlify-color-bg.svg" height="64">](https://www.netlify.com)
6262

63+
### Past Sponsors
64+
65+
- [<img src="https://raw.githubusercontent.com/mobxjs/mobx.dart/main/docs/src/images/publicis-sapient-sponsor.png" height="64">](https://publicis.sapient.com)
66+
- [<img src="https://raw.githubusercontent.com/mobxjs/mobx.dart/main/docs/src/images/wunderdog-sponsor.png" height="64">](https://wunderdog.fi)
67+
6368
### Get Started
6469

6570
Follow along with the [Getting Started guide on the MobX.dart Website](https://mobx.netlify.com/getting-started).
@@ -405,7 +410,7 @@ the growing community of `MobX.dart`.
405410
## Contributors ✨
406411

407412
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
408-
[![All Contributors](https://img.shields.io/badge/all_contributors-63-orange.svg?style=flat-square)](#contributors-)
413+
[![All Contributors](https://img.shields.io/badge/all_contributors-64-orange.svg?style=flat-square)](#contributors-)
409414
<!-- ALL-CONTRIBUTORS-BADGE:END -->
410415

411416
Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
@@ -496,6 +501,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
496501
<td align="center" valign="top" width="14.28%"><a href="https://github.com/yatharth25"><img src="https://avatars.githubusercontent.com/u/54071856?v=4?s=64" width="64px;" alt="Yatharth Chauhan"/><br /><sub><b>Yatharth Chauhan</b></sub></a><br /><a href="https://github.com/mobxjs/mobx.dart/commits?author=yatharth25" title="Documentation">📖</a></td>
497502
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ParthBaraiya"><img src="https://avatars.githubusercontent.com/u/36261739?v=4?s=64" width="64px;" alt="Parth Baraiya"/><br /><sub><b>Parth Baraiya</b></sub></a><br /><a href="https://github.com/mobxjs/mobx.dart/commits?author=ParthBaraiya" title="Code">💻</a> <a href="https://github.com/mobxjs/mobx.dart/issues?q=author%3AParthBaraiya" title="Bug reports">🐛</a></td>
498503
</tr>
504+
<tr>
505+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/altynbek132"><img src="https://avatars.githubusercontent.com/u/48729942?v=4?s=64" width="64px;" alt="Altynbek Aidarbekov"/><br /><sub><b>Altynbek Aidarbekov</b></sub></a><br /><a href="https://github.com/mobxjs/mobx.dart/commits?author=altynbek132" title="Code">💻</a></td>
506+
</tr>
499507
</tbody>
500508
</table>
501509

docs/docs/guides/mobx-utils.mdx

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
title: MobX-utils
3+
sidebar_label: MobX-utils {🚀}
4+
hide_title: true
5+
---
6+
7+
<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?serve=CEBD4KQ7&placement=mobxjsorg" id="_carbonads_js"></script>
8+
9+
# MobX-utils {🚀}
10+
11+
[mobx_utils](https://pub.dev/packages/mobx_utils) provides an extensive series of additional utility functions, observables and common patterns for MobX.

docs/docusaurus.config.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ module.exports = {
8686
],
8787
},
8888
],
89-
copyright: `Copyright © ${new Date().getFullYear()} MobX.dart team. All rights reserved.`,
89+
copyright: `Copyright © 2018-${new Date().getFullYear()} MobX.dart team. All rights reserved.`,
9090
},
9191
prism: {
9292
theme: require('prism-react-renderer').themes.vsDark,
@@ -165,8 +165,8 @@ module.exports = {
165165
theme: {
166166
customCss: require.resolve('./src/css/custom.css'),
167167
},
168-
googleAnalytics: {
169-
trackingID: 'UA-60235345-4',
168+
gtag: {
169+
trackingID: 'G-HD7VP109DL',
170170
anonymizeIP: true,
171171
},
172172
},

docs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@emotion/styled": "^11.11.0",
1818
"@mdx-js/react": "^3.0.0",
1919
"@splinetool/react-spline": "^2.2.6",
20-
"@splinetool/runtime": "^1.0.17",
20+
"@splinetool/runtime": "^1.0.28",
2121
"axios": "^1.6.3",
2222
"docusaurus-lunr-search": "^3.3.1",
2323
"lodash.get": "^4.4.2",

docs/pnpm-lock.yaml

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/sidebars.js

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ module.exports = {
2828
'guides/organizing-stores',
2929
'guides/when-does-mobx-react',
3030
'guides/mobx-vs-inherited-model',
31+
'guides/mobx-utils',
3132
],
3233
},
3334
'community',

docs/src/components/home/Sponsor.tsx docs/src/components/home/SponsorSection.tsx

+25-17
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,19 @@
1+
import { Section } from './Section';
12
import React from 'react';
23
import { sponsors } from '../../data/sponsors';
34

4-
export const Sponsor = ({ logo, url }) => {
5+
const Sponsor = ({ logo, url }) => {
56
return (
67
<a href={url} target={'_blank'}>
78
<img src={logo} height={64} />
89
</a>
910
);
1011
};
1112

12-
export const SponsorList = () => {
13+
const SponsorList = () => {
1314
return (
1415
<>
15-
<ul
16-
className={'list-none flex flex-row items-center gap-8 sm:gap-16 p-0'}
17-
>
18-
<a
19-
href={'https://opencollective.com/mobx#sponsor'}
20-
className={
21-
'bg-slate-300 hover:bg-blue-300 rounded-lg items-center flex flex-col px-4 py-2 hover:no-underline'
22-
}
23-
>
24-
<div className={'text-5xl'}>+</div>
25-
<div className={'text-sm sm:text-xl text-nowrap'}>
26-
Become a sponsor
27-
</div>
28-
</a>
29-
16+
<ul className={'list-none flex flex-wrap items-center gap-8 p-0'}>
3017
{sponsors
3118
.filter((x) => x.active)
3219
.map((s) => (
@@ -53,3 +40,24 @@ export const SponsorList = () => {
5340
</>
5441
);
5542
};
43+
44+
export function SponsorSection() {
45+
return (
46+
<Section className={'bg-slate-100'} title={'Sponsors'}>
47+
<a
48+
href="https://opencollective.com/mobx/donate"
49+
target="_blank"
50+
className={'w-64 block'}
51+
>
52+
<img src="https://opencollective.com/mobx/donate/button@2x.png?color=blue" />
53+
</a>
54+
55+
<div className={'text-xl my-8'}>
56+
We are very thankful to our sponsors to make us part of their{' '}
57+
<i>Open Source Software (OSS)</i> program.
58+
</div>
59+
60+
<SponsorList />
61+
</Section>
62+
);
63+
}

docs/src/data/sponsors.ts

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
export const sponsors = [
22
{
3-
logo: require('../images/publicis-sapient-sponsor.png').default,
4-
url: 'https://publicis.sapient.com',
5-
active: false,
6-
},
7-
{
8-
logo: require('../images/wunderdog-sponsor.png').default,
9-
url: 'https://wunderdog.fi',
10-
active: false,
3+
logo: require('../images/vyuh-sponsor.png').default,
4+
url: 'https://vyuh.tech',
5+
active: true,
116
},
127
{
138
logo: 'https://www.netlify.com/img/global/badges/netlify-color-bg.svg',
@@ -19,4 +14,14 @@ export const sponsors = [
1914
url: 'https://www.algolia.com',
2015
active: true,
2116
},
17+
{
18+
logo: require('../images/wunderdog-sponsor.png').default,
19+
url: 'https://wunderdog.fi',
20+
active: false,
21+
},
22+
{
23+
logo: require('../images/publicis-sapient-sponsor.png').default,
24+
url: 'https://publicis.sapient.com',
25+
active: false,
26+
},
2227
];

docs/src/images/vyuh-sponsor.png

21.8 KB
Loading

docs/src/pages/index.tsx

+1-14
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import book from '../images/book.png';
2-
import { SponsorList } from '../components/home/Sponsor';
32
import { TestimonialList } from '../components/home/Testimonial';
43
import React from 'react';
54
import Layout from '@theme/Layout';
65
import { Section } from '../components/home/Section';
76
import { NutshellSection } from '../components/home/NutshellSection';
87
import { HeroSection } from '../components/home/HeroSection';
98
import { BadgesSection } from '../components/home/BadgesSection';
9+
import { SponsorSection } from '../components/home/SponsorSection';
1010

1111
export default function () {
1212
return (
@@ -21,19 +21,6 @@ export default function () {
2121
);
2222
}
2323

24-
function SponsorSection() {
25-
return (
26-
<Section className={'bg-slate-100'} title={'Sponsors'}>
27-
<div className={'text-xl mb-8'}>
28-
We are very thankful to our sponsors to make us part of their{' '}
29-
<i>Open Source Software (OSS)</i> program.
30-
</div>
31-
32-
<SponsorList />
33-
</Section>
34-
);
35-
}
36-
3724
function TestimonialSection() {
3825
return (
3926
<Section

melos.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ packages:
66
- mobx_codegen
77
- mobx_examples
88
- mobx_lint
9+
- mobx_lint_flutter_test
910

1011
scripts:
1112
analyze:
@@ -16,7 +17,3 @@ scripts:
1617
exec: dart run $MELOS_ROOT_PATH/tool/expose_version.dart
1718
generate:
1819
run: cd mobx_examples && dart run build_runner watch --delete-conflicting-outputs
19-
20-
command:
21-
bootstrap:
22-
usePubspecOverrides: true

pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: mobx_dart
22

33
environment:
4-
sdk: '>=2.18.0 <4.0.0'
4+
sdk: ">=2.18.0 <4.0.0"
55

66
dev_dependencies:
7-
melos: ^3.1.1
7+
melos: ^5.2.1

0 commit comments

Comments
 (0)