From 8090c0c0cdfc28300cbb59e9d2c8993caaf0fcd4 Mon Sep 17 00:00:00 2001 From: OJ Kwon <1210596+kwonoj@users.noreply.github.com> Date: Mon, 12 Dec 2022 11:58:46 -0800 Subject: [PATCH] dummy turbopack --- .github/workflows/build_test_deploy.yml | 2 +- packages/next-swc/Cargo.lock | 247 +++++++---------------- packages/next-swc/crates/napi/Cargo.toml | 47 ++--- packages/next-swc/crates/wasm/Cargo.toml | 26 +-- packages/next-swc/package.json | 4 +- turbo.json | 4 + 6 files changed, 113 insertions(+), 217 deletions(-) diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml index b107d11546251..b0c9c043dc46e 100644 --- a/.github/workflows/build_test_deploy.yml +++ b/.github/workflows/build_test_deploy.yml @@ -1128,7 +1128,7 @@ jobs: target: 'aarch64-pc-windows-msvc' build: | npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" "turbo@${TURBO_VERSION}" "pnpm@${PNPM_VERSION}" - turbo run build-native-no-plugin -- --release --target aarch64-pc-windows-msvc --cargo-flags=--no-default-features + turbo run build-native-no-plugin-woa -- --release --target aarch64-pc-windows-msvc --cargo-flags=--no-default-features if: ${{ needs.build.outputs.isRelease == 'true' || (needs.build.outputs.swcChange == 'yup' && needs.build.outputs.turboToken != 'empty') }} needs: build name: stable - ${{ matrix.settings.target }} - node@16 diff --git a/packages/next-swc/Cargo.lock b/packages/next-swc/Cargo.lock index eda9c06fb578f..6554d5d18c189 100644 --- a/packages/next-swc/Cargo.lock +++ b/packages/next-swc/Cargo.lock @@ -123,7 +123,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "serde", ] @@ -802,16 +802,6 @@ dependencies = [ "parking_lot_core 0.9.4", ] -[[package]] -name = "debugid" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" -dependencies = [ - "serde", - "uuid", -] - [[package]] name = "diff" version = "0.1.13" @@ -1314,17 +1304,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi 0.3.9", -] - [[package]] name = "http" version = "0.2.8" @@ -1385,9 +1364,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59df7c4e19c950e6e0e868dcc0a300b09a9b88e9ec55bd879ca819087a77355d" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ "http", "hyper", @@ -1499,6 +1478,12 @@ dependencies = [ "serde", ] +[[package]] +name = "indoc" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adab1eaa3408fb7f0c777a73e7465fd5656136fc93b670eb6df3c88c2c1344e3" + [[package]] name = "inotify" version = "0.7.1" @@ -1818,8 +1803,7 @@ dependencies = [ [[package]] name = "markdown" version = "1.0.0-alpha.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f1bec93d41bf1ce695437433e87126cb127e147c3e5c3f35184282f97825cd9" +source = "git+https://github.com/kwonoj/markdown-rs.git?rev=69b07b09249b93ed9a9cdc4a9584ba14ec0d201f#69b07b09249b93ed9a9cdc4a9584ba14ec0d201f" dependencies = [ "log", "regex", @@ -1828,12 +1812,6 @@ dependencies = [ "unicode-id", ] -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - [[package]] name = "matchers" version = "0.1.0" @@ -1855,8 +1833,7 @@ dependencies = [ [[package]] name = "mdxjs" version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4bbd566f0dd80e0701ef5ca305e4404805eb37b95a6246ac1605acb71a6e9b" +source = "git+https://github.com/kwonoj/mdxjs-rs.git?rev=94c1b72177820d0c629bf77442817fe53dedfbcd#94c1b72177820d0c629bf77442817fe53dedfbcd" dependencies = [ "markdown", "serde", @@ -2212,17 +2189,23 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "next-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", + "auto-hash-map", "indexmap", + "indoc", "mime", + "once_cell", + "qstring", "serde", "serde_json", "turbo-tasks", "turbo-tasks-build", "turbo-tasks-env", + "turbo-tasks-fetch", "turbo-tasks-fs", + "turbo-tasks-hash", "turbopack", "turbopack-core", "turbopack-dev-server", @@ -2234,7 +2217,7 @@ dependencies = [ [[package]] name = "next-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", "clap", @@ -2259,7 +2242,7 @@ dependencies = [ [[package]] name = "next-font" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "fxhash", "serde", @@ -2305,7 +2288,6 @@ dependencies = [ "next-swc", "node-file-trace", "once_cell", - "sentry", "serde", "serde_json", "swc_core 0.45.4", @@ -2318,7 +2300,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", "serde", @@ -2477,9 +2459,9 @@ checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "openssl" -version = "0.10.42" +version = "0.10.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" +checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -2509,9 +2491,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.77" +version = "0.9.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" +checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4" dependencies = [ "autocfg", "cc", @@ -3039,9 +3021,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.12" +version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" +checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ "base64", "bytes", @@ -3146,15 +3128,6 @@ dependencies = [ "semver 0.9.0", ] -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.14", -] - [[package]] name = "rustls" version = "0.20.7" @@ -3288,86 +3261,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "sentry" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73642819e7fa63eb264abc818a2f65ac8764afbe4870b5ee25bcecc491be0d4c" -dependencies = [ - "httpdate", - "reqwest", - "sentry-backtrace", - "sentry-contexts", - "sentry-core", - "sentry-panic", - "tokio", -] - -[[package]] -name = "sentry-backtrace" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49bafa55eefc6dbc04c7dac91e8c8ab9e89e9414f3193c105cabd991bbc75134" -dependencies = [ - "backtrace", - "once_cell", - "regex", - "sentry-core", -] - -[[package]] -name = "sentry-contexts" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63317c4051889e73f0b00ce4024cae3e6a225f2e18a27d2c1522eb9ce2743da" -dependencies = [ - "hostname", - "libc", - "rustc_version 0.4.0", - "sentry-core", - "uname", -] - -[[package]] -name = "sentry-core" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a4591a2d128af73b1b819ab95f143bc6a2fbe48cd23a4c45e1ee32177e66ae6" -dependencies = [ - "once_cell", - "rand", - "sentry-types", - "serde", - "serde_json", -] - -[[package]] -name = "sentry-panic" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "696c74c5882d5a0d5b4a31d0ff3989b04da49be7983b7f52a52c667da5b480bf" -dependencies = [ - "sentry-backtrace", - "sentry-core", -] - -[[package]] -name = "sentry-types" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "823923ae5f54a729159d720aa12181673044ee5c79cbda3be09e56f885e5468f" -dependencies = [ - "debugid", - "getrandom", - "hex", - "serde", - "serde_json", - "thiserror", - "time 0.3.17", - "url", - "uuid", -] - [[package]] name = "serde" version = "1.0.147" @@ -3576,7 +3469,7 @@ dependencies = [ "if_chain", "lazy_static", "regex", - "rustc_version 0.2.3", + "rustc_version", "serde", "serde_json", "url", @@ -3638,7 +3531,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" dependencies = [ "discard", - "rustc_version 0.2.3", + "rustc_version", "stdweb-derive", "stdweb-internal-macros", "stdweb-internal-runtime", @@ -5321,7 +5214,7 @@ dependencies = [ [[package]] name = "turbo-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "mimalloc", ] @@ -5329,7 +5222,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", "auto-hash-map", @@ -5358,7 +5251,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", "cargo-lock", @@ -5370,7 +5263,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", "dotenvy", @@ -5381,10 +5274,26 @@ dependencies = [ "turbo-tasks-fs", ] +[[package]] +name = "turbo-tasks-fetch" +version = "0.1.0" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" +dependencies = [ + "anyhow", + "indexmap", + "lazy_static", + "reqwest", + "serde", + "tokio", + "turbo-tasks", + "turbo-tasks-build", + "turbo-tasks-memory", +] + [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", "auto-hash-map", @@ -5408,7 +5317,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "base16", "hex", @@ -5420,7 +5329,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", "convert_case", @@ -5434,7 +5343,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "proc-macro2", "quote", @@ -5444,7 +5353,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", "auto-hash-map", @@ -5452,9 +5361,11 @@ dependencies = [ "dashmap", "nohash-hasher", "num_cpus", + "once_cell", "parking_lot", "rustc-hash", "tokio", + "turbo-malloc", "turbo-tasks", "turbo-tasks-build", "turbo-tasks-hash", @@ -5463,7 +5374,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", "lazy_static", @@ -5485,7 +5396,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", "clap", @@ -5501,7 +5412,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", "async-trait", @@ -5527,7 +5438,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", "async-trait", @@ -5546,7 +5457,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", "futures", @@ -5575,7 +5486,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", "async-trait", @@ -5608,7 +5519,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", "serde", @@ -5623,7 +5534,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", "serde", @@ -5638,7 +5549,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", "futures", @@ -5662,7 +5573,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "anyhow", "serde", @@ -5678,7 +5589,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=cc024fa59f1c3ad253e74eefe86e0386455455d1#cc024fa59f1c3ad253e74eefe86e0386455455d1" +source = "git+https://github.com/kwonoj/turbo.git?rev=40a67a321c3633a5ecc5b567eb0521f9823ab878#40a67a321c3633a5ecc5b567eb0521f9823ab878" dependencies = [ "swc_core 0.45.4", "turbo-tasks", @@ -5715,15 +5626,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" -[[package]] -name = "uname" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -dependencies = [ - "libc", -] - [[package]] name = "unicase" version = "2.6.0" @@ -5791,7 +5693,6 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde", ] [[package]] @@ -5806,16 +5707,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" -[[package]] -name = "uuid" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" -dependencies = [ - "getrandom", - "serde", -] - [[package]] name = "valuable" version = "0.1.0" @@ -6328,9 +6219,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ "webpki", ] diff --git a/packages/next-swc/crates/napi/Cargo.toml b/packages/next-swc/crates/napi/Cargo.toml index 479fc76001449..c2777523bac57 100644 --- a/packages/next-swc/crates/napi/Cargo.toml +++ b/packages/next-swc/crates/napi/Cargo.toml @@ -8,31 +8,33 @@ publish = false crate-type = ["cdylib", "rlib"] [features] -default = [] +default = ["rustls-tls"] # Instead of enabling all the plugin-related features by default, make it explicitly specified # when build (i.e napi --build --features plugin), same for the wasm as well. # this is due to some of transitive dependencies have features cannot be enabled at the same time # (i.e wasmer/default vs wasmer/js-default) while cargo merges all the features at once. -plugin = [ - "swc_core/plugin_transform_host_native", - "next-swc/plugin" -] -sentry_native_tls = ["_sentry_native_tls"] -sentry_rustls = ["_sentry_rustls"] +plugin = ["swc_core/plugin_transform_host_native", "next-swc/plugin"] +native-tls = ["next-dev/native-tls", "mdxjs/native-tls"] +rustls-tls = ["next-dev/rustls-tls", "mdxjs/rustls-tls"] [dependencies] anyhow = "1.0.66" backtrace = "0.3" fxhash = "0.2.1" -napi = { version = "2", default-features = false, features = ["napi3", "serde-json", "tokio_rt", "error_anyhow"] } +napi = { version = "2", default-features = false, features = [ + "napi3", + "serde-json", + "tokio_rt", + "error_anyhow", +] } napi-derive = "2" -next-swc = {version = "0.0.0", path = "../core"} +next-swc = { version = "0.0.0", path = "../core" } once_cell = "1.13.0" serde = "1" serde_json = "1" swc_core = { features = [ "allocator_node", - "base_concurrent", # concurrent? + "base_concurrent", # concurrent? "base_node", "common_concurrent", "ecma_ast", @@ -55,21 +57,16 @@ tracing = { version = "0.1.37", features = ["release_max_level_info"] } tracing-futures = "0.2.5" tracing-subscriber = "0.3.9" tracing-chrome = "0.5.0" -next-dev = { git = "https://github.com/vercel/turbo.git", rev = "cc024fa59f1c3ad253e74eefe86e0386455455d1", features = ["serializable"] } -node-file-trace = { git = "https://github.com/vercel/turbo.git", rev = "cc024fa59f1c3ad253e74eefe86e0386455455d1", default-features = false, features = ["node-api"] } -mdxjs = { version = "0.1.3", features = ["serializable"] } -# There are few build targets we can't use native-tls which default features rely on, -# allow to specify alternative (rustls) instead via features. -# Note to opt in rustls default-features should be disabled -# (--no-default-features --features sentry_rustls) -_sentry_native_tls = { package = "sentry", version = "0.27.0", optional = true } -_sentry_rustls = { package = "sentry", version = "0.27.0", default-features = false, features = [ - "backtrace", - "contexts", - "panic", - "rustls", - "reqwest" -], optional = true } +next-dev = { git = "https://github.com/kwonoj/turbo.git", rev = "40a67a321c3633a5ecc5b567eb0521f9823ab878", default-features = false, features = [ + "serializable", + "custom_allocator", +] } +node-file-trace = { git = "https://github.com/kwonoj/turbo.git", rev = "40a67a321c3633a5ecc5b567eb0521f9823ab878", default-features = false, features = [ + "node-api", +] } +mdxjs = { git = "https://github.com/kwonoj/mdxjs-rs.git", rev = "94c1b72177820d0c629bf77442817fe53dedfbcd", default-features = false, features = [ + "serializable", +] } [build-dependencies] napi-build = "2" diff --git a/packages/next-swc/crates/wasm/Cargo.toml b/packages/next-swc/crates/wasm/Cargo.toml index 968c9f8fe2e93..5a51d74ce33dc 100644 --- a/packages/next-swc/crates/wasm/Cargo.toml +++ b/packages/next-swc/crates/wasm/Cargo.toml @@ -8,30 +8,32 @@ version = "0.0.0" crate-type = ["cdylib"] [features] -default = ["swc_v1"] -swc_v1 = [] +default = ["swc_v1", "mdxjs/native-tls"] +swc_v1 = [] -plugin = [ - "getrandom/js", - "swc_core/plugin_transform_host_js" -] +plugin = ["getrandom/js", "swc_core/plugin_transform_host_js"] [dependencies] anyhow = "1.0.66" console_error_panic_hook = "0.1.6" -next-swc = {version = "0.0.0", path = "../core"} +next-swc = { version = "0.0.0", path = "../core" } once_cell = "1.13.0" parking_lot_core = "=0.8.0" path-clean = "0.1" -serde = {version = "1", features = ["derive"]} +serde = { version = "1", features = ["derive"] } serde_json = "1" -tracing = { version = "0.1.37", features = ["release_max_level_off","max_level_off"] } -wasm-bindgen = {version = "0.2", features = ["enable-interning"]} +tracing = { version = "0.1.37", features = [ + "release_max_level_off", + "max_level_off", +] } +wasm-bindgen = { version = "0.2", features = ["enable-interning"] } wasm-bindgen-futures = "0.4.8" getrandom = { version = "0.2.5", optional = true, default-features = false } js-sys = "0.3.59" serde-wasm-bindgen = "0.4.3" -mdxjs = { version = "0.1.3", features = ["serializable"] } +mdxjs = { git = "https://github.com/kwonoj/mdxjs-rs.git", rev = "94c1b72177820d0c629bf77442817fe53dedfbcd", default-features = false, features = [ + "serializable", +] } swc_core = { features = [ "common_concurrent", @@ -45,7 +47,7 @@ swc_core = { features = [ "ecma_parser", "ecma_parser_typescript", "ecma_utils", - "ecma_visit" + "ecma_visit", ], version = "0.45.4" } diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json index bf3622233a846..5fcbda4946605 100644 --- a/packages/next-swc/package.json +++ b/packages/next-swc/package.json @@ -3,8 +3,10 @@ "version": "13.0.7-canary.4", "private": true, "scripts": { - "build-native": "napi build --platform -p next-swc-napi --cargo-name next_swc_napi --features plugin --js false native", + "build-native": "napi build --platform -p next-swc-napi --cargo-name next_swc_napi --features plugin,rustls-tls --js false native", + "build-native-woa": "napi build --platform -p next-swc-napi --cargo-name next_swc_napi --features plugin,native-tls --js false native", "build-native-no-plugin": "napi build --platform -p next-swc-napi --cargo-name next_swc_napi --js false native", + "build-native-no-plugin-woa": "napi build --platform -p next-swc-napi --cargo-name next_swc_napi --cargo-flags=--no-default-features --features native-tls --js false native", "build-wasm": "wasm-pack build crates/wasm --scope=next", "cache-build-native": "echo $(ls native)" }, diff --git a/turbo.json b/turbo.json index 8b9d0365efa81..21c50734074ee 100644 --- a/turbo.json +++ b/turbo.json @@ -9,6 +9,10 @@ "dependsOn": ["^build-native-no-plugin"], "outputs": ["native/*.node"] }, + "build-native-no-plugin-woa": { + "dependsOn": ["^build-native-no-plugin-woa"], + "outputs": ["native/*.node"] + }, "build-wasm": { "dependsOn": ["^build-wasm"], "outputs": ["crates/wasm/pkg/*"]