move all Cron code to packages/workflow

n8n-io · Aug 16, 2022 · 98a3054 · 98a3054
1 parent bf75c88
commit 98a3054
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 6 deletions.
diff --git a/packages/cli/test/integration/shared/utils.ts b/packages/cli/test/integration/shared/utils.ts
@@ -8,7 +8,7 @@ import { URL } from 'url';
 import bodyParser from 'body-parser';
 import { set } from 'lodash';
 import { CronJob } from 'cron';
-import { BinaryDataManager, TriggerTime, triggerToCronExpression, UserSettings } from 'n8n-core';
+import { BinaryDataManager, UserSettings } from 'n8n-core';
 import {
 	ICredentialType,
 	IDataObject,
@@ -21,6 +21,8 @@ import {
 	ITriggerResponse,
 	LoggerProxy,
 	NodeHelpers,
+	TriggerTime,
+	triggerToCronExpression,
 } from 'n8n-workflow';
 
 import config from '../../../config';

diff --git a/packages/core/src/ActiveWorkflows.ts b/packages/core/src/ActiveWorkflows.ts
@@ -12,13 +12,14 @@ import {
 	ITriggerResponse,
 	IWorkflowExecuteAdditionalData,
 	LoggerProxy as Logger,
+	TriggerTime,
+	triggerToCronExpression,
 	Workflow,
 	WorkflowActivateMode,
 	WorkflowActivationError,
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
 
-import { TriggerTime, triggerToCronExpression } from './Cron';
 // eslint-disable-next-line import/no-cycle
 import { IWorkflowData } from '.';
 

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -13,7 +13,6 @@ export * from './ActiveWebhooks';
 export * from './BinaryDataManager';
 export * from './Constants';
 export * from './Credentials';
-export * from './Cron';
 export * from './Interfaces';
 export * from './LoadNodeParameterOptions';
 export * from './NodeExecuteFunctions';

diff --git a/packages/nodes-base/nodes/Cron/Cron.node.ts b/packages/nodes-base/nodes/Cron/Cron.node.ts
@@ -1,5 +1,12 @@
-import { ITriggerFunctions, TriggerTime, triggerToCronExpression } from 'n8n-core';
-import { INodeType, INodeTypeDescription, ITriggerResponse, NodeHelpers } from 'n8n-workflow';
+import { ITriggerFunctions } from 'n8n-core';
+import {
+	INodeType,
+	INodeTypeDescription,
+	ITriggerResponse,
+	NodeHelpers,
+	TriggerTime,
+	triggerToCronExpression,
+} from 'n8n-workflow';
 
 import { CronJob } from 'cron';
 

diff --git a/packages/core/src/Cron.ts → packages/workflow/src/Cron.ts b/packages/core/src/Cron.ts → packages/workflow/src/Cron.ts
diff --git a/packages/workflow/src/index.ts b/packages/workflow/src/index.ts
@@ -3,6 +3,7 @@ import * as LoggerProxy from './LoggerProxy';
 import * as NodeHelpers from './NodeHelpers';
 import * as ObservableObject from './ObservableObject';
 
+export * from './Cron';
 export * from './DeferredPromise';
 export * from './Interfaces';
 export * from './Expression';

diff --git a/packages/core/test/Cron.test.ts → packages/workflow/test/Cron.test.ts b/packages/core/test/Cron.test.ts → packages/workflow/test/Cron.test.ts
@@ -1,4 +1,4 @@
-import { triggerToCronExpression } from "../src"
+import { triggerToCronExpression } from "../src/Cron"
 
 describe('Cron', () => {
   describe('triggerToCronExpression', () => {