declapract-typescript-ehmpathy 0.22.2 → 0.22.3

package/dist/practices/cicd-deploy-service/best-practice/.github/workflows/.deploy-sls.yml

@@ -28,7 +28,7 @@ on:
         description: required credentials to authenticate with aws provider and state persistance
 
 jobs:
-  plan:
+  deploy:
     runs-on: ubuntu-latest
     steps:
       - name: checkout

package/dist/practices/package-json-order/best-practice/package.json.declapract.ts

@@ -36,6 +36,7 @@ export const desiredRelativeKeyOrder = {
     'build:clean',
     'build:compile',
     'build',
+    'provision:docker:clear',
     'provision:docker:prepare',
     'provision:docker:up',
     'provision:docker:await',

package/dist/practices/serverless/best-practice/serverless.yml.declapract.ts

@@ -6,8 +6,9 @@ export const check = FileCheckType.CONTAINS; // i.e., check that the contents of
 export const fix: FileFixFunction = (contents) => {
   if (!contents) return { contents }; // do nothing if file dne; // TODO: update to provision file from declared contents
   return {
+    // TODO: when we have special support for yml, do this better (i.e., instead of string replace, just add to the yml object after parsing it)
     contents: contents
-      .replace(/runtime\: nodejs\d\d.x/, 'runtime: nodejs14.x')
+      .replace(/runtime\: nodejs\d\d.x/, 'runtime: nodejs16.x')
       .replace('\nplugins:\n', '')
       .replace(/  - serverless-offline .*\n/, '') // a plugin we no longer use (never used it, no need to have it)
       .replace(/  - serverless-pseudo-parameters .*\n/, '') // a plugin we no longer use (serverless supports variables natively now)
@@ -21,6 +22,10 @@ export const fix: FileFixFunction = (contents) => {
       .replace(
         'NODE_ENV: ${self:custom.stageToNodeEnvMapping.${self:provider.stage}}\n  deploymentBucket',
         'NODE_ENV: ${self:custom.stageToNodeEnvMapping.${self:provider.stage}}\n    AWS_NODEJS_CONNECTION_REUSE_ENABLED: true # https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/node-reusing-connections.html\n  deploymentBucket',
-      ), // add this env flag // TODO: when we have special support for yml, do this better (i.e., instead of string replace, just add to the yml object after parsing it)
+      ) // add this env flag
+      .replace(
+        /service: ([a-zA-Z0-9\-]+)\n\n?provider:/,
+        'service: $1\n\npackage:\n  artifact: .artifact/contents.zip\n\nprovider:',
+      ),
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "declapract-typescript-ehmpathy",
-  "version": "0.22.2",
+  "version": "0.22.3",
   "description": "declapract best practices declarations for typescript",
   "main": "src/index.js",
   "repository": "ehmpathy/declapract-typescript-ehmpathy",

package/dist/practices/serverless/bad-practices/generic-deploy-script/package.json

@@ -1,8 +0,0 @@
-{
-  "scripts": {
-    "deploy:release": "npm run build && sls deploy --verbose --stage $STAGE",
-    "deploy:send-notification": "curl -X POST -H 'Content-type: application/json' --data \"{\\\"text\\\":\\\"$([ -z $DEPLOYER_NAME ] && git config user.name || echo $DEPLOYER_NAME) has deployed $npm_package_name@v$npm_package_version:\nhttps://github.com/@declapract{variable.organizationName}/$npm_package_name/tree/v$npm_package_version\\\"}\" @declapract{variable.slackWebhookUrl}",
-    "deploy:dev": "STAGE=dev npm run deploy:release",
-    "deploy:prod": "STAGE=prod npm run deploy:release && npm run deploy:send-notification"
-  }
-}

package/dist/practices/serverless/bad-practices/generic-deploy-script/package.json.declapract.ts

@@ -1,23 +0,0 @@
-import { FileCheckFunction, FileFixFunction } from 'declapract';
-
-export const check: FileCheckFunction = (contents) => {
-  if (!contents) throw new Error('does not match bad practice'); // no contents -> fine
-  const packageJSON = JSON.parse(contents);
-  if (packageJSON.scripts.deploy) return; // bad practice
-  throw new Error('does not match bad practice');
-};
-
-export const fix: FileFixFunction = (contents) => {
-  if (!contents) return { contents }; // do nothing if no contents
-  const packageJSON = JSON.parse(contents);
-  const updatedPackageJSON = {
-    ...packageJSON,
-    scripts: {
-      ...packageJSON.scripts,
-      deploy: undefined, // remove the deploy script
-    },
-  };
-  return {
-    contents: JSON.stringify(updatedPackageJSON, null, 2),
-  };
-};