Unverified Commit f9f80dff authored by Joe Haddad's avatar Joe Haddad Committed by GitHub

Upgrade dependencies (#7412)

* ⬆ Upgrade workspace dependencies

* Run new prettier against examples

* Upgrade some next-server packages

* Upgrade Next.js dependencies

* Upgrade webpack deps

* Upgrade async sema

* Fix compilation

* Revert broken plugin
parent 3adaafe7
......@@ -10,6 +10,6 @@ const reduxDevTools =
? window.__REDUX_DEVTOOLS_EXTENSION__()
: f => f
export const initStore = (initialState) => {
export const initStore = initialState => {
return createStore(reducers, initialState, compose(reduxDevTools))
}
......@@ -59,55 +59,55 @@
]
},
"devDependencies": {
"@babel/plugin-proposal-object-rest-spread": "7.0.0",
"@babel/plugin-proposal-object-rest-spread": "7.4.4",
"@babel/preset-flow": "7.0.0",
"@babel/preset-react": "7.0.0",
"@mdx-js/loader": "0.18.0",
"@types/jest": "24.0.12",
"@types/jest": "24.0.13",
"@types/string-hash": "1.1.1",
"@zeit/next-css": "1.0.2-canary.2",
"@zeit/next-sass": "1.0.2-canary.2",
"@zeit/next-typescript": "1.1.2-canary.0",
"abort-controller": "2.0.2",
"abort-controller": "3.0.0",
"amphtml-validator": "1.0.23",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "9.0.0",
"babel-jest": "23.6.0",
"babel-eslint": "10.0.1",
"babel-jest": "24.8.0",
"browserstack-local": "1.4.0",
"cheerio": "0.22.0",
"chromedriver": "2.46.0",
"clone": "2.1.1",
"coveralls": "3.0.2",
"clone": "2.1.2",
"coveralls": "3.0.3",
"cross-spawn": "6.0.5",
"eslint": "5.4.0",
"eslint": "5.16.0",
"eslint-plugin-typescript": "0.14.0",
"express": "4.16.3",
"fs-extra": "7.0.1",
"get-port": "3.2.0",
"express": "4.17.0",
"fs-extra": "8.0.1",
"get-port": "5.0.0",
"isomorphic-unfetch": "3.0.0",
"jest-cli": "23.6.0",
"jest-junit": "6.3.0",
"lerna": "^3.4.0",
"lint-staged": "4.2.3",
"jest-cli": "24.8.0",
"jest-junit": "6.4.0",
"lerna": "3.14.1",
"lint-staged": "8.1.7",
"mkdirp": "0.5.1",
"node-fetch": "2.3.0",
"node-notifier": "5.1.2",
"node-sass": "4.9.2",
"node-fetch": "2.6.0",
"node-notifier": "5.4.0",
"node-sass": "4.12.0",
"pre-commit": "1.2.2",
"prettier": "1.15.3",
"prettier": "1.17.1",
"react": "16.8.6",
"react-dom": "16.8.6",
"release": "5.0.3",
"request-promise-core": "1.1.1",
"rimraf": "2.6.2",
"release": "6.0.1",
"request-promise-core": "1.1.2",
"rimraf": "2.6.3",
"standard": "12.0.1",
"taskr": "1.1.0",
"tree-kill": "1.2.1",
"tslint": "5.12.0",
"typescript": "3.1.1",
"typescript-eslint-parser": "21.0.1",
"tslint": "5.16.0",
"typescript": "3.4.5",
"typescript-eslint-parser": "22.0.0",
"wait-port": "0.2.2",
"wd": "1.10.3",
"wd": "1.11.2",
"webpack-bundle-analyzer": "3.3.2"
},
"engines": {
......
......@@ -40,12 +40,12 @@
"dependencies": {
"amp-toolbox-optimizer": "0.5.3",
"etag": "1.8.1",
"find-up": "3.0.0",
"find-up": "4.0.0",
"fresh": "0.5.2",
"path-to-regexp": "2.1.0",
"prop-types": "15.6.2",
"prop-types": "15.7.2",
"react-is": "16.8.6",
"react-ssr-prepass": "1.0.2",
"react-ssr-prepass": "1.0.5",
"send": "0.16.1",
"url": "0.11.0"
},
......@@ -56,12 +56,12 @@
"devDependencies": {
"@taskr/clear": "1.1.0",
"@taskr/watch": "1.1.0",
"@types/react": "16.8.10",
"@types/react-dom": "16.8.3",
"@types/react": "16.8.18",
"@types/react-dom": "16.8.4",
"@types/react-is": "16.7.1",
"@types/send": "0.14.4",
"taskr": "1.1.0",
"typescript": "3.1.6"
"typescript": "3.4.5"
},
"engines": {
"node": ">= 8.0.0"
......
import {PluginObj} from '@babel/core'
import {NodePath} from '@babel/traverse'
import { PluginObj } from '@babel/core'
import { NodePath } from '@babel/traverse'
import * as BabelTypes from '@babel/types'
export default function ({ types: t }: {types: typeof BabelTypes}): PluginObj {
export default function({
types: t,
}: {
types: typeof BabelTypes
}): PluginObj<any> {
return {
visitor: {
ImportDeclaration (path: NodePath<BabelTypes.ImportDeclaration>, state) {
ImportDeclaration(path: NodePath<BabelTypes.ImportDeclaration>, state) {
const source = path.node.source.value
if (source !== 'next/data') return
const createHookSpecifier = path.get('specifiers').find(specifier => {
return specifier.isImportSpecifier() && specifier.node.imported.name === 'createHook'
return (
specifier.isImportSpecifier() &&
specifier.node.imported.name === 'createHook'
)
})
if (!createHookSpecifier) return
......@@ -27,25 +33,29 @@ export default function ({ types: t }: {types: typeof BabelTypes}): PluginObj {
let callExpression = refPath.parentPath
if (!callExpression.isCallExpression()) return
let args: any = callExpression.get('arguments')
if (!args[0]) {
throw callExpression.buildCodeFrameError('first argument to createHook should be a function')
}
throw callExpression.buildCodeFrameError(
'first argument to createHook should be a function'
)
}
if (!args[1]) {
callExpression.node.arguments.push(t.objectExpression([]))
}
args = callExpression.get('arguments')
args[1].node.properties.push(t.objectProperty(
t.identifier('key'),
t.stringLiteral(state.opts.key)
))
args[1].node.properties.push(
t.objectProperty(
t.identifier('key'),
t.stringLiteral(state.opts.key)
)
)
})
}
}
},
},
}
}
import {PluginObj} from '@babel/core'
import {NodePath} from '@babel/traverse'
import { PluginObj } from '@babel/core'
import { NodePath } from '@babel/traverse'
import * as BabelTypes from '@babel/types'
let idx = 0
export default function ({ types: t }: {types: typeof BabelTypes}): PluginObj {
export default function({
types: t,
}: {
types: typeof BabelTypes
}): PluginObj<{
insertedDrop?: boolean
hasAmp?: boolean
}> {
return {
visitor: {
Program: {
enter(path, state) {
path.traverse({
ImportDeclaration (path: NodePath<BabelTypes.ImportDeclaration>, state) {
const source = path.node.source.value
if (source !== 'next/amp') return
state.hasAmp = true
path.traverse(
{
ImportDeclaration(
path: NodePath<BabelTypes.ImportDeclaration>,
state
) {
const source = path.node.source.value
if (source !== 'next/amp') return
state.hasAmp = true
},
},
}, state)
}
state
)
},
},
CallExpression (path: NodePath<BabelTypes.CallExpression>, state) {
CallExpression(path: NodePath<BabelTypes.CallExpression>, state) {
if (!state.hasAmp || state.insertedDrop) return
// @ts-ignore
if (path.node.callee.name !== 'withAmp') return
......@@ -29,22 +42,36 @@ export default function ({ types: t }: {types: typeof BabelTypes}): PluginObj {
const options: BabelTypes.ObjectExpression = path.node.arguments[1]
// make sure it isn't a hybrid page e.g. hybrid: true
if (options.properties.some((prop: any): boolean => {
if (!t.isObjectProperty(prop)) return false
if (prop.key.name !== 'hybrid' || !t.isBooleanLiteral(prop.value)) {
return false
}
// found hybrid: true
return Boolean(prop.value.value)
})) {
if (
options.properties.some(
(prop: any): boolean => {
if (!t.isObjectProperty(prop)) return false
if (
prop.key.name !== 'hybrid' ||
!t.isBooleanLiteral(prop.value)
) {
return false
}
// found hybrid: true
return Boolean(prop.value.value)
}
)
) {
return
}
}
// use random number and an increment to make sure HMR still updates
idx++
state.insertedDrop = true
path.replaceWith(t.expressionStatement(t.stringLiteral(`throw new Error('__NEXT_DROP_CLIENT_FILE__' + ${Math.random() + idx})`)));
}
}
path.replaceWith(
t.expressionStatement(
t.stringLiteral(
`throw new Error('__NEXT_DROP_CLIENT_FILE__' + ${Math.random() +
idx})`
)
)
)
},
},
}
}
......@@ -81,6 +81,8 @@ export default function ({ types: t }: {types: typeof BabelTypes}): PluginObj {
callExpression.node.arguments.push(t.objectExpression([]))
}
// This is needed as the code is modified above
// TODO: remove ignore statement
// @ts-ignore
args = callExpression.get('arguments')
loader = args[0]
options = args[1]
......
import Sema from 'async-sema'
import { Sema } from 'async-sema'
import crypto from 'crypto'
import fs from 'fs'
import mkdirpModule from 'mkdirp'
......@@ -9,7 +9,7 @@ import { promisify } from 'util'
import { recursiveDelete } from '../lib/recursive-delete'
import * as Log from './output/log'
import { PageInfo } from './utils';
import { PageInfo } from './utils'
const FILE_BUILD_ID = 'HEAD_BUILD_ID'
const FILE_UPDATED_AT = 'UPDATED_AT'
......@@ -223,12 +223,16 @@ export class FlyingShuttle {
getPageInfos = async (): Promise<Map<string, PageInfo>> => {
const pageInfos: Map<string, PageInfo> = new Map()
const pagesManifest = JSON.parse(await fsReadFile(
path.join(
this.shuttleDirectory, DIR_FILES_NAME, 'serverless/pages-manifest.json'
),
'utf8'
))
const pagesManifest = JSON.parse(
await fsReadFile(
path.join(
this.shuttleDirectory,
DIR_FILES_NAME,
'serverless/pages-manifest.json'
),
'utf8'
)
)
Object.keys(pagesManifest).forEach(pg => {
const path = pagesManifest[pg]
const isStatic: boolean = path.endsWith('html')
......@@ -238,7 +242,7 @@ export class FlyingShuttle {
isAmp,
size: 0,
static: isStatic,
serverBundle: path
serverBundle: path,
})
})
return pageInfos
......@@ -302,26 +306,26 @@ export class FlyingShuttle {
mergePagesManifest = async (): Promise<void> => {
const savedPagesManifest = path.join(
this.shuttleDirectory, DIR_FILES_NAME, 'serverless/pages-manifest.json'
this.shuttleDirectory,
DIR_FILES_NAME,
'serverless/pages-manifest.json'
)
if (!(await fsExists(savedPagesManifest))) return
const saved = JSON.parse(await fsReadFile(
savedPagesManifest,
'utf8'
))
const saved = JSON.parse(await fsReadFile(savedPagesManifest, 'utf8'))
const currentPagesManifest = path.join(
this.distDirectory, 'serverless/pages-manifest.json'
this.distDirectory,
'serverless/pages-manifest.json'
)
const current = JSON.parse(await fsReadFile(
currentPagesManifest,
'utf8'
))
const current = JSON.parse(await fsReadFile(currentPagesManifest, 'utf8'))
await fsWriteFile(currentPagesManifest, JSON.stringify({
...saved,
...current,
}))
await fsWriteFile(
currentPagesManifest,
JSON.stringify({
...saved,
...current,
})
)
}
restorePage = async (
......@@ -470,7 +474,7 @@ export class FlyingShuttle {
const usedChunks = new Set()
const pages = Object.keys(storeManifest.pageChunks)
pages.forEach(page => {
const info = pageInfos.get(page) || {} as PageInfo
const info = pageInfos.get(page) || ({} as PageInfo)
storeManifest.pageChunks[page].forEach((file, idx) => {
if (info.isAmp) {
......@@ -481,18 +485,19 @@ export class FlyingShuttle {
usedChunks.add(file)
})
usedChunks.add(
path.join('serverless/pages', `${
page === '/' ? 'index' : page
}.${staticPages.has(page) ? 'html' : 'js'}`)
path.join(
'serverless/pages',
`${page === '/' ? 'index' : page}.${
staticPages.has(page) ? 'html' : 'js'
}`
)
)
const ampPage = (page === '/' ? '/index' : page) + '.amp'
if (staticPages.has(ampPage)) {
storeManifest.pages[ampPage] = []
storeManifest.pageChunks[ampPage] = []
usedChunks.add(
path.join('serverless/pages', `${ampPage}.html`)
)
usedChunks.add(path.join('serverless/pages', `${ampPage}.html`))
}
})
......@@ -515,7 +520,11 @@ export class FlyingShuttle {
await fsCopyFile(
path.join(this.distDirectory, 'serverless/pages-manifest.json'),
path.join(this.shuttleDirectory, DIR_FILES_NAME, 'serverless/pages-manifest.json')
path.join(
this.shuttleDirectory,
DIR_FILES_NAME,
'serverless/pages-manifest.json'
)
)
Log.info(`flying shuttle payload: ${usedChunks.size + 2} files`)
......
......@@ -4,7 +4,7 @@ import { promisify } from 'util'
import workerFarm from 'worker-farm'
import { writeFile, readFile } from 'fs'
import serialize from 'serialize-javascript'
import Sema from 'async-sema'
import { Sema } from 'async-sema'
import mkdirp from 'mkdirp'
const worker = require.resolve('./worker')
......
......@@ -3,7 +3,7 @@ import { promisify } from 'util'
import { extname, join, dirname, sep } from 'path'
import { renderToHTML } from 'next-server/dist/server/render'
import { writeFile, access } from 'fs'
import Sema from 'async-sema'
import { Sema } from 'async-sema'
import AmpHtmlValidator from 'amphtml-validator'
import { loadComponents } from 'next-server/dist/server/load-components'
......@@ -47,7 +47,7 @@ process.on(
setHeader: () => {},
hasHeader: () => false,
removeHeader: () => {},
getHeaderNames: () => ([])
getHeaderNames: () => []
}
const req = {
......@@ -86,12 +86,21 @@ process.on(
let renderMethod = renderToHTML
if (serverless) {
renderMethod = require(join(distDir, 'serverless/pages', (page === '/' ? 'index' : page) + '.js')).renderReqToHTML
renderMethod = require(join(
distDir,
'serverless/pages',
(page === '/' ? 'index' : page) + '.js'
)).renderReqToHTML
const result = await renderMethod(req, res, true)
curRenderOpts = result.renderOpts
html = result.html
} else {
const components = await loadComponents(distDir, buildId, page, serverless)
const components = await loadComponents(
distDir,
buildId,
page,
serverless
)
if (typeof components.Component === 'string') {
html = components.Component
......@@ -124,9 +133,7 @@ process.on(
if (curRenderOpts.amphtml && query.amp) {
await validateAmp(html, path)
}
if (
(curRenderOpts.amphtml && !query.amp) || curRenderOpts.hasAmp
) {
if ((curRenderOpts.amphtml && !query.amp) || curRenderOpts.hasAmp) {
// we need to render a clean AMP version
let ampHtmlFilename = `${ampPath}${sep}index.html`
if (!subFolders) {
......@@ -144,24 +151,22 @@ process.on(
req.url += (req.url.includes('?') ? '&' : '?') + 'amp=1'
ampHtml = (await renderMethod(req, res, true)).html
} else {
ampHtml = await renderMethod(req, res, page, { ...query, amp: 1 }, curRenderOpts)
ampHtml = await renderMethod(
req,
res,
page,
{ ...query, amp: 1 },
curRenderOpts
)
}
await validateAmp(ampHtml, page + '?amp=1')
await mkdirp(ampBaseDir)
await writeFileP(
ampHtmlFilepath,
ampHtml,
'utf8'
)
await writeFileP(ampHtmlFilepath, ampHtml, 'utf8')
}
}
await writeFileP(
htmlFilepath,
html,
'utf8'
)
await writeFileP(htmlFilepath, html, 'utf8')
process.send({ type: 'progress' })
sema.release()
}
......
......@@ -55,90 +55,89 @@
]
},
"dependencies": {
"@babel/core": "7.1.2",
"@babel/plugin-proposal-class-properties": "7.1.0",
"@babel/plugin-proposal-object-rest-spread": "7.0.0",
"@babel/plugin-syntax-dynamic-import": "7.0.0",
"@babel/plugin-transform-modules-commonjs": "7.1.0",
"@babel/plugin-transform-runtime": "7.1.0",
"@babel/preset-env": "7.1.0",
"@babel/core": "7.4.5",
"@babel/plugin-proposal-class-properties": "7.4.4",
"@babel/plugin-proposal-object-rest-spread": "7.4.4",
"@babel/plugin-syntax-dynamic-import": "7.2.0",
"@babel/plugin-transform-modules-commonjs": "7.4.4",
"@babel/plugin-transform-runtime": "7.4.4",
"@babel/preset-env": "7.4.5",
"@babel/preset-react": "7.0.0",
"@babel/preset-typescript": "7.3.3",
"@babel/runtime": "7.1.2",
"@babel/runtime-corejs2": "7.1.2",
"@babel/runtime": "7.4.5",
"@babel/runtime-corejs2": "7.4.5",
"amphtml-validator": "1.0.23",
"async-sema": "2.2.0",
"async-sema": "3.0.0",
"autodll-webpack-plugin": "0.4.2",
"babel-core": "7.0.0-bridge.0",
"babel-loader": "8.0.5",
"babel-loader": "8.0.6",
"babel-plugin-react-require": "3.0.0",
"babel-plugin-transform-async-to-promises": "0.8.9",
"babel-plugin-transform-react-remove-prop-types": "0.4.15",
"babel-plugin-transform-async-to-promises": "0.8.10",
"babel-plugin-transform-react-remove-prop-types": "0.4.24",
"chalk": "2.4.2",
"find-up": "2.1.0",
"fork-ts-checker-webpack-plugin": "1.3.0",
"find-up": "4.0.0",
"fork-ts-checker-webpack-plugin": "1.3.4",
"fresh": "0.5.2",
"launch-editor": "2.2.1",
"loader-utils": "1.1.0",
"loader-utils": "1.2.3",
"mkdirp": "0.5.1",
"next-server": "8.1.1-canary.35",
"prop-types": "15.6.2",
"prop-types": "15.7.2",
"prop-types-exact": "1.2.0",
"react-error-overlay": "5.1.4",
"react-error-overlay": "5.1.6",
"react-is": "16.8.6",
"recursive-copy": "2.0.6",
"serialize-javascript": "1.6.1",
"recursive-copy": "2.0.10",
"serialize-javascript": "1.7.0",
"source-map": "0.6.1",
"string-hash": "1.1.3",
"strip-ansi": "3.0.1",
"strip-ansi": "5.2.0",
"styled-jsx": "3.2.1",
"terser": "3.17.0",
"tty-aware-progress": "1.0.3",
"terser": "4.0.0",
"tty-aware-progress": "1.0.4",
"unfetch": "4.1.0",
"url": "0.11.0",
"webpack": "4.30.0",
"webpack-dev-middleware": "3.6.0",
"webpack-hot-middleware": "2.24.3",
"webpack": "4.32.2",
"webpack-dev-middleware": "3.7.0",
"webpack-hot-middleware": "2.25.0",
"webpack-sources": "1.3.0",
"worker-farm": "1.5.2"
"worker-farm": "1.7.0"
},
"peerDependencies": {
"react": "^16.6.0",
"react-dom": "^16.6.0"
},
"devDependencies": {
"@babel/parser": "7.2.0",
"@babel/parser": "7.4.5",
"@taskr/clear": "1.1.0",
"@taskr/esnext": "1.1.0",
"@taskr/watch": "1.1.0",
"@types/amphtml-validator": "1.0.0",
"@types/babel-types": "7.0.4",
"@types/babel__core": "7.0.4",
"@types/babel__generator": "7.0.1",
"@types/babel__template": "7.0.1",
"@types/babel__traverse": "7.0.3",
"@types/babel-types": "7.0.7",
"@types/babel__core": "7.1.2",
"@types/babel__generator": "7.0.2",
"@types/babel__template": "7.0.2",
"@types/babel__traverse": "7.0.6",
"@types/cross-spawn": "6.0.0",
"@types/etag": "1.8.0",
"@types/find-up": "2.1.1",
"@types/fresh": "0.5.0",
"@types/loader-utils": "1.1.3",
"@types/mkdirp": "0.5.2",
"@types/nanoid": "1.2.0",
"@types/node-fetch": "2.1.4",
"@types/nanoid": "2.0.0",
"@types/node-fetch": "2.3.4",
"@types/resolve": "0.0.8",
"@types/strip-ansi": "3.0.0",
"@types/styled-jsx": "2.2.8",
"@types/text-table": "0.2.0",
"@types/text-table": "0.2.1",
"@types/webpack-sources": "0.1.5",
"@zeit/ncc": "0.15.2",
"@zeit/ncc": "0.18.5",
"arg": "4.1.0",
"babel-plugin-dynamic-import-node": "2.2.0",
"nanoid": "2.0.1",
"resolve": "1.5.0",
"nanoid": "2.0.3",
"resolve": "1.11.0",
"taskr": "1.1.0",
"text-table": "0.2.0",
"typescript": "3.1.6",
"unistore": "3.2.1"
"typescript": "3.4.5",
"unistore": "3.4.1"
},
"engines": {
"node": ">= 8.0.0"
......
This diff is collapsed.
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