feat: upgrading all dependencies (#37)

JakePartusch · web-flow · commit e87a55092ebf · 2021-04-27T20:40:38.000-05:00
* feat: upgrading all dependencies

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

* fix: handle errors when no functions exist
diff --git a/package.json b/package.json
@@ -7,6 +7,6 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "lerna": "^3.22.1"
+    "lerna": "^4.0.0"
   }
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -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",
diff --git a/packages/cli/src/commands/deploy.ts b/packages/cli/src/commands/deploy.ts
@@ -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) {
@@ -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',
       }
     )
 
@@ -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',
       }
     )
 
@@ -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',
       }
     )
-  }
+  },
 }
diff --git a/packages/construct/package.json b/packages/construct/package.json
@@ -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": [
@@ -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"
 }
diff --git a/packages/domain-application/package.json b/packages/domain-application/package.json
@@ -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",
diff --git a/packages/serverless-application/package.json b/packages/serverless-application/package.json
@@ -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",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`	`],`
`8`	`8`	`"scripts": {},`
`9`	`9`	`"devDependencies": {`
`10`		`- "lerna": "^3.22.1"`
	`10`	`+ "lerna": "^4.0.0"`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,28 +1,35 @@`
`1`	`1`	`import { GluegunCommand } from 'gluegun'`
`2`		`-import * as glob from 'glob'`
	`2`	`+import glob from 'tiny-glob'`
`3`	`3`	`import * as child_process from 'child_process'`
`4`	`4`	`import { cosmiconfigSync } from 'cosmiconfig'`
`5`	`5`	`const serverlessApplicationPath = require.resolve(`
`6`	`6`	`'@serverlessui/serverless-app'`
`7`	`7`	`)`
`8`	`8`
	`9`	`+const readFunctionFiles = async (functionsDir: string): Promise<string> => {`
	`10`	`+ try {`
	`11`	+ const files = await glob(`${functionsDir}/*/.{js,ts}`)
	`12`	`+ return files.join(',')`
	`13`	`+ } catch (e) {`
	`14`	`+ return ''`
	`15`	`+ }`
	`16`	`+}`
	`17`	`+`
`9`	`18`	`export const command: GluegunCommand = {`
`10`	`19`	`name: 'deploy',`
`11`	`20`	`alias: 'd',`
`12`	`21`	`description: 'Deploy your website and serverless functions',`
`13`		`- run: async toolbox => {`
	`22`	`+ run: async (toolbox) => {`
`14`	`23`	`const { parameters } = toolbox`
`15`	`24`
`16`	`25`	`const { options } = parameters`
`17`	`26`
`18`	`27`	`const { functions = './functions', dir = './dist', prod = false } = options`
`19`	`28`
`20`		- const files = glob.sync(`${functions}/*/.{js,ts}`)
`21`		`-`
	`29`	`+ const apiFiles = await readFunctionFiles(functions)`
`22`	`30`	`const explorerSync = cosmiconfigSync('serverlessui')`
`23`	`31`	`const configResult = explorerSync.search()`
`24`	`32`
`25`		`- const apiFiles = files.join(',')`
`26`	`33`	`const prodCli = prod ? '-c prod=true' : ''`
`27`	`34`
`28`	`35`	`if (apiFiles.length === 0) {`
`@@ -59,7 +66,7 @@ export const command: GluegunCommand = {`
`59`	`66`	`child_process.execSync(`
`60`	`67`	`npx cdk bootstrap ${prodCli} ${domainConfigCli} -c apiEntries="${apiFiles}" -c uiEntry="${dir}" -a "node ${serverlessApplicationPath}"`,
`61`	`68`	`{`
`62`		`- stdio: 'inherit'`
	`69`	`+ stdio: 'inherit',`
`63`	`70`	`}`
`64`	`71`	`)`
`65`	`72`
`@@ -69,7 +76,7 @@ export const command: GluegunCommand = {`
`69`	`76`	`child_process.execSync(`
`70`	`77`	`npx cdk synth ${prodCli} ${domainConfigCli} -c apiEntries="${apiFiles}" -c uiEntry="${dir}" -a "node ${serverlessApplicationPath}" --quiet`,
`71`	`78`	`{`
`72`		`- stdio: 'inherit'`
	`79`	`+ stdio: 'inherit',`
`73`	`80`	`}`
`74`	`81`	`)`
`75`	`82`
`@@ -80,8 +87,8 @@ export const command: GluegunCommand = {`
`80`	`87`	`child_process.execSync(`
`81`	`88`	`npx cdk deploy ${prodCli} ${domainConfigCli} -c apiEntries="${apiFiles}" -c uiEntry=${dir} -a "node ${serverlessApplicationPath}" --require-approval never --outputs-file cdk.out/outputs.json`,
`82`	`89`	`{`
`83`		`- stdio: 'inherit'`
	`90`	`+ stdio: 'inherit',`
`84`	`91`	`}`
`85`	`92`	`)`
`86`		`- }`
	`93`	`+ },`
`87`	`94`	`}`