next 15.4.0-canary.58 → 15.4.0-canary.59

package/dist/build/preview-key-utils.d.ts

@@ -0,0 +1,5 @@
+import type { __ApiPreviewProps } from '../server/api-utils';
+export declare function generatePreviewKeys({ distDir, isBuild, }: {
+    distDir: string;
+    isBuild: boolean;
+}): Promise<__ApiPreviewProps>;

package/dist/build/preview-key-utils.js

@@ -0,0 +1,91 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "generatePreviewKeys", {
+    enumerable: true,
+    get: function() {
+        return generatePreviewKeys;
+    }
+});
+const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
+const _crypto = /*#__PURE__*/ _interop_require_default(require("crypto"));
+const _cachedir = require("../server/cache-dir");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const CONFIG_FILE = '.previewinfo';
+const PREVIEW_ID = 'previewModeId';
+const PREVIEW_SIGNING_KEY = 'previewModeSigningKey';
+const PREVIEW_ENCRYPTION_KEY = 'previewModeEncryptionKey';
+const PREVIEW_EXPIRE_AT = 'expireAt';
+const EXPIRATION = 1000 * 60 * 60 * 24 * 14 // 14 days
+;
+async function writeCache(distDir, config) {
+    const cacheBaseDir = (0, _cachedir.getStorageDirectory)(distDir);
+    if (!cacheBaseDir) return;
+    const configPath = _path.default.join(cacheBaseDir, CONFIG_FILE);
+    if (!_fs.default.existsSync(cacheBaseDir)) {
+        await _fs.default.promises.mkdir(cacheBaseDir, {
+            recursive: true
+        });
+    }
+    await _fs.default.promises.writeFile(configPath, JSON.stringify({
+        [PREVIEW_ID]: config.previewModeId,
+        [PREVIEW_SIGNING_KEY]: config.previewModeSigningKey,
+        [PREVIEW_ENCRYPTION_KEY]: config.previewModeEncryptionKey,
+        [PREVIEW_EXPIRE_AT]: Date.now() + EXPIRATION
+    }));
+}
+function generateConfig() {
+    return {
+        previewModeId: _crypto.default.randomBytes(16).toString('hex'),
+        previewModeSigningKey: _crypto.default.randomBytes(32).toString('hex'),
+        previewModeEncryptionKey: _crypto.default.randomBytes(32).toString('hex')
+    };
+}
+async function generatePreviewKeys({ distDir, isBuild }) {
+    const cacheBaseDir = (0, _cachedir.getStorageDirectory)(distDir);
+    if (!cacheBaseDir) {
+        // There's no persistent storage available. We generate a new config.
+        // This also covers development time.
+        return generateConfig();
+    }
+    const configPath = _path.default.join(cacheBaseDir, CONFIG_FILE);
+    async function tryReadCachedConfig() {
+        if (!_fs.default.existsSync(configPath)) return false;
+        try {
+            const config = JSON.parse(await _fs.default.promises.readFile(configPath, 'utf8'));
+            if (!config) return false;
+            if (typeof config[PREVIEW_ID] !== 'string' || typeof config[PREVIEW_ENCRYPTION_KEY] !== 'string' || typeof config[PREVIEW_SIGNING_KEY] !== 'string' || typeof config[PREVIEW_EXPIRE_AT] !== 'number') {
+                return false;
+            }
+            // For build time, we need to rotate the key if it's expired. Otherwise
+            // (next start) we have to keep the key as it is so the runtime key matches
+            // the build time key.
+            if (isBuild && config[PREVIEW_EXPIRE_AT] < Date.now()) {
+                return false;
+            }
+            return {
+                previewModeId: config[PREVIEW_ID],
+                previewModeSigningKey: config[PREVIEW_SIGNING_KEY],
+                previewModeEncryptionKey: config[PREVIEW_ENCRYPTION_KEY]
+            };
+        } catch (e) {
+            // Broken config file. We should generate a new key and overwrite it.
+            return false;
+        }
+    }
+    const maybeValidConfig = await tryReadCachedConfig();
+    if (maybeValidConfig !== false) {
+        return maybeValidConfig;
+    }
+    const config = generateConfig();
+    await writeCache(distDir, config);
+    return config;
+}
+
+//# sourceMappingURL=preview-key-utils.js.map

package/dist/build/preview-key-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/build/preview-key-utils.ts"],"sourcesContent":["import path from 'path'\nimport fs from 'fs'\nimport crypto from 'crypto'\nimport type { __ApiPreviewProps } from '../server/api-utils'\nimport { getStorageDirectory } from '../server/cache-dir'\n\nconst CONFIG_FILE = '.previewinfo'\nconst PREVIEW_ID = 'previewModeId'\nconst PREVIEW_SIGNING_KEY = 'previewModeSigningKey'\nconst PREVIEW_ENCRYPTION_KEY = 'previewModeEncryptionKey'\nconst PREVIEW_EXPIRE_AT = 'expireAt'\nconst EXPIRATION = 1000 * 60 * 60 * 24 * 14 // 14 days\n\nasync function writeCache(distDir: string, config: __ApiPreviewProps) {\n  const cacheBaseDir = getStorageDirectory(distDir)\n  if (!cacheBaseDir) return\n\n  const configPath = path.join(cacheBaseDir, CONFIG_FILE)\n  if (!fs.existsSync(cacheBaseDir)) {\n    await fs.promises.mkdir(cacheBaseDir, { recursive: true })\n  }\n  await fs.promises.writeFile(\n    configPath,\n    JSON.stringify({\n      [PREVIEW_ID]: config.previewModeId,\n      [PREVIEW_SIGNING_KEY]: config.previewModeSigningKey,\n      [PREVIEW_ENCRYPTION_KEY]: config.previewModeEncryptionKey,\n      [PREVIEW_EXPIRE_AT]: Date.now() + EXPIRATION,\n    })\n  )\n}\n\nfunction generateConfig() {\n  return {\n    previewModeId: crypto.randomBytes(16).toString('hex'),\n    previewModeSigningKey: crypto.randomBytes(32).toString('hex'),\n    previewModeEncryptionKey: crypto.randomBytes(32).toString('hex'),\n  }\n}\n\n// This utility is used to get a key for the cache directory. If the\n// key is not present, it will generate a new one and store it in the\n// cache directory inside dist.\n// The key will also expire after a certain amount of time. Once it\n// expires, a new one will be generated.\nexport async function generatePreviewKeys({\n  distDir,\n  isBuild,\n}: {\n  distDir: string\n  isBuild: boolean\n}): Promise<__ApiPreviewProps> {\n  const cacheBaseDir = getStorageDirectory(distDir)\n\n  if (!cacheBaseDir) {\n    // There's no persistent storage available. We generate a new config.\n    // This also covers development time.\n    return generateConfig()\n  }\n\n  const configPath = path.join(cacheBaseDir, CONFIG_FILE)\n  async function tryReadCachedConfig(): Promise<false | __ApiPreviewProps> {\n    if (!fs.existsSync(configPath)) return false\n    try {\n      const config = JSON.parse(await fs.promises.readFile(configPath, 'utf8'))\n      if (!config) return false\n      if (\n        typeof config[PREVIEW_ID] !== 'string' ||\n        typeof config[PREVIEW_ENCRYPTION_KEY] !== 'string' ||\n        typeof config[PREVIEW_SIGNING_KEY] !== 'string' ||\n        typeof config[PREVIEW_EXPIRE_AT] !== 'number'\n      ) {\n        return false\n      }\n      // For build time, we need to rotate the key if it's expired. Otherwise\n      // (next start) we have to keep the key as it is so the runtime key matches\n      // the build time key.\n      if (isBuild && config[PREVIEW_EXPIRE_AT] < Date.now()) {\n        return false\n      }\n\n      return {\n        previewModeId: config[PREVIEW_ID],\n        previewModeSigningKey: config[PREVIEW_SIGNING_KEY],\n        previewModeEncryptionKey: config[PREVIEW_ENCRYPTION_KEY],\n      }\n    } catch (e) {\n      // Broken config file. We should generate a new key and overwrite it.\n      return false\n    }\n  }\n  const maybeValidConfig = await tryReadCachedConfig()\n  if (maybeValidConfig !== false) {\n    return maybeValidConfig\n  }\n  const config = generateConfig()\n  await writeCache(distDir, config)\n\n  return config\n}\n"],"names":["generatePreviewKeys","CONFIG_FILE","PREVIEW_ID","PREVIEW_SIGNING_KEY","PREVIEW_ENCRYPTION_KEY","PREVIEW_EXPIRE_AT","EXPIRATION","writeCache","distDir","config","cacheBaseDir","getStorageDirectory","configPath","path","join","fs","existsSync","promises","mkdir","recursive","writeFile","JSON","stringify","previewModeId","previewModeSigningKey","previewModeEncryptionKey","Date","now","generateConfig","crypto","randomBytes","toString","isBuild","tryReadCachedConfig","parse","readFile","e","maybeValidConfig"],"mappings":";;;;+BA6CsBA;;;eAAAA;;;6DA7CL;2DACF;+DACI;0BAEiB;;;;;;AAEpC,MAAMC,cAAc;AACpB,MAAMC,aAAa;AACnB,MAAMC,sBAAsB;AAC5B,MAAMC,yBAAyB;AAC/B,MAAMC,oBAAoB;AAC1B,MAAMC,aAAa,OAAO,KAAK,KAAK,KAAK,GAAG,UAAU;;AAEtD,eAAeC,WAAWC,OAAe,EAAEC,MAAyB;IAClE,MAAMC,eAAeC,IAAAA,6BAAmB,EAACH;IACzC,IAAI,CAACE,cAAc;IAEnB,MAAME,aAAaC,aAAI,CAACC,IAAI,CAACJ,cAAcT;IAC3C,IAAI,CAACc,WAAE,CAACC,UAAU,CAACN,eAAe;QAChC,MAAMK,WAAE,CAACE,QAAQ,CAACC,KAAK,CAACR,cAAc;YAAES,WAAW;QAAK;IAC1D;IACA,MAAMJ,WAAE,CAACE,QAAQ,CAACG,SAAS,CACzBR,YACAS,KAAKC,SAAS,CAAC;QACb,CAACpB,WAAW,EAAEO,OAAOc,aAAa;QAClC,CAACpB,oBAAoB,EAAEM,OAAOe,qBAAqB;QACnD,CAACpB,uBAAuB,EAAEK,OAAOgB,wBAAwB;QACzD,CAACpB,kBAAkB,EAAEqB,KAAKC,GAAG,KAAKrB;IACpC;AAEJ;AAEA,SAASsB;IACP,OAAO;QACLL,eAAeM,eAAM,CAACC,WAAW,CAAC,IAAIC,QAAQ,CAAC;QAC/CP,uBAAuBK,eAAM,CAACC,WAAW,CAAC,IAAIC,QAAQ,CAAC;QACvDN,0BAA0BI,eAAM,CAACC,WAAW,CAAC,IAAIC,QAAQ,CAAC;IAC5D;AACF;AAOO,eAAe/B,oBAAoB,EACxCQ,OAAO,EACPwB,OAAO,EAIR;IACC,MAAMtB,eAAeC,IAAAA,6BAAmB,EAACH;IAEzC,IAAI,CAACE,cAAc;QACjB,qEAAqE;QACrE,qCAAqC;QACrC,OAAOkB;IACT;IAEA,MAAMhB,aAAaC,aAAI,CAACC,IAAI,CAACJ,cAAcT;IAC3C,eAAegC;QACb,IAAI,CAAClB,WAAE,CAACC,UAAU,CAACJ,aAAa,OAAO;QACvC,IAAI;YACF,MAAMH,SAASY,KAAKa,KAAK,CAAC,MAAMnB,WAAE,CAACE,QAAQ,CAACkB,QAAQ,CAACvB,YAAY;YACjE,IAAI,CAACH,QAAQ,OAAO;YACpB,IACE,OAAOA,MAAM,CAACP,WAAW,KAAK,YAC9B,OAAOO,MAAM,CAACL,uBAAuB,KAAK,YAC1C,OAAOK,MAAM,CAACN,oBAAoB,KAAK,YACvC,OAAOM,MAAM,CAACJ,kBAAkB,KAAK,UACrC;gBACA,OAAO;YACT;YACA,uEAAuE;YACvE,2EAA2E;YAC3E,sBAAsB;YACtB,IAAI2B,WAAWvB,MAAM,CAACJ,kBAAkB,GAAGqB,KAAKC,GAAG,IAAI;gBACrD,OAAO;YACT;YAEA,OAAO;gBACLJ,eAAed,MAAM,CAACP,WAAW;gBACjCsB,uBAAuBf,MAAM,CAACN,oBAAoB;gBAClDsB,0BAA0BhB,MAAM,CAACL,uBAAuB;YAC1D;QACF,EAAE,OAAOgC,GAAG;YACV,qEAAqE;YACrE,OAAO;QACT;IACF;IACA,MAAMC,mBAAmB,MAAMJ;IAC/B,IAAII,qBAAqB,OAAO;QAC9B,OAAOA;IACT;IACA,MAAM5B,SAASmB;IACf,MAAMrB,WAAWC,SAASC;IAE1B,OAAOA;AACT","ignoreList":[0]}

package/dist/build/swc/generated-native.d.ts

@@ -347,7 +347,6 @@ export interface NapiIssue {
   detail?: any
   source?: NapiIssueSource
   documentationLink: string
-  subIssues: Array<NapiIssue>
 }
 export interface NapiIssueSource {
   source: NapiSource

package/dist/build/swc/index.js

@@ -123,7 +123,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
-const nextVersion = "15.4.0-canary.58";
+const nextVersion = "15.4.0-canary.59";
 const ArchName = (0, _os.arch)();
 const PlatformName = (0, _os.platform)();
 function infoLog(...args) {

package/dist/build/swc/types.d.ts

@@ -71,7 +71,6 @@ export interface Issue {
         };
     };
     documentationLink: string;
-    subIssues: Issue[];
 }
 export interface Diagnostics {
     category: string;

package/dist/build/webpack-config.js

@@ -1675,7 +1675,7 @@ async function getBaseWebpackConfig(dir, { buildId, encryptionKey, config, compi
             isClient && new _copyfileplugin.CopyFilePlugin({
                 // file path to build output of `@next/polyfill-nomodule`
                 filePath: require.resolve('./polyfills/polyfill-nomodule'),
-                cacheKey: "15.4.0-canary.58",
+                cacheKey: "15.4.0-canary.59",
                 name: `static/chunks/polyfills${dev ? '' : '-[hash]'}.js`,
                 minimize: false,
                 info: {
@@ -1855,7 +1855,7 @@ async function getBaseWebpackConfig(dir, { buildId, encryptionKey, config, compi
         //  - Next.js location on disk (some loaders use absolute paths and some resolve options depend on absolute paths)
         //  - Next.js version
         //  - next.config.js keys that affect compilation
-        version: `${__dirname}|${"15.4.0-canary.58"}|${configVars}`,
+        version: `${__dirname}|${"15.4.0-canary.59"}|${configVars}`,
         cacheDirectory: _path.default.join(distDir, 'cache', 'webpack'),
         // For production builds, it's more efficient to compress all cache files together instead of compression each one individually.
         // So we disable compression here and allow the build runner to take care of compressing the cache as a whole.

package/dist/client/app-bootstrap.js

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "appBootstrap", {
         return appBootstrap;
     }
 });
-const version = "15.4.0-canary.58";
+const version = "15.4.0-canary.59";
 window.next = {
     version,
     appDir: true

package/dist/client/index.js

@@ -61,7 +61,7 @@ const _hooksclientcontextsharedruntime = require("../shared/lib/hooks-client-con
 const _onrecoverableerror = require("./react-client-callbacks/on-recoverable-error");
 const _tracer = /*#__PURE__*/ _interop_require_default._(require("./tracing/tracer"));
 const _isnextroutererror = require("./components/is-next-router-error");
-const version = "15.4.0-canary.58";
+const version = "15.4.0-canary.59";
 let router;
 const emitter = (0, _mitt.default)();
 const looseToArray = (input)=>[].slice.call(input);