@cedarjs/prerender 1.0.0-canary.12471 → 1.0.0-canary.12473

package/dist/build-and-import/buildAndImport.d.ts

@@ -1,3 +1,12 @@
-import type { Options } from './types';
+interface Options {
+    /** The filepath to bundle and require */
+    filepath: string;
+    /**
+     * Preserve compiled temporary file for debugging
+     * Default to `process.env.BUNDLE_REQUIRE_PRESERVE`
+     */
+    preserveTemporaryFile?: boolean;
+}
 export declare function buildAndImport(options: Options): Promise<Record<string, React.FunctionComponent>>;
+export {};
 //# sourceMappingURL=buildAndImport.d.ts.map

package/dist/build-and-import/buildAndImport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildAndImport.d.ts","sourceRoot":"","sources":["../../src/build-and-import/buildAndImport.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AActC,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAmIlD"}
+{"version":3,"file":"buildAndImport.d.ts","sourceRoot":"","sources":["../../src/build-and-import/buildAndImport.ts"],"names":[],"mappings":"AAsCA,UAAU,OAAO;IACf,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAA;IAEhB;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAiIlD"}

package/dist/build-and-import/buildAndImport.js

@@ -37,7 +37,6 @@ var import_plugin_alias = __toESM(require("@rollup/plugin-alias"));
 var import_plugin_commonjs = __toESM(require("@rollup/plugin-commonjs"));
 var import_plugin_node_resolve = require("@rollup/plugin-node-resolve");
 var import_plugin_replace = __toESM(require("@rollup/plugin-replace"));
-var import_load_tsconfig = require("load-tsconfig");
 var import_rollup = require("rollup");
 var import_unplugin = __toESM(require("unimport/unplugin"));
 var import_project_config = require("@cedarjs/project-config");
@@ -60,14 +59,17 @@ async function buildAndImport(options) {
   if (!(0, import_utils.isValidJsFile)(options.filepath)) {
     throw new Error(`${options.filepath} is not a valid JS file`);
   }
-  const cwd = options.cwd || process.cwd();
-  const tsconfig = options.tsconfig === false ? void 0 : typeof options.tsconfig === "string" || !options.tsconfig ? (0, import_load_tsconfig.loadTsConfig)(cwd, options.tsconfig) : { data: options.tsconfig, path: void 0 };
+  console.log("options", options);
+  const tsConfigs = (0, import_internal.parseTypeScriptConfigFiles)();
+  console.log(
+    "tsConfigs.web?.data.compilerOptions",
+    tsConfigs.web?.compilerOptions
+  );
   const resolvePaths = tsconfigPathsToRegExp(
-    tsconfig?.data.compilerOptions?.paths || {}
+    tsConfigs.web?.compilerOptions?.paths || {}
   );
   const config = (0, import_project_config.getConfig)();
   const useTrustedDocumentsGqlTag = config.graphql.trustedDocuments;
-  const tsConfigs = (0, import_internal.parseTypeScriptConfigFiles)();
   const webBase = (0, import_project_config.getPaths)().web.base;
   const outDir = import_node_path.default.join((0, import_project_config.getPaths)().web.dist, "__prerender");
   if (!import_node_fs.default.existsSync(outDir)) {
@@ -83,10 +85,8 @@ async function buildAndImport(options) {
     external: ["react", "react-dom"],
     plugins: [
       (0, import_rollup_plugin_cedarjs_external.externalPlugin)({
-        external: options.external,
-        notExternal: [...options.notExternal || [], ...resolvePaths],
-        filepath: options.filepath,
-        externalNodeModules: options.externalNodeModules
+        notExternal: resolvePaths,
+        filepath: options.filepath
       }),
       (0, import_plugin_node_resolve.nodeResolve)({
         preferBuiltins: true,
@@ -116,7 +116,7 @@ async function buildAndImport(options) {
       (0, import_rollup_plugin_cedarjs_directory_named_imports.cedarjsDirectoryNamedImportPlugin)(),
       (0, import_rollup_plugin_cedarjs_prerender_media_imports.cedarjsPrerenderMediaImportsPlugin)(),
       (0, import_plugin_commonjs.default)(),
-      (0, import_rollup_plugin_cedarjs_typescript.typescriptPlugin)(options.filepath, tsconfig),
+      (0, import_rollup_plugin_cedarjs_typescript.typescriptPlugin)(options.filepath, tsConfigs.web),
       import_unplugin.default.rollup({
         imports: [
           // import React from 'react'

package/dist/runPrerender.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runPrerender.d.ts","sourceRoot":"","sources":["../src/runPrerender.tsx"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAuP7C,UAAU,eAAe;IACvB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACrC,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,eAAO,MAAM,YAAY,gCAGtB,eAAe,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CA6GzC,CAAA;AAGD,eAAO,MAAM,wBAAwB,mBACnB,MAAM,WACb,MAAM,SAchB,CAAA"}
+{"version":3,"file":"runPrerender.d.ts","sourceRoot":"","sources":["../src/runPrerender.tsx"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAuP7C,UAAU,eAAe;IACvB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACrC,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,eAAO,MAAM,YAAY,gCAGtB,eAAe,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CA4GzC,CAAA;AAGD,eAAO,MAAM,wBAAwB,mBACnB,MAAM,WACb,MAAM,SAchB,CAAA"}

package/dist/runPrerender.js

@@ -209,7 +209,6 @@ const runPrerender = async ({
       outDir: prerenderDistPath
     });
     const required = await (0, import_buildAndImport.buildAndImport)({
-      cwd: (0, import_project_config.getPaths)().web.base,
       filepath: entryPath,
       preserveTemporaryFile: true
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/prerender",
-  "version": "1.0.0-canary.12471+cffa35ef3",
+  "version": "1.0.0-canary.12473+bcfdd7059",
   "description": "RedwoodJS prerender",
   "repository": {
     "type": "git",
@@ -40,11 +40,11 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/babel-config": "1.0.0-canary.12471",
-    "@cedarjs/project-config": "1.0.0-canary.12471",
-    "@cedarjs/router": "1.0.0-canary.12471",
-    "@cedarjs/structure": "1.0.0-canary.12471",
-    "@cedarjs/web": "1.0.0-canary.12471",
+    "@cedarjs/babel-config": "1.0.0-canary.12473",
+    "@cedarjs/project-config": "1.0.0-canary.12473",
+    "@cedarjs/router": "1.0.0-canary.12473",
+    "@cedarjs/structure": "1.0.0-canary.12473",
+    "@cedarjs/web": "1.0.0-canary.12473",
     "@rollup/plugin-alias": "5.1.1",
     "@rollup/plugin-commonjs": "28.0.6",
     "@rollup/plugin-node-resolve": "16.0.1",
@@ -61,7 +61,7 @@
     "unimport": "5.0.1"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "1.0.0-canary.12471",
+    "@cedarjs/framework-tools": "1.0.0-canary.12473",
     "@types/mime-types": "2.1.4",
     "babel-plugin-tester": "11.0.4",
     "concurrently": "8.2.2",
@@ -78,5 +78,5 @@
     "react": "react",
     "react-dom": "react-dom"
   },
-  "gitHead": "cffa35ef33e52399d3a9667c0b67b4a1a7518a52"
+  "gitHead": "bcfdd70599a065577d82eb3cba99f36b08ec15cd"
 }

package/dist/build-and-import/types.d.ts

@@ -1,36 +0,0 @@
-import type { RollupOptions } from 'rollup';
-export interface Options {
-    cwd?: string;
-    /** The filepath to bundle and require */
-    filepath: string;
-    /** rollup options */
-    rollupOptions?: RollupOptions & {
-        watch?: undefined | never;
-    };
-    /** External packages */
-    external?: (string | RegExp)[];
-    /** Not external packages */
-    notExternal?: (string | RegExp)[];
-    /**
-     * Automatically mark node_modules as external
-     * @default true - `false` when `filepath` is in node_modules
-     */
-    externalNodeModules?: boolean;
-    /**
-     * A custom tsconfig path to read `paths` option
-     *
-     * Set to `false` to disable tsconfig
-     * Or provide a `TsconfigRaw` object
-     */
-    tsconfig?: string | any | false;
-    /**
-     * Preserve compiled temporary file for debugging
-     * Default to `process.env.BUNDLE_REQUIRE_PRESERVE`
-     */
-    preserveTemporaryFile?: boolean;
-    /** Provide bundle format explicitly to skip the default format inference */
-    format?: 'cjs' | 'esm';
-    /** Returns the name of the output file */
-    getOutputFile?: (filepath: string, format: 'cjs' | 'esm', randomId: string) => string;
-}
-//# sourceMappingURL=types.d.ts.map

package/dist/build-and-import/types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/build-and-import/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AAE3C,MAAM,WAAW,OAAO;IACtB,GAAG,CAAC,EAAE,MAAM,CAAA;IAEZ,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAA;IAGhB,qBAAqB;IACrB,aAAa,CAAC,EAAE,aAAa,GAAG;QAC9B,KAAK,CAAC,EAAE,SAAS,GAAG,KAAK,CAAA;KAC1B,CAAA;IAED,wBAAwB;IACxB,QAAQ,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IAE9B,4BAA4B;IAC5B,WAAW,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IAEjC;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAE7B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,GAAG,GAAG,KAAK,CAAA;IAE/B;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAE/B,4EAA4E;IAC5E,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,CAAA;IAEtB,0CAA0C;IAC1C,aAAa,CAAC,EAAE,CACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,KAAK,GAAG,KAAK,EACrB,QAAQ,EAAE,MAAM,KACb,MAAM,CAAA;CACZ"}

package/dist/build-and-import/types.js

@@ -1,16 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var types_exports = {};
-module.exports = __toCommonJS(types_exports);