Revert "node compatibility typescript infrastructure (#258)" (#262)

This reverts commit dee37c5.
cloudflare · Jan 11, 2023 · e064a8b · e064a8b
1 parent dee37c5
commit e064a8b
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 236 deletions.
diff --git a/build/wd_api_bundle.bzl b/build/wd_api_bundle.bzl
diff --git a/src/node/BUILD.bazel b/src/node/BUILD.bazel
diff --git a/src/node/README.md b/src/node/README.md
diff --git a/src/node/buffer.ts b/src/node/buffer.ts
diff --git a/src/node/internal/bufferImpl.ts b/src/node/internal/bufferImpl.ts
diff --git a/src/node/tsconfig.json b/src/node/tsconfig.json
diff --git a/src/workerd/jsg/BUILD.bazel b/src/workerd/jsg/BUILD.bazel
@@ -16,10 +16,9 @@ wd_cc_library(
     ),
     visibility = ["//visibility:public"],
     deps = [
-        ":modules_capnp",
-        "//src/workerd/util",
         "@capnp-cpp//src/kj",
         "@workerd-v8//:v8",
+        "//src/workerd/util",
     ],
 )
 
@@ -38,10 +37,10 @@ js_capnp_library(
 npm_package(
     name = "jsg_js",
     srcs = [":rtti_capnp_js"],
+    visibility = ["//visibility:public"],
     # Required to ensure source files are copied when running internal builds
     # that depend on `workerd` as an external repository
     include_external_repositories = ["workerd"],
-    visibility = ["//visibility:public"],
 )
 
 wd_cc_library(
@@ -56,12 +55,6 @@ wd_cc_library(
     ],
 )
 
-wd_cc_capnp_library(
-    name = "modules_capnp",
-    srcs = ["modules.capnp"],
-    visibility = ["//visibility:public"],
-)
-
 [kj_test(
     src = f,
     deps = [

diff --git a/src/workerd/jsg/modules.capnp b/src/workerd/jsg/modules.capnp
diff --git a/src/workerd/jsg/modules.h b/src/workerd/jsg/modules.h
@@ -7,7 +7,6 @@
 #include "jsg.h"
 #include <kj/filesystem.h>
 #include <kj/map.h>
-#include <workerd/jsg/modules.capnp.h>
 
 namespace workerd::jsg {
 
@@ -239,14 +238,6 @@ class ModuleRegistryImpl final: public ModuleRegistry {
     entries.insert(Entry(specifier, Type::BUNDLE, kj::fwd<ModuleInfo>(info)));
   }
 
-  void addBuiltinBundle(Bundle::Reader bundle) {
-    for (auto module: bundle.getModules()) {
-      // TODO: asChars() might be wrong for wide characters
-      addBuiltinModule(module.getName(), module.getSrc().asChars(),
-          module.getInternal() ? Type::INTERNAL : Type::BUILTIN);
-    }
-  }
-
   void addBuiltinModule(kj::StringPtr specifier,
                         kj::ArrayPtr<const char> sourceCode,
                         Type type = Type::BUILTIN) {

diff --git a/src/workerd/server/BUILD.bazel b/src/workerd/server/BUILD.bazel
@@ -30,7 +30,6 @@ wd_cc_library(
     deps = [
         ":workerd_capnp",
         "@capnp-cpp//src/capnp:capnpc",
-        "//src/node:bundle",
         "//src/workerd/io",
         "//src/workerd/jsg",
     ],

diff --git a/src/workerd/server/workerd-api.c++ b/src/workerd/server/workerd-api.c++
@@ -23,8 +23,6 @@
 #include <openssl/hmac.h>
 #include <openssl/rand.h>
 
-#include <node/bundle.capnp.h>
-
 namespace workerd::server {
 
 JSG_DECLARE_ISOLATE_TYPE(JsgWorkerdIsolate,
@@ -234,7 +232,6 @@ kj::Own<jsg::ModuleRegistry> WorkerdApiIsolate::compileModules(
     Worker::ValidationErrorReporter& errorReporter) const {
   auto& lock = kj::downcast<JsgWorkerdIsolate::Lock>(lockParam);
   v8::HandleScope scope(lock.v8Isolate);
-  auto& featureFlags = *impl->features;
 
   auto modules = kj::heap<jsg::ModuleRegistryImpl<JsgWorkerdIsolate_TypeWrapper>>();
 
@@ -315,10 +312,6 @@ kj::Own<jsg::ModuleRegistry> WorkerdApiIsolate::compileModules(
     }
   }
 
-  if (featureFlags.getNodeJsCompat()) {
-    modules->addBuiltinBundle(NODE_BUNDLE);
-  }
-
   jsg::setModulesForResolveCallback<JsgWorkerdIsolate_TypeWrapper>(lock, modules);
 
   return modules;