lesgo 4.0.0 → 4.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/README.md +1 -1
  2. package/bin/lesgo-scripts.sh +30 -18
  3. package/package.json +8 -3
package/README.md CHANGED
@@ -3,7 +3,7 @@
3
3
  ![Build Status](https://github.com/reflex-media/lesgo-framework/actions/workflows/release.yml/badge.svg)
4
4
  [![Coverage Status](https://coveralls.io/repos/github/reflex-media/lesgo-framework/badge.svg?branch=master)](https://coveralls.io/github/reflex-media/lesgo-framework?branch=master)
5
5
 
6
- Bootstrap your next microservice with a lightweight node.js serverless framework.
6
+ Bootstrap your next microservice with a lightweight node.js serverless framework. Optimized for [osls](https://github.com/oss-serverless/serverless).
7
7
 
8
8
  > Note: This repository contains the core code of the Lesgo! framework. If you want to build an application using Lesgo!, visit the [docs](https://reflex-media.github.io/lesgo-docs).
9
9
 
package/bin/lesgo-scripts.sh CHANGED
@@ -93,18 +93,30 @@ NC='\033[0m';
93
93
  # FUNCTION DECLARATIONS #
94
94
  # #
95
95
  ###############################################################################
96
+ LOCAL_OSLS_VERSION=`npm ls --depth=0 osls | grep -o "osls@.*" || true`
97
+ GLOBAL_OSLS_VERSION=`npm ls -g --depth=0 osls | grep -o "osls@.*" || true`
96
98
  LOCAL_SERVERLESS_VERSION=`npm ls --depth=0 serverless | grep -o "serverless@.*" || true`
97
99
  GLOBAL_SERVERLESS_VERSION=`npm ls -g --depth=0 serverless | grep -o "serverless@.*" || true`
98
100
  LATEST_SERVERLESS_VERSION_NUMBER=3
99
101
 
100
- if [ -z "$LOCAL_SERVERLESS_VERSION" ]
101
- then
102
- CURRENT_SERVERLESS_VERSION=$GLOBAL_SERVERLESS_VERSION
103
- else
102
+ if [ -n "$LOCAL_OSLS_VERSION" ]; then
103
+ CURRENT_SERVERLESS_VERSION=$LOCAL_OSLS_VERSION
104
+ elif [ -n "$GLOBAL_OSLS_VERSION" ]; then
105
+ CURRENT_SERVERLESS_VERSION=$GLOBAL_OSLS_VERSION
106
+ elif [ -n "$LOCAL_SERVERLESS_VERSION" ]; then
104
107
  CURRENT_SERVERLESS_VERSION=$LOCAL_SERVERLESS_VERSION
108
+ else
109
+ CURRENT_SERVERLESS_VERSION=$GLOBAL_SERVERLESS_VERSION
105
110
  fi
111
+
112
+ if [ -z "$CURRENT_SERVERLESS_VERSION" ]; then
113
+ echo -e "${RED}Neither osls nor serverless CLI found. Please install one of them.${NC}"
114
+ exit 1
115
+ fi
116
+
106
117
  SERVERLESS_VERSION=${CURRENT_SERVERLESS_VERSION#*@}
107
118
  SERVERLESS_VERSION_NUMBER=${SERVERLESS_VERSION%%.*}
119
+ SLS_CMD="sls"
108
120
 
109
121
  echo -e "Running Serverless version:\n${CURRENT_SERVERLESS_VERSION}\n"
110
122
  echo -e "Current Serverless version: ${SERVERLESS_VERSION_NUMBER}\n"
@@ -123,9 +135,9 @@ function deploy_func ()
123
135
  echo -e "${YELLOW}Deploying ${FUNCTION} to ${STAGE}${NC} using ${CONFIG}"
124
136
 
125
137
  if [ ${SERVERLESS_VERSION_NUMBER} -ge ${LATEST_SERVERLESS_VERSION_NUMBER} ]; then
126
- sls deploy function -f ${FUNCTION} --stage ${STAGE} --param="env=${ENVFILE}" --config ${CONFIG}
138
+ ${SLS_CMD} deploy function -f ${FUNCTION} --stage ${STAGE} --param="env=${ENVFILE}" --config ${CONFIG}
127
139
  else
128
- sls deploy -f ${FUNCTION} --stage ${STAGE} --env ${ENVFILE} --config ${CONFIG}
140
+ ${SLS_CMD} deploy -f ${FUNCTION} --stage ${STAGE} --env ${ENVFILE} --config ${CONFIG}
129
141
  fi
130
142
  }
131
143
 
@@ -161,9 +173,9 @@ function deploy_full ()
161
173
  {
162
174
  echo -e "${YELLOW}Deploying service to ${STAGE}${NC}"
163
175
  if [ ${SERVERLESS_VERSION_NUMBER} -ge ${LATEST_SERVERLESS_VERSION_NUMBER} ]; then
164
- sls deploy --stage ${STAGE} --param="env=${ENVFILE}" --config ${CONFIG}
176
+ ${SLS_CMD} deploy --stage ${STAGE} --param="env=${ENVFILE}" --config ${CONFIG}
165
177
  else
166
- sls deploy --stage ${STAGE} --env ${ENVFILE} --config ${CONFIG}
178
+ ${SLS_CMD} deploy --stage ${STAGE} --env ${ENVFILE} --config ${CONFIG}
167
179
  fi
168
180
  }
169
181
 
@@ -172,16 +184,16 @@ function invoke_func ()
172
184
  echo -e "${YELLOW}Invoking function ${FUNCTION} on ${STAGE}${NC} using ${CONFIG}"
173
185
  if [ ${INVOKE_LOCAL} == 1 ]; then
174
186
  if [ ${SERVERLESS_VERSION_NUMBER} -ge ${LATEST_SERVERLESS_VERSION_NUMBER} ]; then
175
- sls invoke local -f ${FUNCTION} --stage ${STAGE} --param="env=${ENVFILE}" -d ${DATA} -l --config ${CONFIG}
187
+ ${SLS_CMD} invoke local -f ${FUNCTION} --stage ${STAGE} --param="env=${ENVFILE}" -d ${DATA} -l --config ${CONFIG}
176
188
  else
177
- sls invoke local -f ${FUNCTION} --stage ${STAGE} --env ${ENVFILE} -d ${DATA} -l --config ${CONFIG}
189
+ ${SLS_CMD} invoke local -f ${FUNCTION} --stage ${STAGE} --env ${ENVFILE} -d ${DATA} -l --config ${CONFIG}
178
190
  fi
179
191
 
180
192
  else
181
193
  if [ ${SERVERLESS_VERSION_NUMBER} -ge ${LATEST_SERVERLESS_VERSION_NUMBER} ]; then
182
- sls invoke -f ${FUNCTION} --stage ${STAGE} --param="env=${ENVFILE}" -d ${DATA} -l --config ${CONFIG}
194
+ ${SLS_CMD} invoke -f ${FUNCTION} --stage ${STAGE} --param="env=${ENVFILE}" -d ${DATA} -l --config ${CONFIG}
183
195
  else
184
- sls invoke -f ${FUNCTION} --stage ${STAGE} --env ${ENVFILE} -d ${DATA} -l --config ${CONFIG}
196
+ ${SLS_CMD} invoke -f ${FUNCTION} --stage ${STAGE} --env ${ENVFILE} -d ${DATA} -l --config ${CONFIG}
185
197
  fi
186
198
  fi
187
199
  }
@@ -190,9 +202,9 @@ function log_stream_func ()
190
202
  {
191
203
  echo -e "${YELLOW}Log Streaming function ${FUNCTION} on ${STAGE}${NC} using ${CONFIG}"
192
204
  if [ ${SERVERLESS_VERSION_NUMBER} -ge ${LATEST_SERVERLESS_VERSION_NUMBER} ]; then
193
- sls logs -f ${FUNCTION} --stage ${STAGE} --param="env=${ENVFILE}" -t --config ${CONFIG}
205
+ ${SLS_CMD} logs -f ${FUNCTION} --stage ${STAGE} --param="env=${ENVFILE}" -t --config ${CONFIG}
194
206
  else
195
- sls logs -f ${FUNCTION} --stage ${STAGE} --env ${ENVFILE} -t --config ${CONFIG}
207
+ ${SLS_CMD} logs -f ${FUNCTION} --stage ${STAGE} --env ${ENVFILE} -t --config ${CONFIG}
196
208
  fi
197
209
  }
198
210
 
@@ -200,9 +212,9 @@ function build ()
200
212
  {
201
213
  echo -e "${YELLOW}Building bundle without deployment${NC} using ${CONFIG}"
202
214
  if [ ${SERVERLESS_VERSION_NUMBER} -ge ${LATEST_SERVERLESS_VERSION_NUMBER} ]; then
203
- sls webpack --stage ${STAGE} --param="env=${ENVFILE}" --config ${CONFIG}
215
+ ${SLS_CMD} webpack --stage ${STAGE} --param="env=${ENVFILE}" --config ${CONFIG}
204
216
  else
205
- sls webpack --stage ${STAGE} --env ${ENVFILE} --config ${CONFIG}
217
+ ${SLS_CMD} webpack --stage ${STAGE} --env ${ENVFILE} --config ${CONFIG}
206
218
  fi
207
219
  }
208
220
 
@@ -222,9 +234,9 @@ function destroy_service ()
222
234
  {
223
235
  echo -e "${YELLOW}Removing service to ${STAGE}${NC}"
224
236
  if [ ${SERVERLESS_VERSION_NUMBER} -ge ${LATEST_SERVERLESS_VERSION_NUMBER} ]; then
225
- sls remove --stage ${STAGE} --param="env=${ENVFILE}" --config ${CONFIG}
237
+ ${SLS_CMD} remove --stage ${STAGE} --param="env=${ENVFILE}" --config ${CONFIG}
226
238
  else
227
- sls remove --stage ${STAGE} --env ${ENVFILE} --config ${CONFIG}
239
+ ${SLS_CMD} remove --stage ${STAGE} --env ${ENVFILE} --config ${CONFIG}
228
240
  fi
229
241
  }
230
242
 
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "lesgo",
3
- "version": "4.0.0",
4
- "description": "Core framework for lesgo node.js serverless framework.",
3
+ "version": "4.1.1",
4
+ "description": "Core framework for lesgo node.js serverless applications. Optimized for osls.",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",
7
7
  "author": "Sufiyan Rahmat",
@@ -178,7 +178,12 @@
178
178
  "node": ">=20.17.0"
179
179
  },
180
180
  "peerDependencies": {
181
- "serverless": "^4.0.0"
181
+ "osls": "^3.0.0"
182
+ },
183
+ "peerDependenciesMeta": {
184
+ "osls": {
185
+ "optional": true
186
+ }
182
187
  },
183
188
  "sideEffects": false
184
189
  }