From 530b80fe628bc8d644fd49e9f5159441e919399b Mon Sep 17 00:00:00 2001 From: Danny Tuppeny Date: Sat, 16 May 2020 20:06:42 +0100 Subject: [PATCH 1/2] Remove dart:html from build_release.sh --- tool/build_release.sh | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/tool/build_release.sh b/tool/build_release.sh index aaa8c8a4bc9..b0a052af6a3 100755 --- a/tool/build_release.sh +++ b/tool/build_release.sh @@ -11,23 +11,8 @@ pushd packages/devtools_app rm -rf build rm -rf ../devtools/build flutter pub get -flutter pub run build_runner build -o web:build --release -mv ./build/packages ./build/pack -# move release to the devtools package from the devtools_app package for deployment -mv build ../devtools - -# Build the flutter release of the app as well. - -rm -rf build flutter build web --dart-define=FLUTTER_WEB_USE_SKIA=true --no-tree-shake-icons -mkdir build/web/flutter -mv build/web/main.* build/web/flutter/ - -sed 's|main.dart.js|flutter\/main.dart.js|' build/web/index.html > build/web/tmp.html -sed 's|||' build/web/tmp.html > build/web/flutter.html -rm build/web/index.html build/web/tmp.html - -mv build/web/* ../devtools/build/ +mv build/web ../devtools/build popd From 1a5710d52f10dae8a788434b7130ff0ff32cee59 Mon Sep 17 00:00:00 2001 From: Danny Tuppeny Date: Sat, 16 May 2020 20:10:03 +0100 Subject: [PATCH 2/2] Remove handler for /pack/ for dart:html build --- .../lib/src/external_handlers.dart | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/packages/devtools_server/lib/src/external_handlers.dart b/packages/devtools_server/lib/src/external_handlers.dart index fef0d57b483..7de7c1cd6ef 100644 --- a/packages/devtools_server/lib/src/external_handlers.dart +++ b/packages/devtools_server/lib/src/external_handlers.dart @@ -80,32 +80,11 @@ Future defaultHandler( debugProxyHandler = proxyHandler(Uri.parse('http://localhost:$webPort/')); } - // The packages folder is renamed in the pub package so this handler serves - // out of the `pack` folder. - Handler packHandler; - if (!debugMode) { - final packFolder = path.join(packageDir, 'build', 'pack'); - if (Directory(packFolder).existsSync()) { - packHandler = createStaticHandler( - packFolder, - defaultDocument: 'index.html', - ); - } - } - final sseHandler = SseHandler(Uri.parse('/api/sse')) ..connections.rest.listen(clients.acceptClient); // Make a handler that delegates based on path. final handler = (shelf.Request request) { - if (!debugMode) { - if (packHandler != null && request.url.path.startsWith('packages/')) { - // request.change here will strip the `packages` prefix from the path - // so it's relative to packHandler's root. - return packHandler(request.change(path: 'packages')); - } - } - if (request.url.path.startsWith('api/sse')) { return sseHandler.handler(request); }