Commit caa5da7c authored by Guy Bedford's avatar Guy Bedford Committed by Joe Haddad

source-map, manifest type fix

parent e7fcdd32
......@@ -2,7 +2,7 @@
no-param-reassign
*/
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 { RequestShortener } from 'webpack'
import TaskRunner from './TaskRunner'
......
......@@ -85,7 +85,6 @@
"react-is": "16.8.6",
"resolve-url-loader": "3.1.1",
"sass-loader": "8.0.2",
"source-map": "0.6.1",
"string-hash": "1.1.3",
"strip-ansi": "5.2.0",
"style-loader": "1.0.0",
......@@ -195,6 +194,7 @@
"recast": "0.18.5",
"resolve": "1.11.0",
"send": "0.17.1",
"source-map": "0.6.1",
"taskr": "1.1.0",
"text-table": "0.2.0",
"typescript": "3.7.3",
......
const ncc = require('@zeit/ncc')
const { existsSync, readFileSync } = require('fs')
const { basename, dirname, extname, join, relative } = require('path')
const { basename, dirname, extname, join } = require('path')
module.exports = function(task) {
// eslint-disable-next-line require-yield
......@@ -33,37 +33,11 @@ module.exports = function(task) {
// n.b. types intended for development usage only.
function writePackageManifest(packageName) {
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) {
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 potentialLicensePath = join(dirname(packagePath), './LICENSE')
......@@ -84,12 +58,7 @@ function writePackageManifest(packageName) {
{},
{ name, main: `${basename(main, '.' + extname(main))}` },
author ? { author } : undefined,
license ? { license } : undefined,
typesFile
? {
types: relative(compiledPackagePath, typesFile),
}
: undefined
license ? { license } : undefined
)
) + '\n',
})
......
const notifier = require('node-notifier')
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
export async function ncc_amphtml_validator(task, opts) {
await task
......@@ -23,7 +29,7 @@ export async function ncc_async_retry(task, opts) {
.source(opts.src || relative(__dirname, require.resolve('async-retry')))
.ncc({
packageName: 'async-retry',
externals: { 'node-fetch': 'next/dist/compiled/node-fetch' },
externals: allExternals,
})
.target('dist/compiled/async-retry')
}
......@@ -53,6 +59,7 @@ export async function ncc_babel__helper_plugin_utils(task, opts) {
}
// eslint-disable-next-line camelcase
const babelExternals = {
...allExternals,
'@babel/core': 'next/dist/compiled/babel--core',
'@babel/helper-plugin-utils': 'next/dist/compiled/babel--helper-plugin-utils',
}
......@@ -470,7 +477,7 @@ export async function ncc_ora(task, opts) {
.source(opts.src || relative(__dirname, require.resolve('ora')))
.ncc({
packageName: 'ora',
externals: { chalk: 'next/dist/compiled/chalk' },
externals: allExternals,
})
.target('dist/compiled/ora')
}
......@@ -485,7 +492,7 @@ export async function ncc_raw_body(task, opts) {
export async function ncc_recast(task, opts) {
await task
.source(opts.src || relative(__dirname, require.resolve('recast')))
.ncc({ packageName: 'recast' })
.ncc({ packageName: 'recast', externals: allExternals })
.target('dist/compiled/recast')
}
// eslint-disable-next-line camelcase
......@@ -503,6 +510,13 @@ export async function ncc_send(task, opts) {
.target('dist/compiled/send')
}
// 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) {
await task
.source(opts.src || relative(__dirname, require.resolve('text-table')))
......@@ -572,6 +586,7 @@ export async function precompile(task) {
'ncc_recast',
'ncc_resolve',
'ncc_send',
'ncc_source_map',
'ncc_text_table',
'ncc_unistore',
])
......
......@@ -164,6 +164,10 @@ declare module 'next/dist/compiled/send' {
import m from 'send'
export = m
}
declare module 'next/dist/compiled/source-map' {
import m from 'source-map'
export = m
}
declare module 'next/dist/compiled/text-table' {
function textTable(
rows: Array<Array<{}>>,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment