dont write local file:https:// urls to lockfile

cli/lockfile.rs

@@ -44,6 +44,9 @@ impl Lockfile {
  /// Lazily reads the filename, checks the given module is included.
  /// Returns Ok(true) if check passed
  pub fn check(&mut self, m: &CompiledModule) -> Result<bool> {
+ if m.name.starts_with("file:") {
+ return Ok(true);
+ }
  if self.need_read {
  self.read()?;
  }
@@ -56,7 +59,11 @@ impl Lockfile {
  })
  }
 
+ // Returns true if module was not already inserted.
  pub fn insert(&mut self, m: &CompiledModule) -> bool {
+ if m.name.starts_with("file:") {
+ return false;
+ }
  let checksum = crate::checksum::gen2(&m.code);
  self.map.insert(m.name.clone(), checksum).is_none()
  }

cli/tests/integration_tests.rs

@@ -354,6 +354,12 @@ itest!(lock_check_ok {
  http_server: true,
 });
 
+itest!(lock_check_ok2 {
+ args: "run 019_media_types.ts --lock=lock_check_ok2.json",
+ output: "019_media_types.ts.out",
+ http_server: true,
+});
+
 itest!(lock_check_err {
  args: "run --lock=lock_check_err.json http:https://127.0.0.1:4545/cli/tests/003_relative_import.ts",
  output: "lock_check_err.out",
@@ -362,6 +368,14 @@ itest!(lock_check_err {
  http_server: true,
 });
 
+itest!(lock_check_err2 {
+ args: "run 019_media_types.ts --lock=lock_check_err2.json",
+ output: "lock_check_err2.out",
+ check_stderr: true,
+ exit_code: 10,
+ http_server: true,
+});
+
 itest!(async_error {
  exit_code: 1,
  args: "run --reload async_error.ts",

cli/tests/lock_check_err2.json

@@ -0,0 +1,9 @@
+{
+ "http:https://localhost:4545/cli/tests/subdir/mt_text_javascript.j1.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+ "http:https://localhost:4545/cli/tests/subdir/mt_text_typescript.t1.ts": "c320ab0a259760e5c78b9ea840af3cc29697109594a3a5b5cea47128102b3e9d",
+ "http:https://localhost:4545/cli/tests/subdir/mt_application_x_typescript.t4.ts": "42f66736fea7365ff17d5aa9b9655e8551eb81f360dcfb6b77acdd5c9f699e82",
+ "http:https://localhost:4545/cli/tests/subdir/mt_video_vdn.t2.ts": "54cc82ff3c3b0387df57c7bb8eda4dcd36cbbf499ea483b04ff22c5365d34744",
+ "http:https://localhost:4545/cli/tests/subdir/mt_application_x_javascript.j4.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+ "http:https://localhost:4545/cli/tests/subdir/mt_application_ecmascript.j2.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+ "http:https://localhost:4545/cli/tests/subdir/mt_video_mp2t.t3.ts": "ee0b46f757b5f78681a4eead44820c2349daef7a5903fe3c624f29dbc98772e1"
+}

cli/tests/lock_check_err2.out

@@ -0,0 +1,2 @@
+[WILDCARD]Subresource integrety check failed --lock=lock_check_err2.json
+http:https://localhost:4545/cli/tests/subdir/mt_text_ecmascript.j3.js

cli/tests/lock_check_ok2.json

@@ -0,0 +1,10 @@
+{
+ "http:https://localhost:4545/cli/tests/subdir/mt_application_ecmascript.j2.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+ "http:https://localhost:4545/cli/tests/subdir/mt_text_ecmascript.j3.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+ "http:https://localhost:4545/cli/tests/subdir/mt_video_vdn.t2.ts": "54cc82ff3c3b0387df57c7bb8eda4dcd36cbbf499ea483b04ff22c5365d34744",
+ "http:https://localhost:4545/cli/tests/subdir/mt_text_javascript.j1.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+ "http:https://localhost:4545/cli/tests/subdir/mt_application_x_typescript.t4.ts": "42f66736fea7365ff17d5aa9b9655e8551eb81f360dcfb6b77acdd5c9f699e82",
+ "http:https://localhost:4545/cli/tests/subdir/mt_video_mp2t.t3.ts": "ee0b46f757b5f78681a4eead44820c2349daef7a5903fe3c624f29dbc98772e1",
+ "http:https://localhost:4545/cli/tests/subdir/mt_application_x_javascript.j4.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+ "http:https://localhost:4545/cli/tests/subdir/mt_text_typescript.t1.ts": "c320ab0a259760e5c78b9ea840af3cc29697109594a3a5b5cea47128102b3e9d"
+}