Skip to content

Commit

Permalink
Implement typeof window inlining feature: vercel/turborepo#8211
Browse files Browse the repository at this point in the history
  • Loading branch information
timneutkens committed May 24, 2024
1 parent b735c3b commit 0550ecb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use turbopack_binding::{
condition::ContextCondition,
module_options::{
module_options_context::ModuleOptionsContext, JsxTransformOptions, ModuleRule,
TypescriptTransformOptions,
TypeofWindow, TypescriptTransformOptions,

Check failure on line 30 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / build / build

unresolved import `turbopack_binding::turbopack::turbopack::module_options::TypeofWindow`

Check failure on line 30 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / build-native / build

unresolved import `turbopack_binding::turbopack::turbopack::module_options::TypeofWindow`

Check failure on line 30 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / rust check / build

unresolved import `turbopack_binding::turbopack::turbopack::module_options::TypeofWindow`

Check failure on line 30 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / rustdoc check / build

unresolved import `turbopack_binding::turbopack::turbopack::module_options::TypeofWindow`

Check failure on line 30 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / test cargo unit / build

unresolved import `turbopack_binding::turbopack::turbopack::module_options::TypeofWindow`

Check failure on line 30 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / test unit (18) / build

unresolved import `turbopack_binding::turbopack::turbopack::module_options::TypeofWindow`

Check failure on line 30 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / test unit (20) / build

unresolved import `turbopack_binding::turbopack::turbopack::module_options::TypeofWindow`

Check failure on line 30 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / test next-swc wasm / build

unresolved import `turbopack_binding::turbopack::turbopack::module_options::TypeofWindow`
},
resolve_options_context::ResolveOptionsContext,
},
Expand Down Expand Up @@ -270,6 +270,7 @@ pub async fn get_client_module_options_context(
let enable_foreign_postcss_transform = Some(postcss_foreign_transform_options.cell());

let module_options_context = ModuleOptionsContext {
enable_typeof_window_inlining: Some(TypeofWindow::Object),

Check failure on line 273 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / build / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 273 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / build-native / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 273 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / rust check / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 273 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / rustdoc check / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 273 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / rustdoc check / build

failed to resolve: could not resolve path `TypeofWindow::Object`

Check failure on line 273 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / rustdoc check / build

struct `turbopack_binding::turbopack::turbopack::module_options::ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 273 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / test cargo unit / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 273 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / test unit (18) / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 273 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / test unit (20) / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 273 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / test next-swc wasm / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`
preset_env_versions: Some(env),
execution_context: Some(execution_context),
tree_shaking_mode: Some(TreeShakingMode::ReexportsOnly),
Expand All @@ -280,6 +281,7 @@ pub async fn get_client_module_options_context(

// node_modules context
let foreign_codes_options_context = ModuleOptionsContext {
enable_typeof_window_inlining: None,

Check failure on line 284 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / build / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 284 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / build-native / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 284 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / rust check / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 284 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / rustdoc check / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 284 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / rustdoc check / build

struct `turbopack_binding::turbopack::turbopack::module_options::ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 284 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / test cargo unit / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 284 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / test unit (18) / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 284 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / test unit (20) / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 284 in packages/next-swc/crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / test next-swc wasm / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`
enable_webpack_loaders: foreign_enable_webpack_loaders,
enable_postcss_transform: enable_foreign_postcss_transform,
custom_rules: foreign_next_client_rules,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ use turbopack_binding::{
turbopack::{
condition::ContextCondition,
module_options::{
JsxTransformOptions, ModuleOptionsContext, ModuleRule, TypescriptTransformOptions,
JsxTransformOptions, ModuleOptionsContext, ModuleRule, TypeofWindow,

Check failure on line 30 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / build / build

unresolved import `turbopack_binding::turbopack::turbopack::module_options::TypeofWindow`

Check failure on line 30 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / build-native / build

unresolved import `turbopack_binding::turbopack::turbopack::module_options::TypeofWindow`

Check failure on line 30 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / rust check / build

unresolved import `turbopack_binding::turbopack::turbopack::module_options::TypeofWindow`

Check failure on line 30 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / rustdoc check / build

unresolved import `turbopack_binding::turbopack::turbopack::module_options::TypeofWindow`

Check failure on line 30 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / test cargo unit / build

unresolved import `turbopack_binding::turbopack::turbopack::module_options::TypeofWindow`

Check failure on line 30 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / test unit (18) / build

unresolved import `turbopack_binding::turbopack::turbopack::module_options::TypeofWindow`

Check failure on line 30 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / test unit (20) / build

unresolved import `turbopack_binding::turbopack::turbopack::module_options::TypeofWindow`

Check failure on line 30 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / test next-swc wasm / build

unresolved import `turbopack_binding::turbopack::turbopack::module_options::TypeofWindow`
TypescriptTransformOptions,
},
resolve_options_context::ResolveOptionsContext,
transition::Transition,
Expand Down Expand Up @@ -461,6 +462,7 @@ pub async fn get_server_module_options_context(
let styled_jsx_transform_rule = get_styled_jsx_transform_rule(next_config, versions).await?;

let module_options_context = ModuleOptionsContext {
enable_typeof_window_inlining: Some(TypeofWindow::Undefined),

Check failure on line 465 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / build / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 465 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / build-native / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 465 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / rust check / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 465 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / rustdoc check / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 465 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / test cargo unit / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 465 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / test unit (18) / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 465 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / test unit (20) / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 465 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / test next-swc wasm / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`
execution_context: Some(execution_context),
use_swc_css,
tree_shaking_mode: Some(TreeShakingMode::ReexportsOnly),
Expand Down Expand Up @@ -509,6 +511,7 @@ pub async fn get_server_module_options_context(
};

let foreign_code_module_options_context = ModuleOptionsContext {
enable_typeof_window_inlining: None,

Check failure on line 514 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / build / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 514 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / build-native / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 514 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / rust check / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 514 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / rustdoc check / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 514 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / test cargo unit / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 514 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / test unit (18) / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 514 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / test unit (20) / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 514 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / test next-swc wasm / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`
custom_rules: foreign_next_server_rules.clone(),
enable_webpack_loaders: foreign_enable_webpack_loaders,
// NOTE(WEB-1016) PostCSS transforms should also apply to foreign code.
Expand Down Expand Up @@ -563,6 +566,7 @@ pub async fn get_server_module_options_context(
next_server_rules.extend(source_transform_rules);

let foreign_code_module_options_context = ModuleOptionsContext {
enable_typeof_window_inlining: None,

Check failure on line 569 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / build / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 569 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / build-native / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 569 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / rust check / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 569 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / rustdoc check / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 569 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / test cargo unit / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 569 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / test unit (18) / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 569 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / test unit (20) / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`

Check failure on line 569 in packages/next-swc/crates/next-core/src/next_server/context.rs

View workflow job for this annotation

GitHub Actions / test next-swc wasm / build

struct `ModuleOptionsContext` has no field named `enable_typeof_window_inlining`
custom_rules: foreign_next_server_rules.clone(),
enable_webpack_loaders: foreign_enable_webpack_loaders,
// NOTE(WEB-1016) PostCSS transforms should also apply to foreign code.
Expand Down

0 comments on commit 0550ecb

Please sign in to comment.