Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
8fdc13af
Unverified
Commit
8fdc13af
authored
Mar 27, 2020
by
Tim Neutkens
Committed by
GitHub
Mar 27, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for comments in tsconfig.json (#11392)
Fixes #11390
parent
a81d7620
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
15 deletions
+47
-15
webpack-config.ts
packages/next/build/webpack-config.ts
+9
-2
package.json
packages/next/package.json
+1
-1
tsconfig.json
test/integration/typescript-paths/tsconfig.json
+2
-0
yarn.lock
yarn.lock
+35
-12
No files found.
packages/next/build/webpack-config.ts
View file @
8fdc13af
...
@@ -11,6 +11,7 @@ import {
...
@@ -11,6 +11,7 @@ import {
PAGES_DIR_ALIAS
,
PAGES_DIR_ALIAS
,
}
from
'../lib/constants'
}
from
'../lib/constants'
import
{
fileExists
}
from
'../lib/file-exists'
import
{
fileExists
}
from
'../lib/file-exists'
import
{
readFileSync
}
from
'fs'
import
{
resolveRequest
}
from
'../lib/resolve-request'
import
{
resolveRequest
}
from
'../lib/resolve-request'
import
{
import
{
CLIENT_STATIC_FILES_RUNTIME_MAIN
,
CLIENT_STATIC_FILES_RUNTIME_MAIN
,
...
@@ -58,6 +59,12 @@ const escapePathVariables = (value: any) => {
...
@@ -58,6 +59,12 @@ const escapePathVariables = (value: any) => {
:
value
:
value
}
}
function
parseJsonFile
(
path
:
string
)
{
const
JSON5
=
require
(
'json5'
)
const
contents
=
readFileSync
(
path
)
return
JSON5
.
parse
(
contents
)
}
function
getOptimizedAliases
(
isServer
:
boolean
):
{
[
pkg
:
string
]:
string
}
{
function
getOptimizedAliases
(
isServer
:
boolean
):
{
[
pkg
:
string
]:
string
}
{
if
(
isServer
)
{
if
(
isServer
)
{
return
{}
return
{}
...
@@ -221,12 +228,12 @@ export default async function getBaseWebpackConfig(
...
@@ -221,12 +228,12 @@ export default async function getBaseWebpackConfig(
let
jsConfig
let
jsConfig
// jsconfig is a subset of tsconfig
// jsconfig is a subset of tsconfig
if
(
useTypeScript
)
{
if
(
useTypeScript
)
{
jsConfig
=
requir
e
(
tsConfigPath
)
jsConfig
=
parseJsonFil
e
(
tsConfigPath
)
}
}
const
jsConfigPath
=
path
.
join
(
dir
,
'jsconfig.json'
)
const
jsConfigPath
=
path
.
join
(
dir
,
'jsconfig.json'
)
if
(
!
useTypeScript
&&
(
await
fileExists
(
jsConfigPath
)))
{
if
(
!
useTypeScript
&&
(
await
fileExists
(
jsConfigPath
)))
{
jsConfig
=
requir
e
(
jsConfigPath
)
jsConfig
=
parseJsonFil
e
(
jsConfigPath
)
}
}
let
resolvedBaseUrl
let
resolvedBaseUrl
...
...
packages/next/package.json
View file @
8fdc13af
...
@@ -108,7 +108,7 @@
...
@@ -108,7 +108,7 @@
"is-docker"
:
"2.0.0"
,
"is-docker"
:
"2.0.0"
,
"is-wsl"
:
"2.1.1"
,
"is-wsl"
:
"2.1.1"
,
"jest-worker"
:
"24.9.0"
,
"jest-worker"
:
"24.9.0"
,
"json5"
:
"2.1.
1
"
,
"json5"
:
"2.1.
2
"
,
"jsonwebtoken"
:
"8.5.1"
,
"jsonwebtoken"
:
"8.5.1"
,
"launch-editor"
:
"2.2.1"
,
"launch-editor"
:
"2.2.1"
,
"loader-utils"
:
"2.0.0"
,
"loader-utils"
:
"2.0.0"
,
...
...
test/integration/typescript-paths/tsconfig.json
View file @
8fdc13af
/*
This
is
a
single
line
comment
to
check
if
that
works
*/
{
{
"compilerOptions"
:
{
"compilerOptions"
:
{
"baseUrl"
:
"."
,
"baseUrl"
:
"."
,
...
@@ -10,6 +11,7 @@
...
@@ -10,6 +11,7 @@
"components/alias-to-d-ts.d.ts"
,
"components/alias-to-d-ts.d.ts"
,
"components/alias-to-d-ts.tsx"
"components/alias-to-d-ts.tsx"
]
]
//
This
is
a
single
line
comment
to
check
if
that
works
},
},
"esModuleInterop"
:
true
,
"esModuleInterop"
:
true
,
"module"
:
"esnext"
,
"module"
:
"esnext"
,
...
...
yarn.lock
View file @
8fdc13af
...
@@ -4157,7 +4157,7 @@ browserify-zlib@^0.2.0:
...
@@ -4157,7 +4157,7 @@ browserify-zlib@^0.2.0:
dependencies:
dependencies:
pako "~1.0.5"
pako "~1.0.5"
browserslist@4.8.3, browserslist@^
1.3.6, browserslist@^1.5.2, browserslist@^1.7.6, browserslist@^
4.0.0, browserslist@^4.3.6, browserslist@^4.6.0, browserslist@^4.6.4, browserslist@^4.8.0, browserslist@^4.8.2, browserslist@^4.8.3:
browserslist@4.8.3, browserslist@^4.0.0, browserslist@^4.3.6, browserslist@^4.6.0, browserslist@^4.6.4, browserslist@^4.8.0, browserslist@^4.8.2, browserslist@^4.8.3:
version "4.8.3"
version "4.8.3"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.3.tgz#65802fcd77177c878e015f0e3189f2c4f627ba44"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.3.tgz#65802fcd77177c878e015f0e3189f2c4f627ba44"
integrity sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==
integrity sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==
...
@@ -4166,6 +4166,14 @@ browserslist@4.8.3, browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.
...
@@ -4166,6 +4166,14 @@ browserslist@4.8.3, browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.
electron-to-chromium "^1.3.322"
electron-to-chromium "^1.3.322"
node-releases "^1.1.44"
node-releases "^1.1.44"
browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
version "1.7.7"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
integrity sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=
dependencies:
caniuse-db "^1.0.30000639"
electron-to-chromium "^1.2.7"
browserstack-local@1.4.0:
browserstack-local@1.4.0:
version "1.4.0"
version "1.4.0"
resolved "https://registry.yarnpkg.com/browserstack-local/-/browserstack-local-1.4.0.tgz#d979cac056f57b9af159b3bcd7fdc09b4354537c"
resolved "https://registry.yarnpkg.com/browserstack-local/-/browserstack-local-1.4.0.tgz#d979cac056f57b9af159b3bcd7fdc09b4354537c"
...
@@ -4469,11 +4477,21 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634:
...
@@ -4469,11 +4477,21 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634:
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001023.tgz#f856f71af16a5a44e81f1fcefc1673912a43da72"
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001023.tgz#f856f71af16a5a44e81f1fcefc1673912a43da72"
integrity sha512-EnlshvE6oAum+wWwKmJNVaoqJMjIc0bLUy4Dj77VVnz1o6bzSPr1Ze9iPy6g5ycg1xD6jGU6vBmo7pLEz2MbCQ==
integrity sha512-EnlshvE6oAum+wWwKmJNVaoqJMjIc0bLUy4Dj77VVnz1o6bzSPr1Ze9iPy6g5ycg1xD6jGU6vBmo7pLEz2MbCQ==
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001012, caniuse-lite@^1.0.30001017, caniuse-lite@^1.0.30001019, caniuse-lite@^1.0.30001020:
caniuse-db@^1.0.30000639:
version "1.0.30001038"
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001038.tgz#439606cdafff1e10e0a795a7ff72fe26965fe8ba"
integrity sha512-yeQ2l99M9upOgMIRfZEdes6HuPbQiRZIMBumUwdXeEQz+faSXUZtZ8xeyEdU+TlJckH09M5NtM038sjKsRa2ow==
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001012, caniuse-lite@^1.0.30001017, caniuse-lite@^1.0.30001019:
version "1.0.30001019"
version "1.0.30001019"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001019.tgz#857e3fccaad2b2feb3f1f6d8a8f62d747ea648e1"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001019.tgz#857e3fccaad2b2feb3f1f6d8a8f62d747ea648e1"
integrity sha512-6ljkLtF1KM5fQ+5ZN0wuyVvvebJxgJPTmScOMaFuQN2QuOzvRJnWSKfzQskQU5IOU4Gap3zasYPIinzwUjoj/g==
integrity sha512-6ljkLtF1KM5fQ+5ZN0wuyVvvebJxgJPTmScOMaFuQN2QuOzvRJnWSKfzQskQU5IOU4Gap3zasYPIinzwUjoj/g==
caniuse-lite@^1.0.30001020:
version "1.0.30001038"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001038.tgz#44da3cbca2ab6cb6aa83d1be5d324e17f141caff"
integrity sha512-zii9quPo96XfOiRD4TrfYGs+QsGZpb2cGiMAzPjtf/hpFgB6zCPZgJb7I1+EATeMw/o+lG8FyRAnI+CWStHcaQ==
capitalize@1.0.0:
capitalize@1.0.0:
version "1.0.0"
version "1.0.0"
resolved "https://registry.yarnpkg.com/capitalize/-/capitalize-1.0.0.tgz#dc802c580aee101929020d2ca14b4ca8a0ae44be"
resolved "https://registry.yarnpkg.com/capitalize/-/capitalize-1.0.0.tgz#dc802c580aee101929020d2ca14b4ca8a0ae44be"
...
@@ -6275,6 +6293,11 @@ ejs@^2.6.1:
...
@@ -6275,6 +6293,11 @@ ejs@^2.6.1:
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
electron-to-chromium@^1.2.7:
version "1.3.387"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.387.tgz#420677629c9791b5d36fc8847c8cc11c0934a6cb"
integrity sha512-jjQ6WkxrOu0rtGqY9/74Z+UEVQ7YmJU2rCX6kH4eidKP0ZK0VKB3/i1avXQ+EDwJAABKGaOAbJrcyz18P8E3aA==
electron-to-chromium@^1.3.322:
electron-to-chromium@^1.3.322:
version "1.3.327"
version "1.3.327"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.327.tgz#516f28b4271727004362b4ac814494ae64d9dde7"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.327.tgz#516f28b4271727004362b4ac814494ae64d9dde7"
...
@@ -9641,12 +9664,12 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
...
@@ -9641,12 +9664,12 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
json5@2.1.
1, json5@^2.1.0
:
json5@2.1.
2, json5@^2.1.2
:
version "2.1.
1
"
version "2.1.
2
"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.
1.tgz#81b6cb04e9ba496f1c7005d07b4368a2638f90b6
"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.
2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e
"
integrity sha512-
l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFh
Q==
integrity sha512-
MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliq
Q==
dependencies:
dependencies:
minimist "^1.2.
0
"
minimist "^1.2.
5
"
json5@^1.0.1:
json5@^1.0.1:
version "1.0.1"
version "1.0.1"
...
@@ -9655,12 +9678,12 @@ json5@^1.0.1:
...
@@ -9655,12 +9678,12 @@ json5@^1.0.1:
dependencies:
dependencies:
minimist "^1.2.0"
minimist "^1.2.0"
json5@^2.1.
2
:
json5@^2.1.
0
:
version "2.1.
2
"
version "2.1.
1
"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.
2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e
"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.
1.tgz#81b6cb04e9ba496f1c7005d07b4368a2638f90b6
"
integrity sha512-
MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliq
Q==
integrity sha512-
l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFh
Q==
dependencies:
dependencies:
minimist "^1.2.
5
"
minimist "^1.2.
0
"
jsonfile@^4.0.0:
jsonfile@^4.0.0:
version "4.0.0"
version "4.0.0"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment