Revert "refactor: replace utils parse import with json-templates parse in multiple files"

This reverts commit 71dca1ba180231c2238d3be09813f4e0cfa0f742.

packages/core/client/src/block-provider/hooks/index.ts

@@ -12,8 +12,7 @@ import { Field, Form } from '@formily/core';
 import { SchemaExpressionScopeContext, useField, useFieldSchema, useForm } from '@formily/react';
 import { untracked } from '@formily/reactive';
 import { evaluators } from '@nocobase/evaluators/client';
-import { isURL } from '@nocobase/utils/client';
-import { parse } from '@nocobase/json-templates';
+import { isURL, parse } from '@nocobase/utils/client';
 import { App, message } from 'antd';
 import _ from 'lodash';
 import get from 'lodash/get';

packages/core/server/src/environment.ts

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { parse } from '@nocobase/json-templates';
+import { parse } from '@nocobase/utils';
 import _ from 'lodash';
 
 export class Environment {

packages/plugins/@nocobase/plugin-action-custom-request/src/server/actions/send.ts

@@ -8,7 +8,8 @@
  */
 
 import { Context, Next } from '@nocobase/actions';
-import { parse } from '@nocobase/json-templates';
+import { parse } from '@nocobase/utils';
+
 import { appendArrayColumn } from '@nocobase/evaluators';
 import Application from '@nocobase/server';
 import axios from 'axios';

packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts

@@ -20,8 +20,7 @@ import {
   useVariables,
   useLocalVariables,
 } from '@nocobase/client';
-import { flatten, unflatten } from '@nocobase/utils/client';
-import { parse } from '@nocobase/json-templates';
+import { flatten, parse, unflatten } from '@nocobase/utils/client';
 import { useMemoizedFn } from 'ahooks';
 import deepmerge from 'deepmerge';
 import { default as _, default as lodash } from 'lodash';

packages/plugins/@nocobase/plugin-users/src/server/server.ts

@@ -9,7 +9,7 @@
 
 import { Collection, Model, Op } from '@nocobase/database';
 import { InstallOptions, Plugin } from '@nocobase/server';
-import { parse } from '@nocobase/json-templates';
+import { parse } from '@nocobase/utils';
 import * as actions from './actions/users';
 import { UserModel } from './models/UserModel';
 import PluginUserDataSyncServer from '@nocobase/plugin-user-data-sync';

packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/src/server/DynamicCalculation.ts

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { parse } from '@nocobase/json-templates';
+import { parse } from '@nocobase/utils';
 import { FlowNodeModel, Instruction, JOB_STATUS, Processor } from '@nocobase/plugin-workflow';
 import evaluators, { Evaluator } from '@nocobase/evaluators';
 

packages/plugins/@nocobase/plugin-workflow/src/client/components/ValueBlock.tsx

@@ -9,7 +9,7 @@
 
 import { useFieldSchema } from '@formily/react';
 import { css, SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } from '@nocobase/client';
-import { parse } from '@nocobase/json-templates';
+import { parse } from '@nocobase/utils/client';
 import React from 'react';
 import { useFlowContext } from '../FlowContext';
 import { SimpleDesigner } from './SimpleDesigner';

packages/plugins/@nocobase/plugin-workflow/src/client/nodes/index.tsx

@@ -31,8 +31,8 @@ import {
   usePlugin,
   useResourceActionContext,
 } from '@nocobase/client';
-import { str2moment } from '@nocobase/utils/client';
-import { parse } from '@nocobase/json-templates';
+import { parse, str2moment } from '@nocobase/utils/client';
+
 import WorkflowPlugin from '..';
 import { AddButton } from '../AddNodeContext';
 import { useFlowContext } from '../FlowContext';

packages/plugins/@nocobase/plugin-workflow/src/server/Processor.ts

@@ -10,7 +10,7 @@
 import { Model, Transaction, Transactionable } from '@nocobase/database';
 import { appendArrayColumn } from '@nocobase/evaluators';
 import { Logger } from '@nocobase/logger';
-import { parse } from '@nocobase/json-templates';
+import { parse } from '@nocobase/utils';
 import set from 'lodash/set';
 import type Plugin from './Plugin';
 import { EXECUTION_STATUS, JOB_STATUS } from './constants';

packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/function.test.ts

@@ -10,7 +10,7 @@
 import dayjs from 'dayjs';
 import { Application } from '@nocobase/server';
 import Database from '@nocobase/database';
-import { parse } from '@nocobase/json-templates';
+import { parse } from '@nocobase/utils';
 import { dateRangeFns } from '@nocobase/plugin-workflow';
 import { getApp, sleep } from '@nocobase/plugin-workflow-test';
 

packages/plugins/@nocobase/plugin-workflow/src/server/instructions/CalculationInstruction.ts

@@ -8,6 +8,7 @@
  */
 
 import { Evaluator, evaluators } from '@nocobase/evaluators';
+import { parse } from '@nocobase/utils';
 import { Instruction } from '.';
 import type Processor from '../Processor';
 import { JOB_STATUS } from '../constants';