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
caa5da7c
Commit
caa5da7c
authored
Mar 29, 2020
by
Guy Bedford
Committed by
Joe Haddad
Mar 30, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
source-map, manifest type fix
parent
e7fcdd32
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
39 deletions
+27
-39
index.js
.../build/webpack/plugins/terser-webpack-plugin/src/index.js
+1
-1
package.json
packages/next/package.json
+1
-1
taskfile-ncc.js
packages/next/taskfile-ncc.js
+3
-34
taskfile.js
packages/next/taskfile.js
+18
-3
misc.d.ts
packages/next/types/misc.d.ts
+4
-0
No files found.
packages/next/build/webpack/plugins/terser-webpack-plugin/src/index.js
View file @
caa5da7c
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
no-param-reassign
no-param-reassign
*/
*/
import
stringHash
from
'string-hash'
import
stringHash
from
'string-hash'
import
{
SourceMapConsumer
}
from
'source-map'
import
{
SourceMapConsumer
}
from
'
next/dist/compiled/
source-map'
import
{
SourceMapSource
,
RawSource
}
from
'webpack-sources'
import
{
SourceMapSource
,
RawSource
}
from
'webpack-sources'
import
{
RequestShortener
}
from
'webpack'
import
{
RequestShortener
}
from
'webpack'
import
TaskRunner
from
'./TaskRunner'
import
TaskRunner
from
'./TaskRunner'
...
...
packages/next/package.json
View file @
caa5da7c
...
@@ -85,7 +85,6 @@
...
@@ -85,7 +85,6 @@
"react-is"
:
"16.8.6"
,
"react-is"
:
"16.8.6"
,
"resolve-url-loader"
:
"3.1.1"
,
"resolve-url-loader"
:
"3.1.1"
,
"sass-loader"
:
"8.0.2"
,
"sass-loader"
:
"8.0.2"
,
"source-map"
:
"0.6.1"
,
"string-hash"
:
"1.1.3"
,
"string-hash"
:
"1.1.3"
,
"strip-ansi"
:
"5.2.0"
,
"strip-ansi"
:
"5.2.0"
,
"style-loader"
:
"1.0.0"
,
"style-loader"
:
"1.0.0"
,
...
@@ -195,6 +194,7 @@
...
@@ -195,6 +194,7 @@
"recast"
:
"0.18.5"
,
"recast"
:
"0.18.5"
,
"resolve"
:
"1.11.0"
,
"resolve"
:
"1.11.0"
,
"send"
:
"0.17.1"
,
"send"
:
"0.17.1"
,
"source-map"
:
"0.6.1"
,
"taskr"
:
"1.1.0"
,
"taskr"
:
"1.1.0"
,
"text-table"
:
"0.2.0"
,
"text-table"
:
"0.2.0"
,
"typescript"
:
"3.7.3"
,
"typescript"
:
"3.7.3"
,
...
...
packages/next/taskfile-ncc.js
View file @
caa5da7c
const
ncc
=
require
(
'@zeit/ncc'
)
const
ncc
=
require
(
'@zeit/ncc'
)
const
{
existsSync
,
readFileSync
}
=
require
(
'fs'
)
const
{
existsSync
,
readFileSync
}
=
require
(
'fs'
)
const
{
basename
,
dirname
,
extname
,
join
,
relative
}
=
require
(
'path'
)
const
{
basename
,
dirname
,
extname
,
join
}
=
require
(
'path'
)
module
.
exports
=
function
(
task
)
{
module
.
exports
=
function
(
task
)
{
// eslint-disable-next-line require-yield
// eslint-disable-next-line require-yield
...
@@ -33,37 +33,11 @@ module.exports = function(task) {
...
@@ -33,37 +33,11 @@ module.exports = function(task) {
// n.b. types intended for development usage only.
// n.b. types intended for development usage only.
function
writePackageManifest
(
packageName
)
{
function
writePackageManifest
(
packageName
)
{
const
packagePath
=
require
.
resolve
(
packageName
+
'/package.json'
)
const
packagePath
=
require
.
resolve
(
packageName
+
'/package.json'
)
let
{
name
,
main
,
author
,
license
,
types
,
typings
}
=
require
(
packagePath
)
let
{
name
,
main
,
author
,
license
}
=
require
(
packagePath
)
if
(
!
main
)
{
if
(
!
main
)
{
main
=
'index.js'
main
=
'index.js'
}
}
let
typesFile
=
types
||
typings
if
(
typesFile
)
{
// if they provide a types directory resolve it
if
(
extname
(
typesFile
)
===
''
)
{
typesFile
=
join
(
typesFile
,
'index.d.ts'
)
}
typesFile
=
require
.
resolve
(
join
(
packageName
,
typesFile
))
}
else
{
try
{
const
typesPackage
=
`@types/
${
packageName
}
`
const
{
types
,
typings
}
=
require
(
join
(
typesPackage
,
`package.json`
))
typesFile
=
types
||
typings
if
(
typesFile
)
{
if
(
!
typesFile
.
endsWith
(
'.d.ts'
))
{
typesFile
+=
'.d.ts'
}
typesFile
=
require
.
resolve
(
join
(
typesPackage
,
typesFile
))
}
}
catch
(
_
)
{
typesFile
=
undefined
}
}
const
compiledPackagePath
=
join
(
__dirname
,
`dist/compiled/
${
packageName
}
`
)
const
compiledPackagePath
=
join
(
__dirname
,
`dist/compiled/
${
packageName
}
`
)
const
potentialLicensePath
=
join
(
dirname
(
packagePath
),
'./LICENSE'
)
const
potentialLicensePath
=
join
(
dirname
(
packagePath
),
'./LICENSE'
)
...
@@ -84,12 +58,7 @@ function writePackageManifest(packageName) {
...
@@ -84,12 +58,7 @@ function writePackageManifest(packageName) {
{},
{},
{
name
,
main
:
`
${
basename
(
main
,
'.'
+
extname
(
main
))}
`
},
{
name
,
main
:
`
${
basename
(
main
,
'.'
+
extname
(
main
))}
`
},
author
?
{
author
}
:
undefined
,
author
?
{
author
}
:
undefined
,
license
?
{
license
}
:
undefined
,
license
?
{
license
}
:
undefined
typesFile
?
{
types
:
relative
(
compiledPackagePath
,
typesFile
),
}
:
undefined
)
)
)
+
'
\
n'
,
)
+
'
\
n'
,
})
})
...
...
packages/next/taskfile.js
View file @
caa5da7c
const
notifier
=
require
(
'node-notifier'
)
const
notifier
=
require
(
'node-notifier'
)
const
relative
=
require
(
'path'
).
relative
const
relative
=
require
(
'path'
).
relative
const
allExternals
=
{
chalk
:
'next/dist/compiled/chalk'
,
'source-map'
:
'next/dist/compiled/source-map'
,
'node-fetch'
:
'next/dist/compiled/node-fetch'
,
}
// eslint-disable-next-line camelcase
// eslint-disable-next-line camelcase
export
async
function
ncc_amphtml_validator
(
task
,
opts
)
{
export
async
function
ncc_amphtml_validator
(
task
,
opts
)
{
await
task
await
task
...
@@ -23,7 +29,7 @@ export async function ncc_async_retry(task, opts) {
...
@@ -23,7 +29,7 @@ export async function ncc_async_retry(task, opts) {
.
source
(
opts
.
src
||
relative
(
__dirname
,
require
.
resolve
(
'async-retry'
)))
.
source
(
opts
.
src
||
relative
(
__dirname
,
require
.
resolve
(
'async-retry'
)))
.
ncc
({
.
ncc
({
packageName
:
'async-retry'
,
packageName
:
'async-retry'
,
externals
:
{
'node-fetch'
:
'next/dist/compiled/node-fetch'
}
,
externals
:
allExternals
,
})
})
.
target
(
'dist/compiled/async-retry'
)
.
target
(
'dist/compiled/async-retry'
)
}
}
...
@@ -53,6 +59,7 @@ export async function ncc_babel__helper_plugin_utils(task, opts) {
...
@@ -53,6 +59,7 @@ export async function ncc_babel__helper_plugin_utils(task, opts) {
}
}
// eslint-disable-next-line camelcase
// eslint-disable-next-line camelcase
const
babelExternals
=
{
const
babelExternals
=
{
...
allExternals
,
'@babel/core'
:
'next/dist/compiled/babel--core'
,
'@babel/core'
:
'next/dist/compiled/babel--core'
,
'@babel/helper-plugin-utils'
:
'next/dist/compiled/babel--helper-plugin-utils'
,
'@babel/helper-plugin-utils'
:
'next/dist/compiled/babel--helper-plugin-utils'
,
}
}
...
@@ -470,7 +477,7 @@ export async function ncc_ora(task, opts) {
...
@@ -470,7 +477,7 @@ export async function ncc_ora(task, opts) {
.
source
(
opts
.
src
||
relative
(
__dirname
,
require
.
resolve
(
'ora'
)))
.
source
(
opts
.
src
||
relative
(
__dirname
,
require
.
resolve
(
'ora'
)))
.
ncc
({
.
ncc
({
packageName
:
'ora'
,
packageName
:
'ora'
,
externals
:
{
chalk
:
'next/dist/compiled/chalk'
}
,
externals
:
allExternals
,
})
})
.
target
(
'dist/compiled/ora'
)
.
target
(
'dist/compiled/ora'
)
}
}
...
@@ -485,7 +492,7 @@ export async function ncc_raw_body(task, opts) {
...
@@ -485,7 +492,7 @@ export async function ncc_raw_body(task, opts) {
export
async
function
ncc_recast
(
task
,
opts
)
{
export
async
function
ncc_recast
(
task
,
opts
)
{
await
task
await
task
.
source
(
opts
.
src
||
relative
(
__dirname
,
require
.
resolve
(
'recast'
)))
.
source
(
opts
.
src
||
relative
(
__dirname
,
require
.
resolve
(
'recast'
)))
.
ncc
({
packageName
:
'recast'
})
.
ncc
({
packageName
:
'recast'
,
externals
:
allExternals
})
.
target
(
'dist/compiled/recast'
)
.
target
(
'dist/compiled/recast'
)
}
}
// eslint-disable-next-line camelcase
// eslint-disable-next-line camelcase
...
@@ -503,6 +510,13 @@ export async function ncc_send(task, opts) {
...
@@ -503,6 +510,13 @@ export async function ncc_send(task, opts) {
.
target
(
'dist/compiled/send'
)
.
target
(
'dist/compiled/send'
)
}
}
// eslint-disable-next-line camelcase
// eslint-disable-next-line camelcase
export
async
function
ncc_source_map
(
task
,
opts
)
{
await
task
.
source
(
opts
.
src
||
relative
(
__dirname
,
require
.
resolve
(
'source-map'
)))
.
ncc
({
packageName
:
'source-map'
})
.
target
(
'dist/compiled/source-map'
)
}
// eslint-disable-next-line camelcase
export
async
function
ncc_text_table
(
task
,
opts
)
{
export
async
function
ncc_text_table
(
task
,
opts
)
{
await
task
await
task
.
source
(
opts
.
src
||
relative
(
__dirname
,
require
.
resolve
(
'text-table'
)))
.
source
(
opts
.
src
||
relative
(
__dirname
,
require
.
resolve
(
'text-table'
)))
...
@@ -572,6 +586,7 @@ export async function precompile(task) {
...
@@ -572,6 +586,7 @@ export async function precompile(task) {
'ncc_recast'
,
'ncc_recast'
,
'ncc_resolve'
,
'ncc_resolve'
,
'ncc_send'
,
'ncc_send'
,
'ncc_source_map'
,
'ncc_text_table'
,
'ncc_text_table'
,
'ncc_unistore'
,
'ncc_unistore'
,
])
])
...
...
packages/next/types/misc.d.ts
View file @
caa5da7c
...
@@ -164,6 +164,10 @@ declare module 'next/dist/compiled/send' {
...
@@ -164,6 +164,10 @@ declare module 'next/dist/compiled/send' {
import
m
from
'send'
import
m
from
'send'
export
=
m
export
=
m
}
}
declare
module
'next/dist/compiled/source-map'
{
import
m
from
'source-map'
export
=
m
}
declare
module
'next/dist/compiled/text-table'
{
declare
module
'next/dist/compiled/text-table'
{
function
textTable
(
function
textTable
(
rows
:
Array
<
Array
<
{}
>>
,
rows
:
Array
<
Array
<
{}
>>
,
...
...
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