Skip to content

Commit

Permalink
chore: use siroc to build
Browse files Browse the repository at this point in the history
  • Loading branch information
danielroe committed Nov 9, 2020
1 parent 4935cab commit 3fefbe3
Show file tree
Hide file tree
Showing 8 changed files with 274 additions and 36 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
node_modules_dev
node_modules_prod
lib
32 changes: 17 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,35 @@
{
"name": "@nuxtjs/vercel-builder",
"version": "0.17.12",
"license": "MIT",
"repository": "nuxt/vercel-builder",
"license": "MIT",
"exports": {
".": "./lib/index.js",
"./launcher": "./lib/launcher.js"
},
"main": "lib/index.js",
"files": [
"lib"
],
"scripts": {
"build": "tsc",
"build": "siroc build",
"lint": "eslint --ext .vue,.js,.ts src examples test",
"test": "yarn build && jest test",
"prepare": "yarn build",
"refresh": "run-s refresh:*",
"refresh:fixture": "cd test/fixture/www && yarn upgrade && rm yarn.lock && yarn && rm -rf node_modules",
"refresh:fixture-ts": "cd test/fixture-ts/www && yarn upgrade && rm yarn.lock && yarn && rm -rf node_modules",
"refresh:fixture-generated": "cd test/fixture-generated/www && yarn upgrade && rm yarn.lock && yarn && rm -rf node_modules",
"refresh:example-basic": "cd examples/basic && yarn upgrade && rm yarn.lock && yarn && rm -rf node_modules",
"refresh:example-side-by-side-admin": "cd examples/side-by-side/admin && yarn upgrade && rm yarn.lock && yarn && rm -rf node_modules",
"refresh:example-side-by-side-app": "cd examples/side-by-side/app && yarn upgrade && rm yarn.lock && yarn && rm -rf node_modules",
"prepare": "yarn build",
"release": "standard-version && git push --follow-tags"
"refresh:fixture": "cd test/fixture/www && yarn upgrade && rm yarn.lock && yarn && rm -rf node_modules",
"refresh:fixture-generated": "cd test/fixture-generated/www && yarn upgrade && rm yarn.lock && yarn && rm -rf node_modules",
"refresh:fixture-ts": "cd test/fixture-ts/www && yarn upgrade && rm yarn.lock && yarn && rm -rf node_modules",
"release": "release-it",
"test": "yarn build && jest test"
},
"resolutions": {
"minimist": ">=1.2.5"
},
"dependencies": {
"@vercel/build-utils": "2.5.4",
"@vercel/node-bridge": "1.3.1",
"consola": "2.15.0",
"esm": "3.2.25",
Expand All @@ -42,8 +50,6 @@
"@types/semver": "^7.3.4",
"@typescript-eslint/eslint-plugin": "^4.6.1",
"@typescript-eslint/parser": "^4.6.1",
"@vercel/build-utils": "2.5.4",
"@vercel/frameworks": "0.1.1",
"@vercel/routing-utils": "1.9.0",
"codecov": "^3.8.1",
"eslint": "^7.13.0",
Expand All @@ -58,10 +64,6 @@
"npm-run-all": "^4.1.5",
"nuxt": "2.14.7",
"release-it": "^14.2.1",
"standard-version": "^9.0.0",
"typescript": "^4.0.5"
},
"resolutions": {
"minimist": ">=1.2.5"
"siroc": "^0.4.0"
}
}
5 changes: 2 additions & 3 deletions src/build.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import path from 'path'

import { createLambda, BuildOptions, download, File, FileBlob, FileFsRef, glob, getNodeVersion, getSpawnOptions, Lambda, runNpmInstall, runPackageJsonScript } from '@vercel/build-utils'
import type { Route } from '@vercel/routing-utils'
import consola from 'consola'
import fs from 'fs-extra'
import resolveFrom from 'resolve-from'
import { gte, gt } from 'semver'

import { createLambda, BuildOptions, download, File, FileBlob, FileFsRef, glob, getNodeVersion, getSpawnOptions, Lambda, runNpmInstall, runPackageJsonScript } from '@vercel/build-utils'
import { Route } from '@vercel/routing-utils'

import { endStep, exec, getNuxtConfig, getNuxtConfigName, globAndPrefix, MutablePackageJson, prepareNodeModules, preparePkgForProd, readJSON, startStep, validateEntrypoint } from './utils'
import { prepareTypescriptEnvironment, compileTypescriptBuildFiles, JsonOptions } from './typescript'

Expand Down
2 changes: 1 addition & 1 deletion src/config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Config } from '@vercel/build-utils'
import type { Config } from '@vercel/build-utils'

const config: Config = {
maxLambdaSize: '50mb'
Expand Down
2 changes: 1 addition & 1 deletion src/prepare-cache.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { PrepareCacheOptions, glob, Files } from '@vercel/build-utils'

import consola from 'consola'

import { startStep, endStep } from './utils'

async function prepareCache ({ workPath }: PrepareCacheOptions): Promise<Files> {
Expand Down
6 changes: 3 additions & 3 deletions src/typescript.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { SpawnOptions } from 'child_process'
import type { SpawnOptions } from 'child_process'
import path from 'path'
import fs from 'fs-extra'
import replaceInFile from 'replace-in-file'

import { glob, FileFsRef, PackageJson } from '@vercel/build-utils'
import fs from 'fs-extra'
import replaceInFile from 'replace-in-file'

import { exec, getNuxtConfig, getNuxtConfigName, readJSON } from './utils'

Expand Down
11 changes: 6 additions & 5 deletions src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import path from 'path'
import { SpawnOptions } from 'child_process'
import fs from 'fs-extra'
import execa, { ExecaReturnValue } from 'execa'
import esm from 'esm'

import type { NuxtConfig as NuxtConfiguration } from '@nuxt/types'
import { glob, Files, PackageJson } from '@vercel/build-utils'
import consola from 'consola'
import { IOptions } from 'glob'
import { NuxtConfig as NuxtConfiguration } from '@nuxt/types'
import esm from 'esm'
import execa, { ExecaReturnValue } from 'execa'
import fs from 'fs-extra'
import type { IOptions } from 'glob'

type Mutable<T> = {
-readonly [P in keyof T]: T[P] extends ReadonlyArray<infer U> ? Mutable<U>[] : Mutable<T[P]>
Expand Down
Loading

0 comments on commit 3fefbe3

Please sign in to comment.