refactor: Remove evaluation of deprecated lifecycle events

BREAKING CHANGE: Lifecycle events marked as deprecated (in context of v1) are no longer evaluated
serverless · Jan 27, 2022 · 34bb51e · 34bb51e
1 parent 8229812
commit 34bb51e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 27 deletions.
diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
@@ -352,17 +352,7 @@ class PluginManager {
     if (pluginInstance.commands) {
       Object.entries(pluginInstance.commands).forEach(([key, details]) => {
         const command = this.loadCommand(pluginName, details, key);
-        // Grab and extract deprecated events
-        command.lifecycleEvents = (command.lifecycleEvents || []).map((event) => {
-          if (event.startsWith('deprecated#')) {
-            // Extract event and optional redirect
-            const transformedEvent = /^deprecated#(.*?)(?:->(.*?))?$/.exec(event);
-            this.deprecatedEvents[`${command.key}:${transformedEvent[1]}`] =
-              transformedEvent[2] || null;
-            return transformedEvent[1];
-          }
-          return event;
-        });
+        if (!command.lifecycleEvents) command.lifecycleEvents = [];
         this.commands[key] = mergeCommands(
           this.commands[key],
           _.merge({}, command, {

diff --git a/lib/cli/commands-schema/aws-service.js b/lib/cli/commands-schema/aws-service.js
@@ -35,17 +35,7 @@ commands.set('deploy', {
       type: 'boolean',
     },
   },
-  // TODO: Remove deprecated events with v3
-  lifecycleEvents: [
-    'deprecated#cleanup->package:cleanup',
-    'deprecated#initialize->package:initialize',
-    'deprecated#setupProviderConfiguration->package:setupProviderConfiguration',
-    'deprecated#createDeploymentArtifacts->package:createDeploymentArtifacts',
-    'deprecated#compileFunctions->package:compileFunctions',
-    'deprecated#compileEvents->package:compileEvents',
-    'deploy',
-    'finalize',
-  ],
+  lifecycleEvents: ['deploy', 'finalize'],
 });
 
 commands.set('deploy function', {

diff --git a/lib/cli/commands-schema/resolve-final.js b/lib/cli/commands-schema/resolve-final.js
@@ -11,8 +11,6 @@ const awsServiceOptions = require('./common-options/aws-service');
 const { logWarning } = require('../../classes/Error');
 const { log } = require('@serverless/utils/log');
 
-const deprecatedEventPattern = /^deprecated#(.*?)(?:->(.*?))?$/;
-
 module.exports = (loadedPlugins, { providerName }) => {
   const commands = new Map(providerName === 'aws' ? awsServiceCommands : serviceCommands);
 
@@ -28,9 +26,6 @@ module.exports = (loadedPlugins, { providerName }) => {
           .map(([name, schema]) => {
             const lifecycleEventNamePrefix = name.split(' ').join(':');
             return (schema.lifecycleEvents || []).map((lifecycleEventBaseName) => {
-              if (lifecycleEventBaseName.startsWith('deprecated#')) {
-                lifecycleEventBaseName = lifecycleEventBaseName.match(deprecatedEventPattern)[1];
-              }
               const lifecycleEventName = `${lifecycleEventNamePrefix}:${lifecycleEventBaseName}`;
               return [
                 [`before:${lifecycleEventName}`, name],