fix: always write moduleResolution to tsconfig.json#37302
Closed
balazsorban44 wants to merge 29 commits intocanaryfrom
Closed
fix: always write moduleResolution to tsconfig.json#37302balazsorban44 wants to merge 29 commits intocanaryfrom
moduleResolution to tsconfig.json#37302balazsorban44 wants to merge 29 commits intocanaryfrom
Conversation
balazsorban44
commented
May 30, 2022
| parsedValues: [ | ||
| ts.ModuleResolutionKind.NodeJs, | ||
| ts.ModuleResolutionKind.Node12, | ||
| ts.ModuleResolutionKind.Node16, |
Member
Author
There was a problem hiding this comment.
Member
There was a problem hiding this comment.
Should we leave in Node12 for backwards compat with older TS versions?
Member
Author
There was a problem hiding this comment.
balazsorban44
commented
May 30, 2022
timneutkens
changed the title
moduleResolution to tsconfig.jsonmoduleResolution to tsconfig.json
Contributor
|
This is weird. Looks like a bug in pnpm. Maybe related to |
Contributor
|
Actually, I have removed the lockfile + node_modules, I ran |
Contributor
|
@zkochan Thanks for your reply! It seems that @balazsorban44 indeed updated the lockfile (checkfile changes), but somehow typescript 4.6.3 is still there during CI tests. Any clues? |
ijjk
added
the
create-next-app
Contributor
|
I see an issue with caniuse-lite. You should update the version of caniuse-lite in "resolutions" here: Line 201 in 2acac8a to version 1.0.30001346 |
…rcel/next.js into fix/write-trsconfig-module-resolution
Contributor
|
FYI, I do have a similar top-level devDeps version issue when I was working on #37164, where I upgrade |
Member
Author
|
Thanks, it looks like I'm getting a different error on the last build, so I think I can continue with the PR. Will get back go to it. |
balazsorban44
commented
Jul 14, 2022
| "moduleResolution": "node", | ||
| "jsx": "react" | ||
| "jsx": "react", | ||
| "skipLibCheck": true |
Member
Author
There was a problem hiding this comment.
Member
Author
|
Builds locally now, so |
…rcel/next.js into fix/write-trsconfig-module-resolution
Member
Stats from current PRDefault Build (Increase detected
|
| vercel/next.js canary | vercel/next.js fix/write-trsconfig-module-resolution | Change | |
|---|---|---|---|
| buildDuration | 25.7s | 24.6s | -1s |
| buildDurationCached | 8.5s | 8.4s | -126ms |
| nodeModulesSize | 2.26 GB | 2.26 GB | |
| nextStartRea..uration (ms) | 343ms | 326ms | -17ms |
| nextDevReadyDuration | 346ms | 357ms |
Page Load Tests Overall increase ✓
| vercel/next.js canary | vercel/next.js fix/write-trsconfig-module-resolution | Change | |
|---|---|---|---|
| / failed reqs | 0 | 0 | ✓ |
| / total time (seconds) | 6.264 | 6.16 | -0.1 |
| / avg req/sec | 399.13 | 405.81 | +6.68 |
| /error-in-render failed reqs | 0 | 0 | ✓ |
| /error-in-render total time (seconds) | 3.199 | 3.12 | -0.08 |
| /error-in-render avg req/sec | 781.55 | 801.3 | +19.75 |
Client Bundles (main, webpack) Overall decrease ✓
| vercel/next.js canary | vercel/next.js fix/write-trsconfig-module-resolution | Change | |
|---|---|---|---|
| 299.HASH.js gzip | 179 B | 180 B | |
| framework-HASH.js gzip | 42 kB | 42 kB | ✓ |
| main-HASH.js gzip | 30.7 kB | 30.7 kB | -18 B |
| webpack-HASH.js gzip | 1.54 kB | 1.54 kB | |
| Overall change | 74.5 kB | 74.5 kB | -16 B |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | vercel/next.js fix/write-trsconfig-module-resolution | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 31 kB | 31 kB | ✓ |
| Overall change | 31 kB | 31 kB | ✓ |
Client Pages Overall decrease ✓
| vercel/next.js canary | vercel/next.js fix/write-trsconfig-module-resolution | Change | |
|---|---|---|---|
| _app-HASH.js gzip | 831 B | 828 B | -3 B |
| _error-HASH.js gzip | 194 B | 194 B | ✓ |
| amp-HASH.js gzip | 495 B | 498 B | |
| css-HASH.js gzip | 328 B | 328 B | ✓ |
| dynamic-HASH.js gzip | 2.47 kB | 2.47 kB | ✓ |
| head-HASH.js gzip | 356 B | 353 B | -3 B |
| hooks-HASH.js gzip | 805 B | 805 B | ✓ |
| image-HASH.js gzip | 5.21 kB | 5.2 kB | -9 B |
| index-HASH.js gzip | 263 B | 263 B | ✓ |
| link-HASH.js gzip | 2.38 kB | 2.38 kB | |
| routerDirect..HASH.js gzip | 321 B | 320 B | -1 B |
| script-HASH.js gzip | 391 B | 392 B | |
| withRouter-HASH.js gzip | 318 B | 319 B | |
| 85e02e95b279..7e3.css gzip | 107 B | 107 B | ✓ |
| Overall change | 14.5 kB | 14.5 kB | -9 B |
Client Build Manifests
| vercel/next.js canary | vercel/next.js fix/write-trsconfig-module-resolution | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 459 B | 459 B | ✓ |
| Overall change | 459 B | 459 B | ✓ |
Rendered Page Sizes Overall increase ⚠️
| vercel/next.js canary | vercel/next.js fix/write-trsconfig-module-resolution | Change | |
|---|---|---|---|
| index.html gzip | 520 B | 523 B | |
| link.html gzip | 534 B | 536 B | |
| withRouter.html gzip | 515 B | 517 B | |
| Overall change | 1.57 kB | 1.58 kB |
Middleware size
| vercel/next.js canary | vercel/next.js fix/write-trsconfig-module-resolution | Change | |
|---|---|---|---|
| middleware.js gzip | 16.9 kB | 16.9 kB | ✓ |
| edge-runtime..pack.js gzip | 1.83 kB | 1.83 kB | ✓ |
| Overall change | 18.8 kB | 18.8 kB | ✓ |
Diffs
Diff for middleware.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[826],
{
- /***/ 776: /***/ (
+ /***/ 457: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -14,7 +14,7 @@
/* harmony export */
});
/* harmony import */ var next_dist_server_web_adapter__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
- 222
+ 35
);
// The condition is true when the "process" module is provided
@@ -24,7 +24,7 @@
__webpack_require__.g.process = process;
}
- var mod = __webpack_require__(724);
+ var mod = __webpack_require__(623);
var handler = mod.middleware || mod.default;
if (typeof handler !== "function") {
@@ -50,7 +50,7 @@
/***/
},
- /***/ 724: /***/ (
+ /***/ 623: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -62,7 +62,7 @@
/* harmony export */
});
/* harmony import */ var next_server__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
- 335
+ 897
);
/* harmony import */ var next_server__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(
next_server__WEBPACK_IMPORTED_MODULE_0__
@@ -75,7 +75,7 @@
/***/
},
- /***/ 734: /***/ (__unused_webpack_module, exports) => {
+ /***/ 242: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -95,7 +95,7 @@
/***/
},
- /***/ 893: /***/ (__unused_webpack_module, exports) => {
+ /***/ 936: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -133,7 +133,7 @@
/***/
},
- /***/ 142: /***/ (__unused_webpack_module, exports) => {
+ /***/ 846: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -165,7 +165,7 @@
/***/
},
- /***/ 777: /***/ (
+ /***/ 893: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -176,8 +176,8 @@
value: true
});
exports.addLocale = addLocale;
- var _addPathPrefix = __webpack_require__(774);
- var _pathHasPrefix = __webpack_require__(841);
+ var _addPathPrefix = __webpack_require__(466);
+ var _pathHasPrefix = __webpack_require__(590);
function addLocale(path, locale, defaultLocale, ignorePrefix) {
if (
locale &&
@@ -197,7 +197,7 @@
/***/
},
- /***/ 774: /***/ (
+ /***/ 466: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -208,7 +208,7 @@
value: true
});
exports.addPathPrefix = addPathPrefix;
- var _parsePath = __webpack_require__(70);
+ var _parsePath = __webpack_require__(422);
function addPathPrefix(path, prefix) {
if (!path.startsWith("/") || !prefix) {
return path;
@@ -220,7 +220,7 @@
/***/
},
- /***/ 114: /***/ (
+ /***/ 458: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -231,7 +231,7 @@
value: true
});
exports.addPathSuffix = addPathSuffix;
- var _parsePath = __webpack_require__(70);
+ var _parsePath = __webpack_require__(422);
function addPathSuffix(path, suffix) {
if (!path.startsWith("/") || !suffix) {
return path;
@@ -243,17 +243,21 @@
/***/
},
- /***/ 36: /***/ (__unused_webpack_module, exports, __webpack_require__) => {
+ /***/ 613: /***/ (
+ __unused_webpack_module,
+ exports,
+ __webpack_require__
+ ) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.formatNextPathnameInfo = formatNextPathnameInfo;
- var _removeTrailingSlash = __webpack_require__(675);
- var _addPathPrefix = __webpack_require__(774);
- var _addPathSuffix = __webpack_require__(114);
- var _addLocale = __webpack_require__(777);
+ var _removeTrailingSlash = __webpack_require__(77);
+ var _addPathPrefix = __webpack_require__(466);
+ var _addPathSuffix = __webpack_require__(458);
+ var _addLocale = __webpack_require__(893);
function formatNextPathnameInfo(info) {
let pathname = (0, _addLocale).addLocale(
info.pathname,
@@ -281,7 +285,7 @@
/***/
},
- /***/ 763: /***/ (
+ /***/ 769: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -292,9 +296,9 @@
value: true
});
exports.getNextPathnameInfo = getNextPathnameInfo;
- var _normalizeLocalePath = __webpack_require__(142);
- var _removePathPrefix = __webpack_require__(565);
- var _pathHasPrefix = __webpack_require__(841);
+ var _normalizeLocalePath = __webpack_require__(846);
+ var _removePathPrefix = __webpack_require__(344);
+ var _pathHasPrefix = __webpack_require__(590);
function getNextPathnameInfo(pathname, options) {
var _nextConfig;
const { basePath, i18n, trailingSlash } =
@@ -344,7 +348,7 @@
/***/
},
- /***/ 70: /***/ (__unused_webpack_module, exports) => {
+ /***/ 422: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -380,7 +384,7 @@
/***/
},
- /***/ 841: /***/ (
+ /***/ 590: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -391,7 +395,7 @@
value: true
});
exports.pathHasPrefix = pathHasPrefix;
- var _parsePath = __webpack_require__(70);
+ var _parsePath = __webpack_require__(422);
function pathHasPrefix(path, prefix) {
if (typeof path !== "string") {
return false;
@@ -403,7 +407,7 @@
/***/
},
- /***/ 564: /***/ (__unused_webpack_module, exports) => {
+ /***/ 52: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -422,7 +426,7 @@
/***/
},
- /***/ 565: /***/ (
+ /***/ 344: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -433,7 +437,7 @@
value: true
});
exports.removePathPrefix = removePathPrefix;
- var _pathHasPrefix = __webpack_require__(841);
+ var _pathHasPrefix = __webpack_require__(590);
function removePathPrefix(path, prefix) {
if ((0, _pathHasPrefix).pathHasPrefix(path, prefix)) {
const withoutPrefix = path.slice(prefix.length);
@@ -447,7 +451,7 @@
/***/
},
- /***/ 675: /***/ (__unused_webpack_module, exports) => {
+ /***/ 77: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -461,7 +465,7 @@
/***/
},
- /***/ 748: /***/ module => {
+ /***/ 54: /***/ module => {
var __dirname = "/";
(() => {
"use strict";
@@ -589,12 +593,12 @@
/***/
},
- /***/ 491: /***/ (module, exports, __webpack_require__) => {
+ /***/ 826: /***/ (module, exports, __webpack_require__) => {
var __dirname = "/";
var __WEBPACK_AMD_DEFINE_RESULT__;
(() => {
var i = {
- 613: function(i, s) {
+ 412: function(i, s) {
/*!@license
* UAParser.js v0.7.28
* Lightweight JavaScript-based User-Agent string parser
@@ -1424,18 +1428,14 @@
}
if (typeof __nccwpck_require__ !== "undefined")
__nccwpck_require__.ab = __dirname + "/";
- var e = __nccwpck_require__(613);
+ var e = __nccwpck_require__(412);
module.exports = e;
})();
/***/
},
- /***/ 222: /***/ (
- __unused_webpack_module,
- exports,
- __webpack_require__
- ) => {
+ /***/ 35: /***/ (__unused_webpack_module, exports, __webpack_require__) => {
"use strict";
var __webpack_unused_export__;
@@ -1444,13 +1444,13 @@
};
exports.VL = adapter;
exports.OT = blockUnallowedResponse;
- var _error = __webpack_require__(626);
- var _utils = __webpack_require__(20);
- var _fetchEvent = __webpack_require__(575);
- var _request = __webpack_require__(989);
- var _response = __webpack_require__(690);
- var _relativizeUrl = __webpack_require__(564);
- var _nextUrl = __webpack_require__(685);
+ var _error = __webpack_require__(182);
+ var _utils = __webpack_require__(93);
+ var _fetchEvent = __webpack_require__(339);
+ var _request = __webpack_require__(67);
+ var _response = __webpack_require__(367);
+ var _relativizeUrl = __webpack_require__(52);
+ var _nextUrl = __webpack_require__(322);
async function adapter(params) {
const requestUrl = new _nextUrl.NextURL(params.request.url, {
headers: params.request.headers,
@@ -1616,7 +1616,7 @@
/***/
},
- /***/ 626: /***/ (__unused_webpack_module, exports) => {
+ /***/ 182: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -1657,7 +1657,7 @@
/***/
},
- /***/ 685: /***/ (
+ /***/ 322: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -1667,10 +1667,10 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
- var _detectDomainLocale = __webpack_require__(893);
- var _formatNextPathnameInfo = __webpack_require__(36);
- var _getHostname = __webpack_require__(734);
- var _getNextPathnameInfo = __webpack_require__(763);
+ var _detectDomainLocale = __webpack_require__(936);
+ var _formatNextPathnameInfo = __webpack_require__(613);
+ var _getHostname = __webpack_require__(242);
+ var _getNextPathnameInfo = __webpack_require__(769);
const Internal = Symbol("NextURLInternal");
class NextURL {
constructor(input, baseOrOpts, opts) {
@@ -1891,7 +1891,7 @@
/***/
},
- /***/ 508: /***/ (
+ /***/ 256: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -1907,8 +1907,8 @@
return _types.CookieSerializeOptions;
}
});
- var _cookie = _interopRequireDefault(__webpack_require__(748));
- var _types = __webpack_require__(229);
+ var _cookie = _interopRequireDefault(__webpack_require__(54));
+ var _types = __webpack_require__(880);
function _interopRequireDefault(obj) {
return obj && obj.__esModule
? obj
@@ -2040,7 +2040,7 @@
/***/
},
- /***/ 575: /***/ (
+ /***/ 339: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -2051,7 +2051,7 @@
value: true
});
exports.waitUntilSymbol = void 0;
- var _error = __webpack_require__(626);
+ var _error = __webpack_require__(182);
const responseSymbol = Symbol("response");
const passThroughSymbol = Symbol("passThrough");
const waitUntilSymbol = Symbol("waitUntil");
@@ -2104,21 +2104,17 @@
/***/
},
- /***/ 989: /***/ (
- __unused_webpack_module,
- exports,
- __webpack_require__
- ) => {
+ /***/ 67: /***/ (__unused_webpack_module, exports, __webpack_require__) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.INTERNALS = void 0;
- var _nextUrl = __webpack_require__(685);
- var _utils = __webpack_require__(20);
- var _error = __webpack_require__(626);
- var _cookies = __webpack_require__(508);
+ var _nextUrl = __webpack_require__(322);
+ var _utils = __webpack_require__(93);
+ var _error = __webpack_require__(182);
+ var _cookies = __webpack_require__(256);
const INTERNALS = Symbol("internal request");
exports.INTERNALS = INTERNALS;
class NextRequest extends Request {
@@ -2165,7 +2161,7 @@
/***/
},
- /***/ 690: /***/ (
+ /***/ 367: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -2175,9 +2171,9 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
- var _nextUrl = __webpack_require__(685);
- var _utils = __webpack_require__(20);
- var _cookies = __webpack_require__(508);
+ var _nextUrl = __webpack_require__(322);
+ var _utils = __webpack_require__(93);
+ var _cookies = __webpack_require__(256);
const INTERNALS = Symbol("internal response");
const REDIRECTS = new Set([301, 302, 303, 307, 308]);
class NextResponse extends Response {
@@ -2252,7 +2248,7 @@
/***/
},
- /***/ 240: /***/ (
+ /***/ 932: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -2266,7 +2262,7 @@
__webpack_unused_export__ = isBot;
exports.Nf = userAgentFromString;
exports.WE = userAgent;
- var _uaParserJs = _interopRequireDefault(__webpack_require__(491));
+ var _uaParserJs = _interopRequireDefault(__webpack_require__(826));
function _interopRequireDefault(obj) {
return obj && obj.__esModule
? obj
@@ -2294,7 +2290,7 @@
/***/
},
- /***/ 229: /***/ (__unused_webpack_module, exports) => {
+ /***/ 880: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -2306,7 +2302,7 @@
/***/
},
- /***/ 20: /***/ (__unused_webpack_module, exports) => {
+ /***/ 93: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -2421,17 +2417,17 @@
/***/
},
- /***/ 335: /***/ (
+ /***/ 897: /***/ (
module,
__unused_webpack_exports,
__webpack_require__
) => {
module.exports = {
- NextRequest: __webpack_require__(989).NextRequest,
- NextResponse: __webpack_require__(690).NextResponse,
- userAgentFromString: __webpack_require__(240) /* .userAgentFromString */
+ NextRequest: __webpack_require__(67).NextRequest,
+ NextResponse: __webpack_require__(367).NextResponse,
+ userAgentFromString: __webpack_require__(932) /* .userAgentFromString */
.Nf,
- userAgent: __webpack_require__(240) /* .userAgent */.WE
+ userAgent: __webpack_require__(932) /* .userAgent */.WE
};
/***/
@@ -2441,7 +2437,7 @@
// webpackRuntimeModules
/******/ var __webpack_exec__ = moduleId =>
__webpack_require__((__webpack_require__.s = moduleId));
- /******/ var __webpack_exports__ = __webpack_exec__(776);
+ /******/ var __webpack_exports__ = __webpack_exec__(457);
/******/ (_ENTRIES =
typeof _ENTRIES === "undefined"
? {}Diff for _buildManifest.js
@@ -1,25 +1,25 @@
self.__BUILD_MANIFEST = {
__rewrites: { beforeFiles: [], afterFiles: [], fallback: [] },
- "/": ["static\u002Fchunks\u002Fpages\u002Findex-006025f296d93d1f.js"],
- "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-ec6f2dc249481230.js"],
- "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-a331316989d05f14.js"],
+ "/": ["static\u002Fchunks\u002Fpages\u002Findex-1ecb7a225a122304.js"],
+ "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-7c674188292aca70.js"],
+ "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-abb2ab71d4fb2340.js"],
"/css": [
"static\u002Fcss\u002F94fdbc56eafa2039.css",
- "static\u002Fchunks\u002Fpages\u002Fcss-68d7610c482ac563.js"
+ "static\u002Fchunks\u002Fpages\u002Fcss-100e45427e857c65.js"
],
"/dynamic": [
- "static\u002Fchunks\u002Fpages\u002Fdynamic-3137f3fcef911984.js"
+ "static\u002Fchunks\u002Fpages\u002Fdynamic-f7dcf0e6a86067b9.js"
],
- "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-c040cbe8d466bcb1.js"],
- "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-691547ee2366d57c.js"],
- "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-d0e0710bc503b145.js"],
- "/link": ["static\u002Fchunks\u002Fpages\u002Flink-57e4afc02d731b98.js"],
+ "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-d456b89ea2e58ccb.js"],
+ "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-0b406ece32365f1b.js"],
+ "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-91ab0fd4386a6eb0.js"],
+ "/link": ["static\u002Fchunks\u002Fpages\u002Flink-5371ff33c95fd8f2.js"],
"/routerDirect": [
- "static\u002Fchunks\u002Fpages\u002FrouterDirect-19c824ccc8950973.js"
+ "static\u002Fchunks\u002Fpages\u002FrouterDirect-8a036a4ae9e5d6ed.js"
],
- "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-c3bfac97d4fbba00.js"],
+ "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-d318755acc6c0b22.js"],
"/withRouter": [
- "static\u002Fchunks\u002Fpages\u002FwithRouter-d6891bab587638a3.js"
+ "static\u002Fchunks\u002Fpages\u002FwithRouter-dee19dca16003991.js"
],
sortedPages: [
"\u002F",Diff for _app-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[888],
{
- /***/ 3479: /***/ function(
+ /***/ 122: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/_app",
function() {
- return __webpack_require__(5909);
+ return __webpack_require__(777);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 5909: /***/ function(
+ /***/ 777: /***/ function(
__unused_webpack_module,
exports,
__webpack_require__
@@ -35,7 +35,7 @@
.Z;
var _createSuper = __webpack_require__(6320) /* ["default"] */.Z;
var _runtimeJs = /*#__PURE__*/ _interopRequireDefault(
- __webpack_require__(739)
+ __webpack_require__(3994)
);
Object.defineProperty(exports, "__esModule", {
value: true
@@ -54,7 +54,7 @@
});
exports["default"] = void 0;
var _react = _interopRequireDefault1(__webpack_require__(9496));
- var _utils = __webpack_require__(2973);
+ var _utils = __webpack_require__(6326);
function asyncGeneratorStep(
gen,
resolve,
@@ -184,7 +184,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 179], function() {
- return __webpack_exec__(3479), __webpack_exec__(3668);
+ return __webpack_exec__(122), __webpack_exec__(7489);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for _error-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[820],
{
- /***/ 2929: /***/ function(
+ /***/ 3560: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/_error",
function() {
- return __webpack_require__(9103);
+ return __webpack_require__(2509);
}
]);
if (false) {
@@ -24,7 +24,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [888, 774, 179], function() {
- return __webpack_exec__(2929);
+ return __webpack_exec__(3560);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for amp-HASH.js
@@ -1,17 +1,17 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[216],
{
- /***/ 94: /***/ function(
+ /***/ 7941: /***/ function(
module,
__unused_webpack_exports,
__webpack_require__
) {
- module.exports = __webpack_require__(2562);
+ module.exports = __webpack_require__(6824);
/***/
},
- /***/ 9028: /***/ function(
+ /***/ 8958: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -19,7 +19,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/amp",
function() {
- return __webpack_require__(6385);
+ return __webpack_require__(9302);
}
]);
if (false) {
@@ -28,7 +28,7 @@
/***/
},
- /***/ 2562: /***/ function(module, exports, __webpack_require__) {
+ /***/ 6824: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -36,8 +36,8 @@
});
exports.useAmp = useAmp;
var _react = _interopRequireDefault(__webpack_require__(9496));
- var _ampContext = __webpack_require__(2556);
- var _ampMode = __webpack_require__(7853);
+ var _ampContext = __webpack_require__(5789);
+ var _ampMode = __webpack_require__(9208);
function _interopRequireDefault(obj) {
return obj && obj.__esModule
? obj
@@ -66,7 +66,7 @@
/***/
},
- /***/ 6385: /***/ function(
+ /***/ 9302: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -83,7 +83,7 @@
/* harmony export */
});
/* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
- 94
+ 7941
);
/* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(
next_amp__WEBPACK_IMPORTED_MODULE_0__
@@ -107,7 +107,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [888, 774, 179], function() {
- return __webpack_exec__(9028);
+ return __webpack_exec__(8958);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for css-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[706],
{
- /***/ 8281: /***/ function(
+ /***/ 9557: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/css",
function() {
- return __webpack_require__(4347);
+ return __webpack_require__(79);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 4347: /***/ function(
+ /***/ 79: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -29,7 +29,7 @@
4637
);
/* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
- 4542
+ 2054
);
/* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
_css_module_css__WEBPACK_IMPORTED_MODULE_1__
@@ -48,7 +48,7 @@
/***/
},
- /***/ 4542: /***/ function(module) {
+ /***/ 2054: /***/ function(module) {
// extracted by mini-css-extract-plugin
module.exports = { helloWorld: "css_helloWorld__qqNwY" };
@@ -61,7 +61,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 888, 179], function() {
- return __webpack_exec__(8281);
+ return __webpack_exec__(9557);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for dynamic-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[739],
{
- /***/ 2744: /***/ function(
+ /***/ 5695: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/dynamic",
function() {
- return __webpack_require__(5547);
+ return __webpack_require__(9525);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 3005: /***/ function(module, exports, __webpack_require__) {
+ /***/ 6014: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -31,7 +31,7 @@
exports["default"] = dynamic;
exports.noSSR = noSSR;
var _react = _interopRequireDefault(__webpack_require__(9496));
- var _loadable = _interopRequireDefault(__webpack_require__(9675));
+ var _loadable = _interopRequireDefault(__webpack_require__(7679));
function dynamic(dynamicOptions, options) {
var loadableFn = _loadable.default;
var loadableOptions = {
@@ -150,7 +150,7 @@
/***/
},
- /***/ 577: /***/ function(
+ /***/ 8416: /***/ function(
__unused_webpack_module,
exports,
__webpack_require__
@@ -177,7 +177,7 @@
/***/
},
- /***/ 9675: /***/ function(
+ /***/ 7679: /***/ function(
__unused_webpack_module,
exports,
__webpack_require__
@@ -194,7 +194,7 @@
});
exports["default"] = void 0;
var _react = _interopRequireDefault(__webpack_require__(9496));
- var _loadableContext = __webpack_require__(577);
+ var _loadableContext = __webpack_require__(8416);
function _extends() {
_extends =
Object.assign ||
@@ -531,7 +531,7 @@
/***/
},
- /***/ 5547: /***/ function(
+ /***/ 9525: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -548,7 +548,7 @@
4637
);
/* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
- 1605
+ 2123
);
/* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
next_dynamic__WEBPACK_IMPORTED_MODULE_1__
@@ -557,13 +557,13 @@
var DynamicHello = next_dynamic__WEBPACK_IMPORTED_MODULE_1___default()(
function() {
return __webpack_require__
- .e(/* import() */ 299)
- .then(__webpack_require__.bind(__webpack_require__, 5299));
+ .e(/* import() */ 128)
+ .then(__webpack_require__.bind(__webpack_require__, 5128));
},
{
loadableGenerated: {
webpack: function() {
- return [/*require.resolve*/ 5299];
+ return [/*require.resolve*/ 5128];
}
}
}
@@ -593,12 +593,12 @@
/***/
},
- /***/ 1605: /***/ function(
+ /***/ 2123: /***/ function(
module,
__unused_webpack_exports,
__webpack_require__
) {
- module.exports = __webpack_require__(3005);
+ module.exports = __webpack_require__(6014);
/***/
},
@@ -700,7 +700,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 888, 179], function() {
- return __webpack_exec__(2744);
+ return __webpack_exec__(5695);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for head-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[645],
{
- /***/ 4337: /***/ function(
+ /***/ 7148: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/head",
function() {
- return __webpack_require__(9288);
+ return __webpack_require__(7481);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 9288: /***/ function(
+ /***/ 7481: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -35,7 +35,7 @@
4637
);
/* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
- 8915
+ 4616
);
/* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
next_head__WEBPACK_IMPORTED_MODULE_1__
@@ -71,12 +71,12 @@
/***/
},
- /***/ 8915: /***/ function(
+ /***/ 4616: /***/ function(
module,
__unused_webpack_exports,
__webpack_require__
) {
- module.exports = __webpack_require__(681);
+ module.exports = __webpack_require__(4790);
/***/
}
@@ -87,7 +87,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 888, 179], function() {
- return __webpack_exec__(4337);
+ return __webpack_exec__(7148);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for hooks-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[757],
{
- /***/ 4853: /***/ function(
+ /***/ 3515: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/hooks",
function() {
- return __webpack_require__(8367);
+ return __webpack_require__(1253);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 8367: /***/ function(
+ /***/ 1253: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -132,7 +132,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 888, 179], function() {
- return __webpack_exec__(4853);
+ return __webpack_exec__(3515);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for image-HASH.js
@@ -26,7 +26,7 @@
/***/
},
- /***/ 7570: /***/ function(
+ /***/ 1487: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -34,7 +34,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/image",
function() {
- return __webpack_require__(1576);
+ return __webpack_require__(4789);
}
]);
if (false) {
@@ -43,7 +43,7 @@
/***/
},
- /***/ 8976: /***/ function(module, exports, __webpack_require__) {
+ /***/ 361: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -57,12 +57,12 @@
});
exports["default"] = Image;
var _react = _interopRequireWildcard(__webpack_require__(9496));
- var _head = _interopRequireDefault(__webpack_require__(681));
- var _imageConfig = __webpack_require__(5282);
- var _useIntersection = __webpack_require__(227);
- var _imageConfigContext = __webpack_require__(8584);
- var _utils = __webpack_require__(2973);
- var _normalizeTrailingSlash = __webpack_require__(3892);
+ var _head = _interopRequireDefault(__webpack_require__(4790));
+ var _imageConfig = __webpack_require__(5676);
+ var _useIntersection = __webpack_require__(5668);
+ var _imageConfigContext = __webpack_require__(76);
+ var _utils = __webpack_require__(6326);
+ var _normalizeTrailingSlash = __webpack_require__(7600);
function Image(_param) {
var src = _param.src,
sizes = _param.sizes,
@@ -1004,7 +1004,7 @@
/***/
},
- /***/ 227: /***/ function(module, exports, __webpack_require__) {
+ /***/ 5668: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -1016,7 +1016,7 @@
});
exports.useIntersection = useIntersection;
var _react = __webpack_require__(9496);
- var _requestIdleCallback = __webpack_require__(5757);
+ var _requestIdleCallback = __webpack_require__(5617);
var hasIntersectionObserver = typeof IntersectionObserver === "function";
function useIntersection(param) {
var rootRef = param.rootRef,
@@ -1149,7 +1149,7 @@
/***/
},
- /***/ 1576: /***/ function(
+ /***/ 4789: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -1170,8 +1170,8 @@
// EXTERNAL MODULE: ./node_modules/.pnpm/react@17.0.2/node_modules/react/jsx-runtime.js
var jsx_runtime = __webpack_require__(4637);
- // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_sfoxds7t5ydpegc3knd667wn6m/node_modules/next/image.js
- var next_image = __webpack_require__(8114);
+ // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_sfoxds7t5ydpegc3knd667wn6m/node_modules/next/image.js
+ var next_image = __webpack_require__(4033);
var image_default = /*#__PURE__*/ __webpack_require__.n(next_image); // CONCATENATED MODULE: ./pages/nextjs.png
/* harmony default export */ var nextjs = {
src: "/_next/static/media/nextjs.cae0b805.png",
@@ -1199,12 +1199,12 @@
/***/
},
- /***/ 8114: /***/ function(
+ /***/ 4033: /***/ function(
module,
__unused_webpack_exports,
__webpack_require__
) {
- module.exports = __webpack_require__(8976);
+ module.exports = __webpack_require__(361);
/***/
}
@@ -1215,7 +1215,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 888, 179], function() {
- return __webpack_exec__(7570);
+ return __webpack_exec__(1487);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for index-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[405],
{
- /***/ 4786: /***/ function(
+ /***/ 6967: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/",
function() {
- return __webpack_require__(5355);
+ return __webpack_require__(3973);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 5355: /***/ function(
+ /***/ 3973: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -46,7 +46,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [888, 774, 179], function() {
- return __webpack_exec__(4786);
+ return __webpack_exec__(6967);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for link-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[644],
{
- /***/ 2783: /***/ function(
+ /***/ 9367: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/link",
function() {
- return __webpack_require__(4917);
+ return __webpack_require__(1849);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 8494: /***/ function(module, exports) {
+ /***/ 1908: /***/ function(module, exports) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -54,7 +54,7 @@
/***/
},
- /***/ 861: /***/ function(module, exports, __webpack_require__) {
+ /***/ 882: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -67,13 +67,13 @@
});
exports["default"] = void 0;
var _react = _interopRequireDefault(__webpack_require__(9496));
- var _router = __webpack_require__(7733);
- var _addLocale = __webpack_require__(6049);
- var _routerContext = __webpack_require__(2488);
- var _appRouterContext = __webpack_require__(1849);
- var _useIntersection = __webpack_require__(227);
- var _getDomainLocale = __webpack_require__(8494);
- var _addBasePath = __webpack_require__(5090);
+ var _router = __webpack_require__(8340);
+ var _addLocale = __webpack_require__(9465);
+ var _routerContext = __webpack_require__(1349);
+ var _appRouterContext = __webpack_require__(3407);
+ var _useIntersection = __webpack_require__(5668);
+ var _getDomainLocale = __webpack_require__(1908);
+ var _addBasePath = __webpack_require__(8126);
function _interopRequireDefault(obj) {
return obj && obj.__esModule
? obj
@@ -410,7 +410,7 @@
/***/
},
- /***/ 227: /***/ function(module, exports, __webpack_require__) {
+ /***/ 5668: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -422,7 +422,7 @@
});
exports.useIntersection = useIntersection;
var _react = __webpack_require__(9496);
- var _requestIdleCallback = __webpack_require__(5757);
+ var _requestIdleCallback = __webpack_require__(5617);
var hasIntersectionObserver = typeof IntersectionObserver === "function";
function useIntersection(param) {
var rootRef = param.rootRef,
@@ -555,7 +555,7 @@
/***/
},
- /***/ 1849: /***/ function(
+ /***/ 3407: /***/ function(
__unused_webpack_module,
exports,
__webpack_require__
@@ -586,7 +586,7 @@
/***/
},
- /***/ 4917: /***/ function(
+ /***/ 1849: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -603,7 +603,7 @@
4637
);
/* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
- 8168
+ 8728
);
/* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
next_link__WEBPACK_IMPORTED_MODULE_1__
@@ -634,12 +634,12 @@
/***/
},
- /***/ 8168: /***/ function(
+ /***/ 8728: /***/ function(
module,
__unused_webpack_exports,
__webpack_require__
) {
- module.exports = __webpack_require__(861);
+ module.exports = __webpack_require__(882);
/***/
}
@@ -650,7 +650,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 888, 179], function() {
- return __webpack_exec__(2783);
+ return __webpack_exec__(9367);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for routerDirect-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[58],
{
- /***/ 5863: /***/ function(
+ /***/ 4538: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/routerDirect",
function() {
- return __webpack_require__(7585);
+ return __webpack_require__(7451);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 7585: /***/ function(
+ /***/ 7451: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -35,7 +35,7 @@
4637
);
/* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
- 9393
+ 7084
);
/* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
next_router__WEBPACK_IMPORTED_MODULE_1__
@@ -57,12 +57,12 @@
/***/
},
- /***/ 9393: /***/ function(
+ /***/ 7084: /***/ function(
module,
__unused_webpack_exports,
__webpack_require__
) {
- module.exports = __webpack_require__(3668);
+ module.exports = __webpack_require__(7489);
/***/
}
@@ -73,7 +73,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 888, 179], function() {
- return __webpack_exec__(5863);
+ return __webpack_exec__(4538);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for script-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[797],
{
- /***/ 581: /***/ function(
+ /***/ 2644: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/script",
function() {
- return __webpack_require__(6723);
+ return __webpack_require__(5292);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 6723: /***/ function(
+ /***/ 5292: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -35,7 +35,7 @@
4637
);
/* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
- 2311
+ 7635
);
/* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
next_script__WEBPACK_IMPORTED_MODULE_1__
@@ -70,12 +70,12 @@
/***/
},
- /***/ 2311: /***/ function(
+ /***/ 7635: /***/ function(
module,
__unused_webpack_exports,
__webpack_require__
) {
- module.exports = __webpack_require__(3948);
+ module.exports = __webpack_require__(3951);
/***/
}
@@ -86,7 +86,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 888, 179], function() {
- return __webpack_exec__(581);
+ return __webpack_exec__(2644);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for withRouter-HASH.js
@@ -1,7 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[807],
{
- /***/ 4573: /***/ function(
+ /***/ 5577: /***/ function(
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/withRouter",
function() {
- return __webpack_require__(667);
+ return __webpack_require__(2161);
}
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 667: /***/ function(
+ /***/ 2161: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -35,7 +35,7 @@
4637
);
/* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
- 9393
+ 7084
);
/* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
next_router__WEBPACK_IMPORTED_MODULE_1__
@@ -54,12 +54,12 @@
/***/
},
- /***/ 9393: /***/ function(
+ /***/ 7084: /***/ function(
module,
__unused_webpack_exports,
__webpack_require__
) {
- module.exports = __webpack_require__(3668);
+ module.exports = __webpack_require__(7489);
/***/
}
@@ -70,7 +70,7 @@
return __webpack_require__((__webpack_require__.s = moduleId));
};
/******/ __webpack_require__.O(0, [774, 888, 179], function() {
- return __webpack_exec__(4573);
+ return __webpack_exec__(5577);
});
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for 299.HASH.js
@@ -1,8 +1,8 @@
"use strict";
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
- [299],
+ [128],
{
- /***/ 5299: /***/ function(
+ /***/ 5128: /***/ function(
__unused_webpack_module,
__webpack_exports__,
__webpack_require__Diff for framework-HASH.js
@@ -19,7 +19,7 @@
Modernizr 3.0.0pre (Custom Build) | MIT
*/
var aa = __webpack_require__(9496),
- m = __webpack_require__(9260),
+ m = __webpack_require__(2048),
r = __webpack_require__(8051);
function y(a) {
for (
@@ -7895,7 +7895,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
- __webpack_require__(9260);
+ __webpack_require__(2048);
var f = __webpack_require__(9496),
g = 60103;
exports.Fragment = 60107;
@@ -7948,7 +7948,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
- var l = __webpack_require__(9260),
+ var l = __webpack_require__(2048),
n = 60103,
p = 60106;
exports.Fragment = 60107;Diff for main-HASH.js
@@ -736,7 +736,7 @@
/***/
},
- /***/ 9260: /***/ function(module) {
+ /***/ 2048: /***/ function(module) {
"use strict";
var assign = Object.assign.bind(Object);
@@ -748,7 +748,7 @@
/***/
},
- /***/ 1326: /***/ function() {
+ /***/ 3071: /***/ function() {
"trimStart" in String.prototype ||
(String.prototype.trimStart = String.prototype.trimLeft),
"trimEnd" in String.prototype ||
@@ -792,15 +792,15 @@
/***/
},
- /***/ 5090: /***/ function(module, exports, __webpack_require__) {
+ /***/ 8126: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.addBasePath = addBasePath;
- var _addPathPrefix = __webpack_require__(3795);
- var _normalizeTrailingSlash = __webpack_require__(3892);
+ var _addPathPrefix = __webpack_require__(6341);
+ var _normalizeTrailingSlash = __webpack_require__(7600);
var basePath = false || "";
function addBasePath(path, required) {
if (false) {
@@ -824,7 +824,7 @@
/***/
},
- /***/ 6049: /***/ function(module, exports, __webpack_require__) {
+ /***/ 9465: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -835,7 +835,7 @@
value: true
});
exports.addLocale = void 0;
- var _normalizeTrailingSlash = __webpack_require__(3892);
+ var _normalizeTrailingSlash = __webpack_require__(7600);
var addLocale = function(path) {
for (
var _len = arguments.length,
@@ -867,7 +867,7 @@
/***/
},
- /***/ 4354: /***/ function(module, exports, __webpack_require__) {
+ /***/ 5770: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -906,14 +906,14 @@
/***/
},
- /***/ 6926: /***/ function(module, exports, __webpack_require__) {
+ /***/ 6298: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.hasBasePath = hasBasePath;
- var _pathHasPrefix = __webpack_require__(4298);
+ var _pathHasPrefix = __webpack_require__(7189);
var basePath = false || "";
function hasBasePath(path) {
return (0, _pathHasPrefix).pathHasPrefix(path, basePath);
@@ -933,7 +933,7 @@
/***/
},
- /***/ 7172: /***/ function(module, exports, __webpack_require__) {
+ /***/ 4862: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -1111,7 +1111,7 @@
/***/
},
- /***/ 3215: /***/ function(module, exports, __webpack_require__) {
+ /***/ 864: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -1127,7 +1127,7 @@
var _slicedToArray = __webpack_require__(8693) /* ["default"] */.Z;
var _createSuper = __webpack_require__(6320) /* ["default"] */.Z;
var _runtimeJs = /*#__PURE__*/ _interopRequireDefault(
- __webpack_require__(739)
+ __webpack_require__(3994)
);
Object.defineProperty(exports, "__esModule", {
value: true
@@ -1135,27 +1135,27 @@
exports.initialize = initialize;
exports.hydrate = hydrate;
exports.emitter = exports.router = exports.version = void 0;
- __webpack_require__(1326);
+ __webpack_require__(3071);
var _react = _interopRequireWildcard1(__webpack_require__(9496));
- var _headManagerContext = __webpack_require__(9043);
- var _mitt = _interopRequireDefault1(__webpack_require__(7097));
- var _routerContext = __webpack_require__(2488);
- var _isDynamic = __webpack_require__(7046);
- var _querystring = __webpack_require__(3742);
- var _runtimeConfig = __webpack_require__(5780);
- var _utils = __webpack_require__(2973);
- var _portal = __webpack_require__(2321);
- var _headManager = _interopRequireDefault1(__webpack_require__(7172));
- var _pageLoader = _interopRequireDefault1(__webpack_require__(7822));
+ var _headManagerContext = __webpack_require__(5533);
+ var _mitt = _interopRequireDefault1(__webpack_require__(5228));
+ var _routerContext = __webpack_require__(1349);
+ var _isDynamic = __webpack_require__(8227);
+ var _querystring = __webpack_require__(8418);
+ var _runtimeConfig = __webpack_require__(537);
+ var _utils = __webpack_require__(6326);
+ var _portal = __webpack_require__(1278);
+ var _headManager = _interopRequireDefault1(__webpack_require__(4862));
+ var _pageLoader = _interopRequireDefault1(__webpack_require__(689));
var _performanceRelayer = _interopRequireDefault1(
- __webpack_require__(3367)
+ __webpack_require__(5148)
);
- var _routeAnnouncer = __webpack_require__(9851);
- var _router = __webpack_require__(3668);
- var _isError = __webpack_require__(467);
- var _imageConfigContext = __webpack_require__(8584);
- var _removeBasePath = __webpack_require__(8117);
- var _hasBasePath = __webpack_require__(6926);
+ var _routeAnnouncer = __webpack_require__(6314);
+ var _router = __webpack_require__(7489);
+ var _isError = __webpack_require__(6040);
+ var _imageConfigContext = __webpack_require__(76);
+ var _removeBasePath = __webpack_require__(976);
+ var _hasBasePath = __webpack_require__(6298);
function asyncGeneratorStep(
gen,
resolve,
@@ -1456,7 +1456,7 @@
if (false) {
}
if (initialData.scriptLoader) {
- initScriptLoader = __webpack_require__(3948)
+ initScriptLoader = __webpack_require__(3951)
.initScriptLoader;
initScriptLoader(initialData.scriptLoader);
}
@@ -1776,7 +1776,7 @@
? Promise.resolve()
.then(function() {
return /*#__PURE__*/ _interopRequireWildcard(
- __webpack_require__(9103)
+ __webpack_require__(2509)
);
})
.then(function(m) {
@@ -2202,10 +2202,10 @@
/***/
},
- /***/ 7205: /***/ function(module, exports, __webpack_require__) {
+ /***/ 9916: /***/ function(module, exports, __webpack_require__) {
"use strict";
- var _ = __webpack_require__(3215);
+ var _ = __webpack_require__(864);
window.next = {
version: _.version,
// router is initialized later so it has to be live-binded
@@ -2235,15 +2235,15 @@
/***/
},
- /***/ 3892: /***/ function(module, exports, __webpack_require__) {
+ /***/ 7600: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.normalizePathTrailingSlash = void 0;
- var _removeTrailingSlash = __webpack_require__(7131);
- var _parsePath = __webpack_require__(2478);
+ var _removeTrailingSlash = __webpack_require__(390);
+ var _parsePath = __webpack_require__(3429);
var normalizePathTrailingSlash = function(path) {
if (!path.startsWith("/")) {
return path;
@@ -2275,7 +2275,7 @@
/***/
},
- /***/ 7822: /***/ function(module, exports, __webpack_require__) {
+ /***/ 689: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -2287,16 +2287,16 @@
value: true
});
exports["default"] = void 0;
- var _addBasePath = __webpack_require__(5090);
- var _router = __webpack_require__(7733);
+ var _addBasePath = __webpack_require__(8126);
+ var _router = __webpack_require__(8340);
var _getAssetPathFromRoute = _interopRequireDefault(
- __webpack_require__(7862)
+ __webpack_require__(8153)
);
- var _addLocale = __webpack_require__(6049);
- var _isDynamic = __webpack_require__(7046);
- var _parseRelativeUrl = __webpack_require__(860);
- var _removeTrailingSlash = __webpack_require__(7131);
- var _routeLoader = __webpack_require__(9042);
+ var _addLocale = __webpack_require__(9465);
+ var _isDynamic = __webpack_require__(8227);
+ var _parseRelativeUrl = __webpack_require__(6893);
+ var _removeTrailingSlash = __webpack_require__(390);
+ var _routeLoader = __webpack_require__(4358);
function _interopRequireDefault(obj) {
return obj && obj.__esModule
? obj
@@ -2448,14 +2448,14 @@
/***/
},
- /***/ 3367: /***/ function(module, exports, __webpack_require__) {
+ /***/ 5148: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports["default"] = void 0;
- var _webVitals = __webpack_require__(5583);
+ var _webVitals = __webpack_require__(4867);
var initialHref = location.href;
var isRegistered = false;
var userReportHandler;
@@ -2503,7 +2503,7 @@
/***/
},
- /***/ 2321: /***/ function(module, exports, __webpack_require__) {
+ /***/ 1278: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -2565,14 +2565,14 @@
/***/
},
- /***/ 8117: /***/ function(module, exports, __webpack_require__) {
+ /***/ 976: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.removeBasePath = removeBasePath;
- var _hasBasePath = __webpack_require__(6926);
+ var _hasBasePath = __webpack_require__(6298);
var basePath = false || "";
function removeBasePath(path) {
if (false) {
@@ -2596,14 +2596,14 @@
/***/
},
- /***/ 6736: /***/ function(module, exports, __webpack_require__) {
+ /***/ 8953: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.removeLocale = removeLocale;
- var _parsePath = __webpack_require__(2478);
+ var _parsePath = __webpack_require__(3429);
function removeLocale(path, locale) {
if (false) {
var localeLower, pathLower, pathname;
@@ -2625,7 +2625,7 @@
/***/
},
- /***/ 5757: /***/ function(module, exports) {
+ /***/ 5617: /***/ function(module, exports) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -2671,7 +2671,7 @@
/***/
},
- /***/ 9851: /***/ function(module, exports, __webpack_require__) {
+ /***/ 6314: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -2684,7 +2684,7 @@
exports.RouteAnnouncer = RouteAnnouncer;
exports["default"] = void 0;
var _react = _interopRequireDefault(__webpack_require__(9496));
- var _router = __webpack_require__(3668);
+ var _router = __webpack_require__(7489);
function _interopRequireDefault(obj) {
return obj && obj.__esModule
? obj
@@ -2768,7 +2768,7 @@
/***/
},
- /***/ 9042: /***/ function(module, exports, __webpack_require__) {
+ /***/ 4358: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -2779,10 +2779,10 @@
exports.getClientBuildManifest = getClientBuildManifest;
exports.createRouteLoader = createRouteLoader;
var _getAssetPathFromRoute = _interopRequireDefault(
- __webpack_require__(7862)
+ __webpack_require__(8153)
);
- var _trustedTypes = __webpack_require__(8541);
- var _requestIdleCallback = __webpack_require__(5757);
+ var _trustedTypes = __webpack_require__(6973);
+ var _requestIdleCallback = __webpack_require__(5617);
function _interopRequireDefault(obj) {
return obj && obj.__esModule
? obj
@@ -3155,7 +3155,7 @@
/***/
},
- /***/ 3668: /***/ function(module, exports, __webpack_require__) {
+ /***/ 7489: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -3183,10 +3183,10 @@
exports.makePublicRouterInstance = makePublicRouterInstance;
exports["default"] = void 0;
var _react = _interopRequireDefault(__webpack_require__(9496));
- var _router = _interopRequireDefault(__webpack_require__(7733));
- var _routerContext = __webpack_require__(2488);
- var _isError = _interopRequireDefault(__webpack_require__(467));
- var _withRouter = _interopRequireDefault(__webpack_require__(7257));
+ var _router = _interopRequireDefault(__webpack_require__(8340));
+ var _routerContext = __webpack_require__(1349);
+ var _isError = _interopRequireDefault(__webpack_require__(6040));
+ var _withRouter = _interopRequireDefault(__webpack_require__(2847));
function _interopRequireDefault(obj) {
return obj && obj.__esModule
? obj
@@ -3410,7 +3410,7 @@
/***/
},
- /***/ 3948: /***/ function(module, exports, __webpack_require__) {
+ /***/ 3951: /***/ function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -3425,9 +342
Post job cleanup.
[command]/usr/bin/git version
git version 2.37.0
Temporarily overriding HOME='/home/runner/work/_temp/ab91b914-c42c-4be7-8c7b-7d2f05bbdb14' before making global git config changes
Adding repository directory to the temporary git global config as a safe directory
[command]/usr/bin/git config --global --add safe.directory /home/runner/work/next.js/next.js
[command]/usr/bin/git config --local --name-only --get-regexp core\.sshCommand
[command]/usr/bin/git submodule foreach --recursive git config --local --name-only --get-regexp 'core\.sshCommand' && git config --local --unset-all 'core.sshCommand' || :
[command]/usr/bin/git config --local --name-only --get-regexp http\.https\:\/\/github\.com\/\.extraheader
http.https://github.com/.extraheader
[command]/usr/bin/git config --local --unset-all http.https://github.com/.extraheader
[command]/usr/bin/git submodule foreach --recursive git config --local --name-only --get-regexp 'http\.https\:\/\/github\.com\/\.extraheader' && git config --local --unset-all 'http.https://github.com/.extraheader' || :
Cleaning up orphan processes
Commit: 62b8306b543f1027e9c94dbf64f6afde3c38ea97
Member
Failing test suitesCommit: 62b8306
Expand output● yarn PnP › should compile and serve the index page correctly with-next-sass ● Test suite failed to run ● Test suite failed to run Read more about building and testing Next.js in contributing.md.
Expand output● yarn PnP › should compile and serve the index page correctly progressive-web-app ● Test suite failed to run ● Test suite failed to run Read more about building and testing Next.js in contributing.md.
Expand output● correct tsconfig.json defaults › should add ● correct tsconfig.json defaults › should add ● Test suite failed to run Read more about building and testing Next.js in contributing.md. |
balazsorban44
force-pushed
the
fix/write-trsconfig-module-resolution
branch
from
12b4516 to
c86ed94
Compare
balazsorban44
requested review from
huozhi,
ijjk,
shuding,
styfle and
timneutkens
as code owners
Member
Author
|
Should be good to review now, the last failing test seemed to be unrelated. Did not need to change any code other than upgrading TypeScript though 👀 |
styfle
reviewed
Jul 14, 2022
| "loader-utils2": "npm:loader-utils@2.0.0", | ||
| "loader-utils3": "npm:loader-utils@3.1.3", | ||
| "loader-utils2": "npm:loader-utils@^2.0.0", | ||
| "loader-utils3": "npm:loader-utils@^3.1.3", |
Member
There was a problem hiding this comment.
The ^ might make this resolve differently when new versions are released
Member
Author
There was a problem hiding this comment.
was autoedited by pnpm. I can try to revert it through 👍
3 tasks
ijjk
added a commit
that referenced
this pull request
Aug 22, 2022
This removes the usage of `Node12` from the `parsedValues` for `moduleResolution` as this caused false detection of `undefined` being a valid value when it was removed in TypeScript. This also copies over the test from #37302 to ensure we don't regress on this. ## Bug - [x] Related issues linked using `fixes #number` - [x] Integration tests added - [x] Errors have helpful link attached, see `contributing.md` Fixes: #37296 Closes: #37302
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Something has changed between TypeScript
4.6.3and4.7.2andmoduleResolutionisn't added any more to the default generatedtsconfig.jsonwhich creates a conflict becauseresolveJsonModule: truerequires it.Fixes #37296
Bug
fixes #numbercontributing.mdFeature
fixes #numbercontributing.mdDocumentation / Examples
pnpm lint