Skip to content

Commit bfcc3f7

Browse files
pavelvlasovpavelvlasov
authored
Move parser into a separate package (#53)
* move parser into external package * add readme * remove old dependencies * update ci script * no ci flag * add build step * update pre publish stage * fix required props for schedule event * update changelog and readme * v0.5.2 * update dependencies * v0.5.3 * update dependencies * v0.5.4 * update dependencies * v0.5.5 * update package lock
1 parent 065a992 commit bfcc3f7

File tree

15 files changed

+113
-177
lines changed

15 files changed

+113
-177
lines changed

‎.prettierrc.js

-7
This file was deleted.

‎lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"packages": [
33
"packages/*"
44
],
5-
"version": "0.5.1",
5+
"version": "0.5.5",
66
"npmClient": "npm",
77
"ignoreChanges": [
88
"*.md",

‎packages/cloudformation-schema/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@serverless-ide/cloudformation-schema",
3-
"version": "0.5.0",
3+
"version": "0.5.5",
44
"description": "Json schema for AWS SAM template configuration",
55
"main": "dist/index.js",
66
"repository": "[email protected]:threadheap/aws-sam-json-schema.git",
@@ -19,25 +19,25 @@
1919
"json-stable-stringify": "^1.0.1",
2020
"lodash": "^4.17.11",
2121
"request": "^2.88.0",
22-
"request-promise": "^4.2.2",
23-
"typescript": "^3.2.2"
22+
"request-promise": "^4.2.2"
2423
},
2524
"devDependencies": {
2625
"@types/json-stable-stringify": "^1.0.32",
2726
"@types/lodash": "^4.14.119",
2827
"@types/node": "^10.12.18",
2928
"@types/request": "^2.48.1",
30-
"@types/request-promise": "^4.1.42"
29+
"@types/request-promise": "^4.1.42",
30+
"typescript": "^3.2.2"
3131
},
3232
"scripts": {
3333
"build": "npm run clean && npm run compile && node dist/index.js",
3434
"clean": "rm -rf ./dist",
3535
"compile": "tsc",
36-
"prepublishOnly": "npm run generate",
36+
"prepublishOnly": "npm run build",
3737
"lint:types": "tsc --noEmit"
3838
},
3939
"publishConfig": {
4040
"access": "public"
4141
},
42-
"gitHead": "4bc5eddda35b9e7cc28f2580da1960b017881f33"
42+
"gitHead": "390fa05ac004e80dd92b96e08eded82c162ffcd9"
4343
}

‎packages/config/package-lock.json

+8-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/config/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@serverless-ide/config",
33
"description": "Serverless IDE config model and parser",
4-
"version": "0.5.1",
4+
"version": "0.5.5",
55
"author": "Pavel Vlasov <[email protected]>",
66
"license": "MIT",
77
"engines": {
@@ -42,14 +42,14 @@
4242
},
4343
"devDependencies": {
4444
"@types/js-yaml": "^3.12.1",
45+
"@types/lodash": "^4.14.144",
4546
"@types/lru-cache": "^4.1.1",
4647
"@types/node": "^9.4.7",
4748
"@types/vscode": "^1.37.0",
48-
"source-map-support": "^0.5.4",
49-
"@types/lodash": "^4.14.144"
49+
"typescript": "^3.2.2"
5050
},
5151
"publishConfig": {
5252
"access": "public"
5353
},
54-
"gitHead": "0ad06a7e4d561e4bc90344eb4fd72ad3d2d12538"
54+
"gitHead": "390fa05ac004e80dd92b96e08eded82c162ffcd9"
5555
}

‎packages/language-server/package-lock.json

+8-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/language-server/package.json

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@serverless-ide/language-server",
33
"description": "Serverless IDE language server",
4-
"version": "0.5.1",
4+
"version": "0.5.5",
55
"author": "Pavel Vlasov <[email protected]>",
66
"license": "MIT",
77
"engines": {
@@ -23,28 +23,29 @@
2323
"url": "https://github.com/threadheap/serverless-ide-language-server.git"
2424
},
2525
"dependencies": {
26-
"@serverless-ide/config": "^0.5.1",
27-
"@serverless-ide/cloudformation-schema": "^0.5.0",
28-
"@serverless-ide/sam-schema": "^0.5.0",
29-
"@serverless-ide/serverless-framework-schema": "^0.5.0",
26+
"@serverless-ide/cloudformation-schema": "^0.5.5",
27+
"@serverless-ide/config": "^0.5.5",
28+
"@serverless-ide/sam-schema": "^0.5.5",
29+
"@serverless-ide/serverless-framework-schema": "^0.5.5",
3030
"es6-promise-pool": "^2.5.0",
31+
"jsonc-parser": "^1.0.3",
3132
"lru-cache": "^5.1.1",
3233
"request-light": "^0.2.3",
3334
"ts-get": "^1.0.3",
3435
"vscode-json-languageservice": "3.0.12",
3536
"vscode-languageserver": "^5.2.1",
3637
"vscode-languageserver-types": "^3.14.0",
3738
"vscode-nls": "^3.2.2",
38-
"vscode-uri": "^1.0.6",
39-
"jsonc-parser": "^1.0.3"
39+
"vscode-uri": "^1.0.6"
4040
},
4141
"devDependencies": {
4242
"@types/js-yaml": "^3.12.1",
4343
"@types/lodash": "^4.14.144",
4444
"@types/lru-cache": "^4.1.1",
4545
"@types/node": "^9.4.7",
4646
"@types/vscode": "^1.37.0",
47-
"source-map-support": "^0.5.4"
47+
"source-map-support": "^0.5.4",
48+
"typescript": "^3.2.2"
4849
},
4950
"scripts": {
5051
"build": "npm run clean && npm run compile",
@@ -60,5 +61,5 @@
6061
"publishConfig": {
6162
"access": "public"
6263
},
63-
"gitHead": "0ad06a7e4d561e4bc90344eb4fd72ad3d2d12538"
64-
}
64+
"gitHead": "390fa05ac004e80dd92b96e08eded82c162ffcd9"
65+
}

‎packages/sam-schema/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@serverless-ide/sam-schema",
3-
"version": "0.5.0",
3+
"version": "0.5.5",
44
"description": "Json schema for AWS SAM template configuration",
55
"main": "index.js",
66
"repository": "[email protected]:threadheap/aws-sam-json-schema.git",
@@ -23,7 +23,7 @@
2323
"typescript": "^3.2.2"
2424
},
2525
"devDependencies": {
26-
"@serverless-ide/cloudformation-schema": "^0.5.0",
26+
"@serverless-ide/cloudformation-schema": "^0.5.5",
2727
"@types/json-stable-stringify": "^1.0.32",
2828
"@types/lodash": "^4.14.119",
2929
"@types/node": "^10.12.18",
@@ -34,11 +34,11 @@
3434
"build": "npm run clean && npm run compile && node dist/index.js",
3535
"clean": "rm -rf ./dist",
3636
"compile": "tsc",
37-
"prepublishOnly": "npm run generate",
37+
"prepublishOnly": "npm run build",
3838
"lint:types": "tsc --noEmit"
3939
},
4040
"publishConfig": {
4141
"access": "public"
4242
},
43-
"gitHead": "4bc5eddda35b9e7cc28f2580da1960b017881f33"
43+
"gitHead": "390fa05ac004e80dd92b96e08eded82c162ffcd9"
4444
}

‎packages/serverless-framework-schema/json/aws/functions/events/schedule.json

-18
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,7 @@
3535
"type": "object"
3636
}
3737
},
38-
"oneOf": [
39-
{
40-
"required": [
41-
"input"
42-
]
43-
},
44-
{
45-
"required": [
46-
"inputPath"
47-
]
48-
},
49-
{
50-
"required": [
51-
"inputTransformer"
52-
]
53-
}
54-
],
5538
"require": [
56-
"name",
5739
"rate"
5840
]
5941
},

‎packages/serverless-framework-schema/package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@serverless-ide/serverless-framework-schema",
3-
"version": "0.5.0",
3+
"version": "0.5.5",
44
"description": "Json schema for AWS SAM template configuration",
55
"main": "index.js",
66
"repository": "[email protected]:threadheap/aws-sam-json-schema.git",
@@ -25,7 +25,7 @@
2525
"typescript": "^3.2.2"
2626
},
2727
"devDependencies": {
28-
"@serverless-ide/sam-schema": "^0.5.0",
28+
"@serverless-ide/sam-schema": "^0.5.5",
2929
"@types/glob": "^7.1.1",
3030
"@types/json-stable-stringify": "^1.0.32",
3131
"@types/lodash": "^4.14.119",
@@ -43,5 +43,6 @@
4343
},
4444
"publishConfig": {
4545
"access": "public"
46-
}
46+
},
47+
"gitHead": "390fa05ac004e80dd92b96e08eded82c162ffcd9"
4748
}

‎packages/serverless-framework-schema/schema.json

-18
Original file line numberDiff line numberDiff line change
@@ -783,25 +783,7 @@
783783
"type": "object"
784784
}
785785
},
786-
"oneOf": [
787-
{
788-
"required": [
789-
"input"
790-
]
791-
},
792-
{
793-
"required": [
794-
"inputPath"
795-
]
796-
},
797-
{
798-
"required": [
799-
"inputTransformer"
800-
]
801-
}
802-
],
803786
"require": [
804-
"name",
805787
"rate"
806788
]
807789
},

‎packages/vscode/CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Change log
22

3+
## v0.5.2
4+
- Fix required properties for serverless framework schedule event
5+
36
## v0.5.1
47
- Fix error thrown by hover method, when a path contains number
58

‎packages/vscode/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[![Marketplace Version](https://vsmarketplacebadge.apphb.com/version/ThreadHeap.serverless-ide-vscode.svg 'Current Release')](https://marketplace.visualstudio.com/items?itemName=ThreadHeap.serverless-ide-vscode)
22
[![Rating](https://vsmarketplacebadge.apphb.com/rating-star/ThreadHeap.serverless-ide-vscode.svg 'Current Release')](https://marketplace.visualstudio.com/items?itemName=ThreadHeap.serverless-ide-vscode)
33
[![Installs](https://vsmarketplacebadge.apphb.com/installs/ThreadHeap.serverless-ide-vscode.svg 'Current Release')](https://marketplace.visualstudio.com/items?itemName=ThreadHeap.serverless-ide-vscode)
4-
[![Downloads](https://vsmarketplacebadge.apphb.com/downloads/ThreadHeap.serverless-ide-vscode.svg 'Current Release')](https://marketplace.visualstudio.com/items?itemName=ThreadHeap.serverless-ide-vscode)
54

65
# Serverless IDE: Enhanced support of AWS SAM, CloudFormation and Serverless Framework in Visual Studio Code
76

0 commit comments

Comments
 (0)