@faasjs/load 0.0.2-beta.322 → 0.0.2-beta.326

package/dist/index.js

@@ -1,8 +1,6 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
 var __export = (target, all) => {
@@ -17,9 +15,6 @@ var __reExport = (target, module2, copyDefault, desc) => {
   }
   return target;
 };
-var __toESM = (module2, isNodeMode) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", !isNodeMode && module2 && module2.__esModule ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
-};
 var __toCommonJS = /* @__PURE__ */ ((cache) => {
   return (module2, temp) => {
     return cache && cache.get(module2) || (temp = __reExport(__markAsModule({}), module2, 1), cache && cache.set(module2, temp), temp);
@@ -85,69 +80,7 @@ var import_deep_merge2 = require("@faasjs/deep_merge");
 var import_fs2 = require("fs");
 var import_rollup = require("rollup");
 var import_path2 = require("path");
-var import_plugin_node_resolve = __toESM(require("@rollup/plugin-node-resolve"));
-var import_core = require("@swc/core");
-var FAAS_PACKAGES = [
-  "@faasjs/ant-design",
-  "@faasjs/aws",
-  "@faasjs/browser",
-  "@faasjs/cli",
-  "@faasjs/cloud_function",
-  "create-faas-app",
-  "@faasjs/deep_merge",
-  "@faasjs/deployer",
-  "@faasjs/eslint-config-recommended",
-  "@faasjs/eslint-config-vue",
-  "faasjs",
-  "@faasjs/func",
-  "@faasjs/graphql-server",
-  "@faasjs/http",
-  "@faasjs/knex",
-  "@faasjs/load",
-  "@faasjs/logger",
-  "@faasjs/react",
-  "@faasjs/redis",
-  "@faasjs/request",
-  "@faasjs/server",
-  "@faasjs/tencentcloud",
-  "@faasjs/test",
-  "@faasjs/vue-plugin"
-];
-var NODE_PACKAGES = [
-  "async_hooks",
-  "child_process",
-  "cluster",
-  "crypto",
-  "dns",
-  "events",
-  "fs",
-  "http",
-  "http2",
-  "https",
-  "inspector",
-  "net",
-  "os",
-  "path",
-  "perf_hooks",
-  "process",
-  "querystring",
-  "readline",
-  "repl",
-  "stream",
-  "string_decoder",
-  "tls",
-  "trace_events",
-  "tty",
-  "dgram",
-  "udp4",
-  "url",
-  "util",
-  "v8",
-  "vm",
-  "wasi",
-  "worker_threads",
-  "zlib"
-];
+var import_ts_transform = require("@faasjs/ts-transform");
 function resolveModuleBasePath(moduleName) {
   const moduleMainFilePath = require.resolve(moduleName);
   const moduleNameParts = moduleName.split("/");
@@ -194,54 +127,41 @@ function findModule(list, key, options = { excludes: [] }) {
   }
   deps.map((d) => findModule(list, d, options));
 }
-function swc(options) {
+function swc(externalModules) {
   return {
     name: "swc",
     async transform(code, filename) {
-      options.filename = filename;
-      return (0, import_core.transform)(code, options);
+      return (0, import_ts_transform.bundle)({
+        filename,
+        externalModules
+      });
     }
   };
 }
 async function loadTs(filename, options = Object.create(null)) {
   var _a;
   const PackageJSON = require(`${process.cwd()}/package.json`);
-  const external = PackageJSON.dependencies ? FAAS_PACKAGES.concat(Object.keys(PackageJSON.dependencies)) : FAAS_PACKAGES;
+  const external = PackageJSON.dependencies ? Object.keys(PackageJSON.dependencies) : [];
   if (options.modules && options.modules.excludes == null)
     options.modules.excludes = [];
   const input = (0, import_deep_merge2.deepMerge)({
     input: filename,
     external,
-    plugins: [
-      (0, import_plugin_node_resolve.default)({
-        extensions: [
-          ".ts",
-          ".tsx",
-          ".js",
-          ".jsx"
-        ]
-      }),
-      swc({
-        jsc: {
-          parser: { syntax: "typescript" },
-          target: "es2021"
-        }
-      })
-    ],
+    plugins: [swc(external)],
     onwarn: () => null
   }, options.input || {});
-  const bundle = await (0, import_rollup.rollup)(input);
+  const bundle2 = await (0, import_rollup.rollup)(input);
   const dependencies = Object.create(null);
-  for (const m of ((_a = bundle.cache) == null ? void 0 : _a.modules) || [])
+  for (const m of ((_a = bundle2.cache) == null ? void 0 : _a.modules) || [])
     for (const d of m.dependencies)
-      if (!d.startsWith("/") && !dependencies[d] && !NODE_PACKAGES.includes(d))
+      if (!d.startsWith("/") && !dependencies[d] && !import_ts_transform.NodeBuiltinModules.includes(d))
         dependencies[d] = "*";
   const output = (0, import_deep_merge2.deepMerge)({
     file: filename + ".tmp.js",
     format: "cjs",
     exports: "auto"
   }, options.output || {});
-  await bundle.write(output);
+  await bundle2.write(output);
   const result = Object.create(null);
   result.dependencies = dependencies;
   result.module = require(output.file);

package/dist/index.mjs

@@ -66,69 +66,7 @@ import {
   sep as sep2,
   dirname as dirname2
 } from "path";
-import resolve from "@rollup/plugin-node-resolve";
-import { transform } from "@swc/core";
-var FAAS_PACKAGES = [
-  "@faasjs/ant-design",
-  "@faasjs/aws",
-  "@faasjs/browser",
-  "@faasjs/cli",
-  "@faasjs/cloud_function",
-  "create-faas-app",
-  "@faasjs/deep_merge",
-  "@faasjs/deployer",
-  "@faasjs/eslint-config-recommended",
-  "@faasjs/eslint-config-vue",
-  "faasjs",
-  "@faasjs/func",
-  "@faasjs/graphql-server",
-  "@faasjs/http",
-  "@faasjs/knex",
-  "@faasjs/load",
-  "@faasjs/logger",
-  "@faasjs/react",
-  "@faasjs/redis",
-  "@faasjs/request",
-  "@faasjs/server",
-  "@faasjs/tencentcloud",
-  "@faasjs/test",
-  "@faasjs/vue-plugin"
-];
-var NODE_PACKAGES = [
-  "async_hooks",
-  "child_process",
-  "cluster",
-  "crypto",
-  "dns",
-  "events",
-  "fs",
-  "http",
-  "http2",
-  "https",
-  "inspector",
-  "net",
-  "os",
-  "path",
-  "perf_hooks",
-  "process",
-  "querystring",
-  "readline",
-  "repl",
-  "stream",
-  "string_decoder",
-  "tls",
-  "trace_events",
-  "tty",
-  "dgram",
-  "udp4",
-  "url",
-  "util",
-  "v8",
-  "vm",
-  "wasi",
-  "worker_threads",
-  "zlib"
-];
+import { bundle, NodeBuiltinModules } from "@faasjs/ts-transform";
 function resolveModuleBasePath(moduleName) {
   const moduleMainFilePath = __require.resolve(moduleName);
   const moduleNameParts = moduleName.split("/");
@@ -175,54 +113,41 @@ function findModule(list, key, options = { excludes: [] }) {
   }
   deps.map((d) => findModule(list, d, options));
 }
-function swc(options) {
+function swc(externalModules) {
   return {
     name: "swc",
     async transform(code, filename) {
-      options.filename = filename;
-      return transform(code, options);
+      return bundle({
+        filename,
+        externalModules
+      });
     }
   };
 }
 async function loadTs(filename, options = Object.create(null)) {
   var _a;
   const PackageJSON = __require(`${process.cwd()}/package.json`);
-  const external = PackageJSON.dependencies ? FAAS_PACKAGES.concat(Object.keys(PackageJSON.dependencies)) : FAAS_PACKAGES;
+  const external = PackageJSON.dependencies ? Object.keys(PackageJSON.dependencies) : [];
   if (options.modules && options.modules.excludes == null)
     options.modules.excludes = [];
   const input = deepMerge2({
     input: filename,
     external,
-    plugins: [
-      resolve({
-        extensions: [
-          ".ts",
-          ".tsx",
-          ".js",
-          ".jsx"
-        ]
-      }),
-      swc({
-        jsc: {
-          parser: { syntax: "typescript" },
-          target: "es2021"
-        }
-      })
-    ],
+    plugins: [swc(external)],
     onwarn: () => null
   }, options.input || {});
-  const bundle = await rollup(input);
+  const bundle2 = await rollup(input);
   const dependencies = Object.create(null);
-  for (const m of ((_a = bundle.cache) == null ? void 0 : _a.modules) || [])
+  for (const m of ((_a = bundle2.cache) == null ? void 0 : _a.modules) || [])
     for (const d of m.dependencies)
-      if (!d.startsWith("/") && !dependencies[d] && !NODE_PACKAGES.includes(d))
+      if (!d.startsWith("/") && !dependencies[d] && !NodeBuiltinModules.includes(d))
         dependencies[d] = "*";
   const output = deepMerge2({
     file: filename + ".tmp.js",
     format: "cjs",
     exports: "auto"
   }, options.output || {});
-  await bundle.write(output);
+  await bundle2.write(output);
   const result = Object.create(null);
   result.dependencies = dependencies;
   result.module = __require(output.file);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/load",
-  "version": "0.0.2-beta.322",
+  "version": "0.0.2-beta.326",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,16 +16,16 @@
   },
   "funding": "https://github.com/sponsors/faasjs",
   "scripts": {
-    "build": "rm -rf ./dist && tsup-node src/index.ts --format esm,cjs --dts"
+    "build": "tsup-node src/index.ts --format esm,cjs",
+    "build:types": "tsup-node src/index.ts --dts-only"
   },
   "files": [
     "dist"
   ],
   "peerDependencies": {
-    "@faasjs/deep_merge": "^0.0.2-beta.322",
-    "@faasjs/func": "^0.0.2-beta.322",
-    "@rollup/plugin-node-resolve": "*",
-    "@swc/core": "*",
+    "@faasjs/deep_merge": "^0.0.2-beta.326",
+    "@faasjs/func": "^0.0.2-beta.326",
+    "@faasjs/ts-transform": "^0.0.2-beta.326",
     "js-yaml": "*",
     "rollup": "*"
   },
@@ -36,6 +36,5 @@
   },
   "engines": {
     "npm": ">=8.0.0"
-  },
-  "gitHead": "4a9f699171ad7e20d922e68b74418d1ec5b7d016"
+  }
 }