Skip to content

Commit

Permalink
feat: upgrading all dependencies (#37)
Browse files Browse the repository at this point in the history 
* feat: upgrading all dependencies

* fix: upgrading again, replacing glob with tiny-glob

* fix: handle errors when no functions exist
  • Loading branch information
@JakePartusch
JakePartusch committed Apr 28, 2021
1 parent 12b75b4 commit e87a550
Show file tree
Hide file tree
Showing 7 changed files with 3,488 additions and 3,238 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Expand Up @@ -7,6 +7,6 @@
],
"scripts": {},
"devDependencies": {
"lerna": "^3.22.1"
"lerna": "^4.0.0"
}
}
30 changes: 15 additions & 15 deletions packages/cli/package.json
View file
Expand Up @@ -44,25 +44,25 @@
"dependencies": {
"@serverlessui/domain-app": "^0.9.0",
"@serverlessui/serverless-app": "^0.9.0",
"aws-cdk": "1.95.1",
"aws-cdk": "1.100.0",
"cosmiconfig": "^7.0.0",
"esbuild": "^0.8.57",
"glob": "^7.1.6",
"gluegun": "^4.6.1"
"esbuild": "^0.11.15",
"gluegun": "^4.6.1",
"tiny-glob": "^0.2.8"
},
"devDependencies": {
"@rollup/plugin-typescript": "^8.1.1",
"@types/jest": "^24.0.18",
"@types/node": "^12.7.11",
"jest": "^24.1.0",
"prettier": "^1.12.1",
"rollup": "^2.38.5",
"ts-jest": "^24.1.0",
"ts-node": "^8.4.1",
"tslint": "^5.12.0",
"@rollup/plugin-typescript": "^8.2.1",
"@types/jest": "^26.0.23",
"@types/node": "^14.14.42",
"jest": "^26.3.3",
"prettier": "^2.2.1",
"rollup": "^2.45.2",
"ts-jest": "^26.5.5",
"ts-node": "^9.1.1",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.17.0",
"tslint-config-standard": "^8.0.1",
"typescript": "^4.1.3"
"tslint-config-standard": "^9.0.0",
"typescript": "^4.2.4"
},
"jest": {
"preset": "ts-jest",
Expand Down
25 changes: 16 additions & 9 deletions packages/cli/src/commands/deploy.ts
View file
@@ -1,28 +1,35 @@
import { GluegunCommand } from 'gluegun'
import * as glob from 'glob'
import glob from 'tiny-glob'
import * as child_process from 'child_process'
import { cosmiconfigSync } from 'cosmiconfig'
const serverlessApplicationPath = require.resolve(
'@serverlessui/serverless-app'
)

const readFunctionFiles = async (functionsDir: string): Promise<string> => {
try {
const files = await glob(`${functionsDir}/**/*.{js,ts}`)
return files.join(',')
} catch (e) {
return ''
}
}

export const command: GluegunCommand = {
name: 'deploy',
alias: 'd',
description: 'Deploy your website and serverless functions',
run: async toolbox => {
run: async (toolbox) => {
const { parameters } = toolbox

const { options } = parameters

const { functions = './functions', dir = './dist', prod = false } = options

const files = glob.sync(`${functions}/**/*.{js,ts}`)

const apiFiles = await readFunctionFiles(functions)
const explorerSync = cosmiconfigSync('serverlessui')
const configResult = explorerSync.search()

const apiFiles = files.join(',')
const prodCli = prod ? '-c prod=true' : ''

if (apiFiles.length === 0) {
Expand Down Expand Up @@ -59,7 +66,7 @@ export const command: GluegunCommand = {
child_process.execSync(
`npx cdk bootstrap ${prodCli} ${domainConfigCli} -c apiEntries="${apiFiles}" -c uiEntry="${dir}" -a "node ${serverlessApplicationPath}"`,
{
stdio: 'inherit'
stdio: 'inherit',
}
)

Expand All @@ -69,7 +76,7 @@ export const command: GluegunCommand = {
child_process.execSync(
`npx cdk synth ${prodCli} ${domainConfigCli} -c apiEntries="${apiFiles}" -c uiEntry="${dir}" -a "node ${serverlessApplicationPath}" --quiet`,
{
stdio: 'inherit'
stdio: 'inherit',
}
)

Expand All @@ -80,8 +87,8 @@ export const command: GluegunCommand = {
child_process.execSync(
`npx cdk deploy ${prodCli} ${domainConfigCli} -c apiEntries="${apiFiles}" -c uiEntry=${dir} -a "node ${serverlessApplicationPath}" --require-approval never --outputs-file cdk.out/outputs.json`,
{
stdio: 'inherit'
stdio: 'inherit',
}
)
}
},
}
28 changes: 14 additions & 14 deletions packages/construct/package.json
View file
Expand Up @@ -28,17 +28,17 @@
"prepack": "yarn rimraf && yarn build"
},
"dependencies": {
"@aws-cdk/aws-apigatewayv2": "1.95.1",
"@aws-cdk/aws-apigatewayv2-integrations": "1.95.1",
"@aws-cdk/aws-certificatemanager": "1.95.1",
"@aws-cdk/aws-cloudfront": "1.95.1",
"@aws-cdk/aws-cloudfront-origins": "1.95.1",
"@aws-cdk/aws-lambda-nodejs": "1.95.1",
"@aws-cdk/aws-route53": "1.95.1",
"@aws-cdk/aws-route53-targets": "1.95.1",
"@aws-cdk/aws-s3": "1.95.1",
"@aws-cdk/aws-s3-deployment": "1.95.1",
"@aws-cdk/core": "1.95.1",
"@aws-cdk/aws-apigatewayv2": "1.100.0",
"@aws-cdk/aws-apigatewayv2-integrations": "1.100.0",
"@aws-cdk/aws-certificatemanager": "1.100.0",
"@aws-cdk/aws-cloudfront": "1.100.0",
"@aws-cdk/aws-cloudfront-origins": "1.100.0",
"@aws-cdk/aws-lambda-nodejs": "1.100.0",
"@aws-cdk/aws-route53": "1.100.0",
"@aws-cdk/aws-route53-targets": "1.100.0",
"@aws-cdk/aws-s3": "1.100.0",
"@aws-cdk/aws-s3-deployment": "1.100.0",
"@aws-cdk/core": "1.100.0",
"deepmerge": "^4.2.2"
},
"files": [
Expand All @@ -48,10 +48,10 @@
"readme.md"
],
"devDependencies": {
"@rollup/plugin-typescript": "^8.1.1",
"@rollup/plugin-typescript": "^8.2.1",
"@tsconfig/node10": "^1.0.7",
"rollup": "^2.38.5",
"typescript": "^4.1.3"
"rollup": "^2.45.2",
"typescript": "^4.2.4"
},
"gitHead": "4a136cf3777ae864939139dcaee277e9213fe925"
}
8 changes: 4 additions & 4 deletions packages/domain-application/package.json
View file
Expand Up @@ -28,14 +28,14 @@
"prepack": "yarn rimraf && yarn build"
},
"dependencies": {
"@aws-cdk/core": "1.95.1",
"@aws-cdk/core": "1.100.0",
"@serverlessui/construct": "^0.9.0"
},
"devDependencies": {
"@rollup/plugin-typescript": "^8.1.1",
"@rollup/plugin-typescript": "^8.2.1",
"@tsconfig/node10": "^1.0.7",
"rollup": "^2.38.5",
"typescript": "^4.1.3"
"rollup": "^2.45.2",
"typescript": "^4.2.4"
},
"files": [
"tsconfig.json",
Expand Down
16 changes: 8 additions & 8 deletions packages/serverless-application/package.json
View file
Expand Up @@ -28,18 +28,18 @@
"prepack": "yarn rimraf && yarn build"
},
"dependencies": {
"@aws-cdk/aws-certificatemanager": "1.95.1",
"@aws-cdk/aws-route53": "1.95.1",
"@aws-cdk/aws-s3-deployment": "1.95.1",
"@aws-cdk/core": "1.95.1",
"@aws-cdk/aws-certificatemanager": "1.100.0",
"@aws-cdk/aws-route53": "1.100.0",
"@aws-cdk/aws-s3-deployment": "1.100.0",
"@aws-cdk/core": "1.100.0",
"@serverlessui/construct": "^0.9.0",
"nanoid": "^3.1.20"
"nanoid": "^3.1.22"
},
"devDependencies": {
"@rollup/plugin-typescript": "^8.1.1",
"@rollup/plugin-typescript": "^8.2.1",
"@tsconfig/node10": "^1.0.7",
"rollup": "^2.38.5",
"typescript": "^4.1.3"
"rollup": "^2.45.2",
"typescript": "^4.2.4"
},
"files": [
"tsconfig.json",
Expand Down

0 comments on commit e87a550

Please sign in to comment.