Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 6563c58

Browse files
Remove felt snapshotting behavior. (#37639)
* Remove felt snapshotting behavior. * Use `dart run`.
1 parent baad8f2 commit 6563c58

File tree

2 files changed

+5
-52
lines changed

2 files changed

+5
-52
lines changed

lib/web_ui/dev/felt

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,7 @@ else
7373
fi
7474

7575
WEB_UI_DIR="${FLUTTER_DIR}/lib/web_ui"
76-
DEV_DIR="${WEB_UI_DIR}/dev"
77-
DART_TOOL_DIR="${WEB_UI_DIR}/.dart_tool"
7876
DART_PATH="$DART_SDK_DIR/bin/dart"
79-
SNAPSHOT_PATH="${DART_TOOL_DIR}/felt.snapshot"
80-
STAMP_PATH="${DART_TOOL_DIR}/felt.snapshot.stamp"
81-
SCRIPT_PATH="${DEV_DIR}/felt.dart"
82-
REVISION="$(cd "$FLUTTER_DIR"; git rev-parse HEAD)"
8377

8478
if [[ "$FELT_DEBUG" == "true" || "$FELT_DEBUG" == "1" ]]
8579
then
@@ -133,28 +127,6 @@ then
133127
set -e
134128
fi
135129

136-
if [[ "$FELT_USE_SNAPSHOT" == "false" || "$FELT_USE_SNAPSHOT" == "0" ]]; then
137-
echo "[Snapshot mode: off]"
138-
# Running without snapshot means there is high likelihood of local changes. In
139-
# that case, let's clear the snapshot to avoid any surprises.
140-
rm -f "$SNAPSHOT_PATH"
141-
rm -f "$STAMP_PATH"
142-
install_deps
143-
$DART_SDK_DIR/bin/dart $FELT_DEBUG_FLAGS "$DEV_DIR/felt.dart" $@
144-
else
145-
# Create a new snapshot if any of the following is true:
146-
# * SNAPSHOT_PATH is not a file, or
147-
# * STAMP_PATH is not a file with nonzero size, or
148-
# * Contents of STAMP_PATH is not our local git HEAD revision, or
149-
# * pubspec.yaml last modified after pubspec.lock
150-
if [[ ! -f $SNAPSHOT_PATH || ! -s "$STAMP_PATH" || "$(cat "$STAMP_PATH")" != "$REVISION" || "$WEB_UI_DIR/pubspec.yaml" -nt "$WEB_UI_DIR/pubspec.lock" ]]; then
151-
echo "[Snapshot mode: on] (creating a new snapshot)"
152-
install_deps
153-
mkdir -p $DART_TOOL_DIR
154-
155-
"$DART_SDK_DIR/bin/dart" --snapshot="$SNAPSHOT_PATH" --packages="$WEB_UI_DIR/.dart_tool/package_config.json" "$SCRIPT_PATH"
156-
echo "$REVISION" > "$STAMP_PATH"
157-
fi
158-
159-
$DART_SDK_DIR/bin/dart $FELT_DEBUG_FLAGS --packages="$WEB_UI_DIR/.dart_tool/package_config.json" "$SNAPSHOT_PATH" $@
160-
fi
130+
cd $WEB_UI_DIR
131+
install_deps
132+
(cd $WEB_UI_DIR && $DART_SDK_DIR/bin/dart run $FELT_DEBUG_FLAGS dev/felt.dart $@)

lib/web_ui/dev/felt.bat

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,8 @@ FOR %%a IN ("%TMP:~0,-1%") DO SET TMP=%%~dpa
2020
FOR %%a IN ("%TMP:~0,-1%") DO SET ENGINE_SRC_DIR=%%~dpa
2121

2222
SET ENGINE_SRC_DIR=%ENGINE_SRC_DIR:~0,-1%
23-
SET OUT_DIR=%ENGINE_SRC_DIR%\out
24-
SET HOST_DEBUG_UNOPT_DIR=%OUT_DIR%\host_debug_unopt
2523
SET FLUTTER_DIR=%ENGINE_SRC_DIR%\flutter
2624
SET WEB_UI_DIR=%FLUTTER_DIR%\lib\web_ui
27-
SET DEV_DIR=%WEB_UI_DIR%\dev
28-
SET FELT_PATH=%DEV_DIR%\felt.dart
29-
SET DART_TOOL_DIR=%WEB_UI_DIR%\.dart_tool
30-
SET SNAPSHOT_PATH=%DART_TOOL_DIR%\felt.snapshot
3125
SET SDK_PREBUILTS_DIR=%FLUTTER_DIR%\prebuilts
3226
SET PREBUILT_TARGET=windows-x64
3327
IF NOT DEFINED DART_SDK_DIR (
@@ -38,20 +32,7 @@ SET DART_BIN=%DART_SDK_DIR%\bin\dart
3832
cd %WEB_UI_DIR%
3933

4034
:: We need to invoke pub get here before we actually invoke felt.
41-
CALL %DART_BIN% pub get
42-
43-
IF FELT_USE_SNAPSHOT=="0" (
44-
ECHO Invoking felt.dart without snapshot
45-
SET FELT_TARGET=%FELT_PATH%
46-
) ELSE (
47-
IF NOT EXIST "%SNAPSHOT_PATH%" (
48-
ECHO Precompiling felt snapshot
49-
%DART_BIN% --snapshot="%SNAPSHOT_PATH%" --packages="%WEB_UI_DIR%\.dart_tool\package_config.json" %FELT_PATH%
50-
)
51-
SET FELT_TARGET=%SNAPSHOT_PATH%
52-
ECHO Invoking felt snapshot
53-
)
54-
55-
%DART_BIN% --packages="%WEB_UI_DIR%\.dart_tool\package_config.json" "%FELT_TARGET%" %*
35+
%DART_BIN% pub get
36+
%DART_BIN% run dev/felt.dart %*
5637

5738
EXIT /B %ERRORLEVEL%

0 commit comments

Comments
 (0)