Skip to content

Commit

Permalink
fix js_interop and test menu
Browse files Browse the repository at this point in the history
  • Loading branch information
alextekartik committed Mar 21, 2024
1 parent 5e6cd1f commit 7533068
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 31 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/run_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ jobs:
fail-fast: false
matrix:
include:
- os: ubuntu-latest
dart: 3.0.5
node: '20'
- os: ubuntu-latest
dart: stable
node: '14'
Expand Down
2 changes: 1 addition & 1 deletion app_build/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ publish_to: none
deploy_to: none

environment:
sdk: '>=3.0.0 <4.0.0'
sdk: '>=3.3.0 <4.0.0'

dependencies:
path: '>=1.7.0'
Expand Down
3 changes: 1 addition & 2 deletions app_build_menu/lib/app_build_menu.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
export 'package:dev_build/menu/menu_io.dart';
export 'package:tekartik_app_node_build/afc_build.dart';
export 'package:tekartik_app_node_build/app_build.dart';
export 'package:tekartik_app_node_build/gcf_build.dart';
export 'package:tekartik_test_menu/test_menu.dart';
export 'package:tekartik_test_menu_io/test_menu_io.dart' show mainMenu;

export 'src/app_build_menu.dart'
show menuAppContent, nodeMenuAppContent, gcfMenuAppContent;
4 changes: 2 additions & 2 deletions app_build_menu/lib/src/app_build_menu.dart
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import 'package:dev_build/menu/menu_io.dart';
import 'package:dev_test/build_support.dart';
import 'package:dev_test/package.dart';
import 'package:path/path.dart';
import 'package:tekartik_app_node_build/app_build.dart';
import 'package:tekartik_app_node_build/gcf_build.dart';
import 'package:tekartik_test_menu_io/test_menu_io.dart';

Future main(List<String> arguments) async {
mainMenu(arguments, menuAppContent);
mainMenuConsole(arguments, menuAppContent);
}

void gcfMenuAppContent({required GcfNodeAppOptions? options}) {
Expand Down
2 changes: 1 addition & 1 deletion app_build_menu/lib/src/bin/nbm.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ void nbm(List<String> arguments) {
if (appPath.isEmpty) {
appPath = [Directory.current.path];
}
mainMenu(appPath.sublist(1), () {
mainMenuConsole(appPath.sublist(1), () {
menuAppContent(path: appPath.first);
});
}
13 changes: 2 additions & 11 deletions app_build_menu/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,14 @@ publish_to: none
# homepage: https://www.example.com

environment:
sdk: '>=3.0.0 <4.0.0'
sdk: '>=3.3.0 <4.0.0'

dependencies:
path:
args:
dev_test: '>=0.16.2'
dev_build: '>=0.16.5-6'
process_run:
tekartik_test_menu_io:
git:
url: https://github.com/tekartik/test_menu.dart
ref: dart3a
path: test_menu_io
tekartik_test_menu:
git:
url: https://github.com/tekartik/test_menu.dart
ref: dart3a
path: test_menu
tekartik_app_node_build:
git:
url: https://github.com/tekartik/app_node_utils.dart
Expand Down
2 changes: 1 addition & 1 deletion node_utils/lib/src/console/console.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'console_none.dart'
if (dart.library.js) 'console_node.dart'
if (dart.library.js_interop) 'console_node.dart'
if (dart.library.io) 'console_io.dart' as impl;

abstract class Console {
Expand Down
11 changes: 5 additions & 6 deletions node_utils/lib/src/console/console_node.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@JS()
library tekartik_node_utils.console_node_js;

import 'package:js/js.dart';
import 'dart:js_interop';
import 'package:tekartik_app_node_utils/src/console/console.dart';

class _Console implements Console {
Expand All @@ -12,24 +11,24 @@ class _Console implements Console {
}

@JS('console.error')
external void _consoleError(Object? object);
external void _consoleError(JSAny? object);

@JS('console.log')
external void _consoleLog(Object? object);
external void _consoleLog(JSAny? object);

class _ConsoleErrorSink extends _ConsoleSink {
@override
void writeln([Object? obj = '']) {
// devPrint('err.writeln($obj)');
_consoleError(obj);
_consoleError(obj?.jsify());
}
}

class _ConsoleOutSink extends _ConsoleSink {
@override
void writeln([Object? obj = '']) {
// devPrint('out.writeln($obj)');
_consoleLog(obj);
_consoleLog(obj?.jsify());
}
}

Expand Down
2 changes: 1 addition & 1 deletion node_utils/lib/src/node.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export 'node_stub.dart'
if (dart.library.js) 'node_impl.dart'
if (dart.library.js_interop) 'node_impl.dart'
if (dart.library.io) 'node_io.dart';
2 changes: 1 addition & 1 deletion node_utils/lib/src/template/platform.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'platform_none.dart'
if (dart.library.js) 'platform_node.dart'
if (dart.library.js_interop) 'platform_node.dart'
if (dart.library.io) 'platform_io.dart' as impl;

void platformInit() => impl.platformInit();
2 changes: 1 addition & 1 deletion node_utils/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ publish_to: none
# homepage: https://www.example.com

environment:
sdk: '>=3.0.0 <4.0.0'
sdk: '>=3.3.0 <4.0.0'

dependencies:
path: '>=1.7.0'
Expand Down
2 changes: 1 addition & 1 deletion repo_support/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 0.2.0
publish_to: none

environment:
sdk: '>=3.0.0 <4.0.0'
sdk: '>=3.3.0 <4.0.0'

dev_dependencies:
dev_test: '>=0.15.2+2'
Expand Down

0 comments on commit 7533068

Please sign in to comment.