Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ on:
tags:
- "solid_generator-v[0-9]+.[0-9]+.[0-9]+" # Matches solid_generator-v1.2.3
- 'solid_generator-v[0-9]+.[0-9]+.[0-9]+\+[0-9]+' # Matches solid_generator-v1.2.3+4
- "solid_generator-v[0-9]+.[0-9]+.[0-9]+-*" # Matches solid_generator-v1.2.3-dev.1
- "solid_annotations-v[0-9]+.[0-9]+.[0-9]+" # Matches solid_annotations-v1.2.3
- 'solid_annotations-v[0-9]+.[0-9]+.[0-9]+\+[0-9]+' # Matches solid_annotations-v1.2.3+4
- "solid_annotations-v[0-9]+.[0-9]+.[0-9]+-*" # Matches solid_annotations-v1.2.3-dev.1

jobs:
publish_solid_annotations:
Expand Down
2 changes: 0 additions & 2 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_solidart/flutter_solidart.dart';

import 'counter.dart';

void main() {
SolidartConfig.autoDispose = false;
runApp(const MaterialApp(home: CounterPage()));
}
10 changes: 5 additions & 5 deletions example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ publish_to: 'none'
version: 0.0.1

environment:
sdk: ^3.9.2
sdk: ^3.10.0

resolution: workspace

dependencies:
flutter:
sdk: flutter
flutter_solidart: ^2.7.3
provider: ^6.1.0
flutter_solidart: ^3.0.0-dev.1
provider: ^6.1.5
solid_annotations:
path: ../packages/solid_annotations

dev_dependencies:
build_runner: ^2.14.0
build_runner: ^2.15.0
solid_generator:
path: ../packages/solid_generator
very_good_analysis: ^10.0.0
very_good_analysis: ^10.3.0

flutter:
uses-material-design: true
2 changes: 0 additions & 2 deletions example/source/main.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_solidart/flutter_solidart.dart';

import 'counter.dart';

void main() {
SolidartConfig.autoDispose = false;
runApp(MaterialApp(home: CounterPage()));
}
2 changes: 0 additions & 2 deletions examples/chat/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter_solidart/flutter_solidart.dart';
import 'package:provider/provider.dart';
import 'package:solid_annotations/solid_annotations.dart';

Expand All @@ -12,7 +11,6 @@ import 'controllers/session_controller.dart';
import 'controllers/users_controller.dart';

void main() {
SolidartConfig.autoDispose = false;
// `.environment(X)` wraps the receiver in `Provider<X>(child: receiver)`,
// so X ends up ABOVE the receiver in the widget tree. For a Provider's
// `create` callback to find a dependency via `ctx.read<T>()`, the
Expand Down
10 changes: 5 additions & 5 deletions examples/chat/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ publish_to: 'none'
version: 0.0.1

environment:
sdk: ^3.9.2
sdk: ^3.10.0

resolution: workspace

dependencies:
flutter:
sdk: flutter
flutter_solidart: ^2.7.4
provider: ^6.1.0
flutter_solidart: ^3.0.0-dev.1
provider: ^6.1.5
solid_annotations:
path: ../../packages/solid_annotations

dev_dependencies:
build_runner: ^2.14.0
build_runner: ^2.15.0
flutter_test:
sdk: flutter
solid_generator:
path: ../../packages/solid_generator
very_good_analysis: ^10.0.0
very_good_analysis: ^10.3.0

flutter:
uses-material-design: true
2 changes: 0 additions & 2 deletions examples/chat/source/main.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter_solidart/flutter_solidart.dart';
import 'package:provider/provider.dart';
import 'package:solid_annotations/solid_annotations.dart';

Expand All @@ -12,7 +11,6 @@ import 'controllers/session_controller.dart';
import 'controllers/users_controller.dart';

void main() {
SolidartConfig.autoDispose = false;
// `.environment(X)` wraps the receiver in `Provider<X>(child: receiver)`,
// so X ends up ABOVE the receiver in the widget tree. For a Provider's
// `create` callback to find a dependency via `ctx.read<T>()`, the
Expand Down
12 changes: 6 additions & 6 deletions examples/solidart_example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@ publish_to: 'none'
version: 0.0.1

environment:
sdk: ^3.9.2
sdk: ^3.10.0

resolution: workspace

dependencies:
flutter:
sdk: flutter
flutter_solidart: ^2.7.4
http: ^1.3.0
provider: ^6.1.0
flutter_solidart: ^3.0.0-dev.1
http: ^1.6.0
provider: ^6.1.5
solid_annotations:
path: ../../packages/solid_annotations

dev_dependencies:
build_runner: ^2.14.0
build_runner: ^2.15.0
flutter_test:
sdk: flutter
solid_generator:
path: ../../packages/solid_generator
very_good_analysis: ^10.0.0
very_good_analysis: ^10.3.0

flutter:
uses-material-design: true
2 changes: 0 additions & 2 deletions examples/todos/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter_solidart/flutter_solidart.dart';
import 'package:solid_annotations/solid_annotations.dart';

import 'controllers/filter.dart';
Expand All @@ -8,7 +7,6 @@ import 'domain/todo.dart';
import 'pages/todos.dart';

void main() {
SolidartConfig.autoDispose = false;
runApp(const MyApp());
}

Expand Down
12 changes: 6 additions & 6 deletions examples/todos/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@ publish_to: 'none'
version: 0.0.1

environment:
sdk: ^3.9.2
sdk: ^3.10.0

resolution: workspace

dependencies:
flutter:
sdk: flutter
flutter_solidart: ^2.7.4
provider: ^6.1.0
flutter_solidart: ^3.0.0-dev.1
provider: ^6.1.5
solid_annotations:
path: ../../packages/solid_annotations
uuid: ^4.5.1
uuid: ^4.5.3

dev_dependencies:
build_runner: ^2.14.0
build_runner: ^2.15.0
flutter_test:
sdk: flutter
solid_generator:
path: ../../packages/solid_generator
very_good_analysis: ^10.0.0
very_good_analysis: ^10.3.0

flutter:
uses-material-design: true
2 changes: 0 additions & 2 deletions examples/todos/source/main.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter_solidart/flutter_solidart.dart';
import 'package:solid_annotations/solid_annotations.dart';

import 'controllers/filter.dart';
Expand All @@ -8,7 +7,6 @@ import 'domain/todo.dart';
import 'pages/todos.dart';

void main() {
SolidartConfig.autoDispose = false;
runApp(const MyApp());
}

Expand Down
2 changes: 0 additions & 2 deletions examples/weather/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter_solidart/flutter_solidart.dart';
import 'package:solid_annotations/solid_annotations.dart';

import 'api/weather_api.dart';
Expand All @@ -9,7 +8,6 @@ import 'domain/city.dart';
import 'pages/home_page.dart';

void main() {
SolidartConfig.autoDispose = false;
runApp(
const WeatherApp()
.environment(
Expand Down
12 changes: 6 additions & 6 deletions examples/weather/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@ publish_to: 'none'
version: 0.0.1

environment:
sdk: ^3.9.2
sdk: ^3.10.0

resolution: workspace

dependencies:
flutter:
sdk: flutter
flutter_solidart: ^2.7.4
http: ^1.2.2
provider: ^6.1.0
flutter_solidart: ^3.0.0-dev.1
http: ^1.6.0
provider: ^6.1.5
solid_annotations:
path: ../../packages/solid_annotations

dev_dependencies:
build_runner: ^2.14.0
build_runner: ^2.15.0
flutter_test:
sdk: flutter
solid_generator:
path: ../../packages/solid_generator
very_good_analysis: ^10.0.0
very_good_analysis: ^10.3.0

flutter:
uses-material-design: true
2 changes: 0 additions & 2 deletions examples/weather/source/main.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter_solidart/flutter_solidart.dart';
import 'package:solid_annotations/solid_annotations.dart';

import 'api/weather_api.dart';
Expand All @@ -9,7 +8,6 @@ import 'domain/city.dart';
import 'pages/home_page.dart';

void main() {
SolidartConfig.autoDispose = false;
runApp(
const WeatherApp()
.environment((_) => WeatherApi())
Expand Down
10 changes: 5 additions & 5 deletions packages/integration_tests/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ publish_to: 'none'
version: 0.0.1

environment:
sdk: ^3.9.2
sdk: ^3.10.0

resolution: workspace

dependencies:
flutter:
sdk: flutter
flutter_solidart: ^2.7.4
provider: ^6.1.0
flutter_solidart: ^3.0.0-dev.1
provider: ^6.1.5
solid_annotations:
path: ../solid_annotations

dev_dependencies:
build_runner: ^2.14.0
build_runner: ^2.15.0
flutter_test:
sdk: flutter
solid_generator:
path: ../solid_generator
very_good_analysis: ^10.0.0
very_good_analysis: ^10.3.0

flutter:
uses-material-design: true
5 changes: 5 additions & 0 deletions packages/solid_annotations/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 3.0.0-dev.1

- **BREAKING**: Raise the Dart SDK lower bound to `^3.10.0` and align with the solidart v3 ecosystem (`flutter_solidart` `^3.0.0-dev.1`).
- **CHORE**: Bump `meta`, `provider`, and `very_good_analysis`.

## 2.0.0+1

- **DOCS**: Update README installation.
Expand Down
10 changes: 5 additions & 5 deletions packages/solid_annotations/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: solid_annotations
description: Annotations for the solid transpiler to enable fine-grained reactivity in Flutter applications.
version: 2.0.0+1
version: 3.0.0-dev.1
homepage: https://solid.mariuti.com
repository: https://github.com/nank1ro/solid
issue_tracker: https://github.com/nank1ro/solid/issues
Expand All @@ -13,15 +13,15 @@ topics:
- solidjs

environment:
sdk: ^3.9.2
sdk: ^3.10.0

resolution: workspace

dependencies:
flutter:
sdk: flutter
meta: ^1.16.0
provider: ^6.1.0
meta: ^1.18.0
provider: ^6.1.5

dev_dependencies:
very_good_analysis: ^10.0.0
very_good_analysis: ^10.3.0
6 changes: 6 additions & 0 deletions packages/solid_generator/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 3.0.0-dev.1

- **BREAKING**: Raise the Dart SDK lower bound to `^3.10.0` to target the solidart v3 ecosystem.
- **CHORE**: Upgrade `analyzer` to `^12.0.0` and adapt to its reshaped class/enum declaration AST (name and members moved onto `namePart`/`body` for primary constructors).
- **CHORE**: Bump `solid_annotations` to `^3.0.0-dev.1`, `dart_style` to `^3.1.8`, and `build`/`build_runner`/`build_test`.

## 2.0.0+1

- **DOCS**: Update README installation.
Expand Down
7 changes: 4 additions & 3 deletions packages/solid_generator/lib/builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'package:dart_style/dart_style.dart';
import 'package:glob/glob.dart';

import 'package:solid_generator/src/annotation_reader.dart';
import 'package:solid_generator/src/ast_compat.dart';
import 'package:solid_generator/src/class_kind.dart';
import 'package:solid_generator/src/const_call_site_rewriter.dart';
import 'package:solid_generator/src/effect_model.dart';
Expand Down Expand Up @@ -154,7 +155,7 @@ class _SolidBuilder implements Builder {
}
// Acquire a TYPE-RESOLVED CompilationUnit when possible. Path:
// 1. `libraryFor(inputId)` returns a fully-resolved `LibraryElement`
// (analyzer 8.x forces full type resolution at this step).
// (the analyzer resolves types fully at this step).
// 2. `astNodeFor(anyElement, resolve: true)` returns that element's
// resolved declaration node — `Expression.staticType` is populated
// on every node beneath it.
Expand Down Expand Up @@ -625,8 +626,8 @@ Future<CompilationUnit> _resolveUnit(
buildStep.inputId,
allowSyntaxErrors: true,
);
// analyzer 9 `astNodeFor` takes a `Fragment` (the per-file
// declaration-level element). The library's defining-file fragment is
// `astNodeFor` takes a `Fragment` (the per-file declaration-level
// element). The library's defining-file fragment is
// available as `library.firstFragment` (a `LibraryFragment`); passing
// it with `resolve: true` returns the resolved `CompilationUnit` for
// that file directly. Falls back to the parsed AST if the resolver
Expand Down
Loading
Loading