Merge branch 'v2' into bump-swc

parcel-bundler · May 10, 2024 · 795716b · 795716b
2 parents 3c82330 + ef63bff
commit 795716b
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 6 deletions.
diff --git a/crates/node-bindings/src/core/js_requests/config_request/mod.rs b/crates/node-bindings/src/core/js_requests/config_request/mod.rs
@@ -3,7 +3,6 @@ use std::rc::Rc;
 use napi::Env;
 use napi::JsObject;
 use napi_derive::napi;
-
 use parcel_core::requests::config_request::run_config_request;
 use parcel_core::requests::config_request::ConfigRequest;
 use parcel_core::requests::request_api::js_request_api::JSRequestApi;

diff --git a/crates/node-bindings/src/core/js_requests/entry_request/mod.rs b/crates/node-bindings/src/core/js_requests/entry_request/mod.rs
@@ -3,7 +3,6 @@ use std::rc::Rc;
 use napi::Env;
 use napi::JsObject;
 use napi_derive::napi;
-
 use parcel_core::requests::entry_request::run_entry_request;
 use parcel_core::requests::entry_request::EntryRequestInput;
 use parcel_core::requests::entry_request::EntryResult;

diff --git a/crates/node-bindings/src/resolver.rs b/crates/node-bindings/src/resolver.rs
@@ -343,6 +343,12 @@ impl Resolver {
         "esm" => SpecifierType::Esm,
         "commonjs" => SpecifierType::Cjs,
         "url" => SpecifierType::Url,
+        "custom" => {
+          return Err(napi::Error::new(
+            napi::Status::InvalidArg,
+            "Unsupported specifier type: custom",
+          ))
+        }
         _ => {
           return Err(napi::Error::new(
             napi::Status::InvalidArg,

diff --git a/crates/parcel_core/src/requests/entry_request/mod.rs b/crates/parcel_core/src/requests/entry_request/mod.rs
@@ -173,9 +173,10 @@ pub fn run_entry_request(
 
 #[cfg(test)]
 mod test {
-  use super::*;
   use parcel_filesystem::in_memory_file_system::InMemoryFileSystem;
 
+  use super::*;
+
   #[test]
   fn test_merge_results() {
     let entry1 = Entry {

diff --git a/...lesystem/src/in_memory_file_system/mod.rs → ...l_filesystem/src/in_memory_file_system.rs b/...lesystem/src/in_memory_file_system/mod.rs → ...l_filesystem/src/in_memory_file_system.rs
diff --git a/...system/src/js_delegate_file_system/mod.rs → ...filesystem/src/js_delegate_file_system.rs b/...system/src/js_delegate_file_system/mod.rs → ...filesystem/src/js_delegate_file_system.rs
@@ -53,7 +53,7 @@ impl FileSystem for JSDelegateFileSystem {
       let result = call_method(
         &self.env,
         &self.js_delegate,
-        "canonicalize",
+        "realpathSync",
         &[&js_path.into_unknown()],
       )?;
       Ok(path_from_js(result)?)

diff --git a/...rcel_filesystem/src/os_file_system/mod.rs → ...s/parcel_filesystem/src/os_file_system.rs b/...rcel_filesystem/src/os_file_system/mod.rs → ...s/parcel_filesystem/src/os_file_system.rs
diff --git a/crates/parcel_napi_helpers/src/lib.rs b/crates/parcel_napi_helpers/src/lib.rs
@@ -2,6 +2,7 @@ use napi::bindgen_prelude::FromNapiValue;
 use napi::Env;
 use napi::JsFunction;
 use napi::JsObject;
+use napi::JsUndefined;
 use napi::JsUnknown;
 use napi::NapiRaw;
 
@@ -66,3 +67,22 @@ pub fn call_method(
   let result = method_fn.call(Some(&js_object), &args)?;
   Ok(result)
 }
+
+/// Logs napi values using the JavaScript console
+///
+/// This function can be used to debug what data the pointers actually refer to
+///
+pub fn console_log<T>(env: Env, args: &[T]) -> napi::Result<JsUndefined>
+where
+  T: NapiRaw,
+{
+  let console_object = env
+    .get_global()?
+    .get_named_property::<JsObject>("console")?;
+
+  console_object
+    .get_named_property_unchecked::<JsFunction>("log")?
+    .call(Some(&console_object), args)?;
+
+  env.get_undefined()
+}
diff --git a/packages/core/integration-tests/test/integration/webextension-mv3/manifest.json b/packages/core/integration-tests/test/integration/webextension-mv3/manifest.json
@@ -4,7 +4,9 @@
   "version": "0.1",
   "manifest_version": 3,
   "background": {
-    "service_worker": "background.js"
+    "service_worker": "background.js",
+    "type": "module",
+    "scripts": [ "background.js" ]
   },
   "permissions": [
     "scripting",

diff --git a/packages/core/integration-tests/test/webextension.js b/packages/core/integration-tests/test/webextension.js
@@ -111,6 +111,7 @@ describe('webextension', function () {
         assets: ['manifest.json'],
       },
       {assets: ['background.js']},
+      {assets: ['background.js']},
       {assets: ['popup.html']},
       {assets: ['popup.css']},
       {assets: ['popup.js', 'esmodule-helpers.js', 'bundle-url.js']},

diff --git a/packages/transformers/webextension/src/WebExtensionTransformer.js b/packages/transformers/webextension/src/WebExtensionTransformer.js
@@ -273,7 +273,8 @@ async function collectDependencies(
         ...getJSONSourceLocation(ptrs['/background/page'], 'value'),
       },
     });
-  } else if (program.background?.service_worker) {
+  }
+  if (program.background?.service_worker) {
     program.background.service_worker = asset.addURLDependency(
       program.background.service_worker,
       {

diff --git a/packages/transformers/webextension/src/schema.js b/packages/transformers/webextension/src/schema.js
@@ -473,6 +473,10 @@ export const MV3Schema = ({
               type: 'string',
               enum: ['classic', 'module'],
             },
+            // to support both Chrome and Firefox
+            scripts: arrStr,
+            page: string,
+            persistent: boolean,
           },
           additionalProperties: false,
           required: ['service_worker'],