Skip to content

Commit 7e0df3e

Browse files
fix(nx-serverless): fix stage during init serverless (#111)
* fix(nx-serverless): fix stage during init serverless * fix(nx-serverless): graceful-fs 4.2.1 so its not failing in ubuntu * fix(nx-serverless): fixed `copyBuildOutputToBePackaged` by added remove old build output files before copy * docs(nx-serverless): update release version 1.0.2 => 1.0.3 * docs(nx-serverless): update release version 1.0.2 => 1.1.0 Co-authored-by: Narong <narong@flowaccount.com>
1 parent 74df250 commit 7e0df3e

32 files changed

Lines changed: 163 additions & 102 deletions

.scully/settings.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
identifier: kaxe4dp4kelcv7w1

libs/nx-serverless/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@flowaccount/nx-serverless",
3-
"version": "1.0.2",
3+
"version": "1.1.0",
44
"main": "src/index.js",
55
"description": "Serverless schematics for nx workspace",
66
"keywords": [
@@ -46,7 +46,8 @@
4646
"serverless-offline": "^7.0.0",
4747
"serverless-apigw-binary": "^0.4.4",
4848
"is-builtin-module": "^3.0.0",
49-
"rxjs-for-await": "0.0.2"
49+
"rxjs-for-await": "0.0.2",
50+
"graceful-fs": "4.2.1"
5051
},
5152
"devDependencies": {},
5253
"repository": {

libs/nx-serverless/src/builders/deploy/deploy.impl.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ describe('Serverless Deploy Builder', () => {
3939
buildTarget: 'serverlessapp:build:production',
4040
location: 'dist/apps/serverlessapp',
4141
package: 'dist/apps/serverlessapp',
42-
config: 'apps/serverlessapp/serverless.yml',
42+
config: 'apps/serverlessapp/serverless.ts',
4343
waitUntilTargets: [],
4444
inspect: false,
4545
host: null,

libs/nx-serverless/src/builders/deploy/deploy.impl.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { BuilderOutput } from '@angular-devkit/architect';
21
import { JsonObject } from '@angular-devkit/core';
32
import * as _ from 'lodash';
43
import {

libs/nx-serverless/src/builders/deploy/schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"config": {
1919
"type": "string",
20-
"description": "The serverless.yml location"
20+
"description": "The serverless.yml/serverless.ts location"
2121
},
2222
"location": {
2323
"type": "string",

libs/nx-serverless/src/builders/destroy/schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"config": {
1919
"type": "string",
20-
"description": "The serverless.yml location"
20+
"description": "The serverless.yml/serverless.ts location"
2121
},
2222
"location": {
2323
"type": "string",

libs/nx-serverless/src/builders/offline/schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"config": {
2020
"type": "string",
21-
"description": "The serverless.yml location"
21+
"description": "The serverless.yml/serverless.ts location"
2222
},
2323
"location": {
2424
"type": "string",

libs/nx-serverless/src/builders/scully/scully.impl.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,18 @@ async function runScully(
5454
) {
5555
const commands: { command: string }[] = [];
5656
const args = getExecArgv(options);
57+
5758
options.configFiles.forEach((fileName) => {
5859
commands.push({
59-
command: `scully --configFile=${fileName} ${args.join(' ')}`,
60+
command: `scully --configFile=${fileName} --disableProjectFolderCheck ${args.join(
61+
' '
62+
)}`,
6063
});
64+
console.log(
65+
`scully --configFile=${fileName} --disableProjectFolderCheck ${args.join(
66+
' '
67+
)}`
68+
);
6169
});
6270
const root = getSourceRoot(context);
6371
await runCommand(

libs/nx-serverless/src/builders/sls/schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"config": {
1919
"type": "string",
20-
"description": "The serverless.yml location"
20+
"description": "The serverless.yml/serverless.ts location"
2121
},
2222
"location": {
2323
"type": "string",

libs/nx-serverless/src/builders/sls/sls.impl.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
// buildTarget: 'serverlessapp:build:production',
2525
// location: 'dist/apps/serverlessapp',
2626
// package: 'dist/apps/serverlessapp',
27-
// config: 'apps/serverlessapp/serverless.yml',
27+
// config: 'apps/serverlessapp/serverless.ts',
2828
// waitUntilTargets: [],
2929
// inspect: false,
3030
// host: null,

0 commit comments

Comments
 (0)