Revert "Bring jsx magic back"

This reverts commit 27167e1.

Author: ije

compiler/src/jsx_magic.rs

@@ -5,7 +5,6 @@ mod css;
 mod error;
 mod export_names;
 mod hmr;
-mod jsx_magic;
 mod resolve_fold;
 mod resolver;
 mod swc;
@@ -59,9 +58,6 @@ pub struct Options {
   #[serde(default)]
   pub jsx_import_source: Option<String>,
 
-  #[serde(default)]
-  pub jsx_magic: bool,
-
   #[serde(default)]
   pub strip_data_export: bool,
 }
@@ -167,7 +163,6 @@ pub fn transform(specifier: &str, code: &str, options: JsValue) -> Result<JsValu
       resolver.clone(),
       &EmitOptions {
         strip_data_export: options.strip_data_export,
-        jsx_magic: options.jsx_magic,
         jsx_import_source: options.jsx_import_source,
         minify: !options.is_dev,
         source_map: options.is_dev,

compiler/src/lib.rs

@@ -3,7 +3,6 @@ use crate::swc_helpers::{is_call_expr_by_name, new_str};
 use std::{cell::RefCell, rc::Rc};
 use swc_common::{Span, DUMMY_SP};
 use swc_ecmascript::ast::*;
-use swc_ecmascript::utils::quote_ident;
 use swc_ecmascript::visit::{noop_fold_type, Fold, FoldWith};
 
 pub fn resolve_fold(
@@ -30,34 +29,6 @@ impl Fold for ResolveFold {
   // fold&resolve import/export url
   fn fold_module_items(&mut self, module_items: Vec<ModuleItem>) -> Vec<ModuleItem> {
     let mut items = Vec::<ModuleItem>::new();
-    let jsx_magic_tags = self.resolver.borrow().jsx_magic_tags.to_owned();
-    let jsx_runtime = self.resolver.borrow().jsx_runtime.to_owned();
-
-    if jsx_magic_tags.len() > 0 {
-      if let Some(jsx_runtime) = jsx_runtime {
-        let mut resolver = self.resolver.borrow_mut();
-        let url = format!("{}/framework/{}/mod.ts", resolver.aleph_pkg_uri, jsx_runtime);
-        let src = resolver.resolve(&url, false, None);
-        // import { $TAG as __ALEPH_$TAG } from "$aleph_pkg_uri/framework/$framework/mod.ts"
-        items.push(ModuleItem::ModuleDecl(ModuleDecl::Import(ImportDecl {
-          span: DUMMY_SP,
-          specifiers: jsx_magic_tags
-            .into_iter()
-            .map(|tag| {
-              ImportSpecifier::Named(ImportNamedSpecifier {
-                span: DUMMY_SP,
-                local: quote_ident!(format!("__ALEPH__{}", tag)),
-                imported: Some(ModuleExportName::Ident(quote_ident!(tag.as_str()))),
-                is_type_only: false,
-              })
-            })
-            .collect(),
-          src: new_str(&src),
-          type_only: false,
-          asserts: None,
-        })));
-      }
-    }
 
     for item in module_items {
       match item {

compiler/src/resolve_fold.rs

@@ -1,5 +1,4 @@
 use import_map::ImportMap;
-use indexmap::IndexSet;
 use path_slash::PathBufExt;
 use pathdiff::diff_paths;
 use regex::Regex;
@@ -13,7 +12,7 @@ use url::Url;
 lazy_static! {
   pub static ref RE_REACT_URL: Regex =
     Regex::new(r"^https?://(esm\.sh|cdn\.esm\.sh)(/v\d+)?/react(\-dom)?(@[^/]+)?(/.*)?$").unwrap();
-  pub static ref RE_PROTOCOL_URL: Regex = Regex::new(r"^(data:|mailto:|[a-z]+://)").unwrap();
+  pub static ref RE_PROTOCOL_URL: Regex = Regex::new(r"^(mailto:|[a-z]+://)").unwrap();
 }
 
 #[derive(Clone, Debug, Eq, PartialEq, Serialize)]
@@ -39,17 +38,23 @@ pub struct Resolver {
   pub deps: Vec<DependencyDescriptor>,
   /// jsx runtime: react | preact
   pub jsx_runtime: Option<String>,
-  /// resolved jsx magic tags: `Head`, 'Anchor'
-  pub jsx_magic_tags: IndexSet<String>,
   /// development mode
   pub is_dev: bool,
   // internal
   import_map: ImportMap,
+  resolve_remote_deps: bool,
+  jsx_runtime_version: Option<String>,
+  jsx_runtime_cdn_version: Option<String>,
   graph_versions: HashMap<String, String>,
   initial_graph_version: Option<String>,
-  jsx_runtime_cdn_version: Option<String>,
-  jsx_runtime_version: Option<String>,
-  resolve_remote_deps: bool,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct InlineStyle {
+  pub r#type: String,
+  pub quasis: Vec<String>,
+  pub exprs: Vec<String>,
 }
 
 impl Resolver {
@@ -70,7 +75,6 @@ impl Resolver {
       specifier: specifier.into(),
       specifier_is_remote: is_http_url(specifier),
       deps: Vec::new(),
-      jsx_magic_tags: IndexSet::new(),
       jsx_runtime,
       jsx_runtime_version,
       jsx_runtime_cdn_version,

compiler/src/resolver.rs

@@ -1,7 +1,6 @@
 use crate::error::{DiagnosticBuffer, ErrorBuffer};
 use crate::export_names::ExportParser;
 use crate::hmr::hmr;
-use crate::jsx_magic::jsx_magic_fold;
 use crate::resolve_fold::resolve_fold;
 use crate::resolver::{DependencyDescriptor, Resolver};
 
@@ -24,7 +23,6 @@ use swc_ecmascript::visit::{Fold, FoldWith};
 #[derive(Debug, Clone)]
 pub struct EmitOptions {
   pub jsx_import_source: Option<String>,
-  pub jsx_magic: bool,
   pub strip_data_export: bool,
   pub minify: bool,
   pub source_map: bool,
@@ -34,7 +32,6 @@ impl Default for EmitOptions {
   fn default() -> Self {
     EmitOptions {
       jsx_import_source: None,
-      jsx_magic: false,
       strip_data_export: false,
       minify: false,
       source_map: false,
@@ -155,7 +152,6 @@ impl SWC {
       };
       let passes = chain!(
         swc_ecma_transforms::resolver(unresolved_mark, top_level_mark, is_ts),
-        Optional::new(jsx_magic_fold(resolver.clone()), options.jsx_magic),
         Optional::new(react::jsx_src(is_dev, self.source_map.clone()), is_jsx),
         resolve_fold(resolver.clone(), options.strip_data_export, false),
         decorators::decorators(decorators::Config {
@@ -205,7 +201,7 @@ impl SWC {
         Optional::new(hmr(resolver.clone()), is_dev && !specifier_is_remote),
         fixer(Some(&self.comments)),
         hygiene()
-      );
+      ); 
 
       let (code, map) = self.emit(passes, options.source_map, options.minify).unwrap();