fix: move path related to core/node_utils

ccontrols · Feb 28, 2021 · 8d9986a · 8d9986a
1 parent 0775b3b
commit 8d9986a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/core/core/src/build.ts b/core/core/src/build.ts
@@ -1,4 +1,3 @@
-import path from 'path';
 import { Compiler, Configuration, RuleSetQuery } from 'webpack';
 import { LogOptions } from '@component-controls/logger';
 
@@ -98,17 +97,6 @@ export type WatchProps = {
   watchOptions?: WatchOptions;
 } & BuildProps;
 
-export const getDistName = (options: BuildProps): string => {
-  const dist = options.distFolder || path.join(process.cwd(), 'public');
-  return dist;
-};
-
 export const defBundleName = 'component-controls.js';
 
-export const getBundleName = (options: BuildProps): string =>
-  path.join(getDistName(options), options.bundleName || defBundleName);
-
 export const defCssFileName = 'component-controls.css';
-
-export const getCSSBundleName = (options: BuildProps): string =>
-  path.join(getDistName(options), options.cssFileName || defCssFileName);
diff --git a/core/core/src/node-utils.ts b/core/core/src/node-utils.ts
@@ -1,5 +1,6 @@
 import fs from 'fs';
 import path from 'path';
+import { BuildProps, defBundleName, defCssFileName } from './build';
 
 export const findUpFile = (
   filePath: string,
@@ -17,3 +18,14 @@ export const findUpFile = (
   }
   return findUpFile(path.resolve(filePath, '..'), fileName, levels - 1);
 };
+
+export const getDistName = (options: BuildProps): string => {
+  const dist = options.distFolder || path.join(process.cwd(), 'public');
+  return dist;
+};
+
+export const getBundleName = (options: BuildProps): string =>
+  path.join(getDistName(options), options.bundleName || defBundleName);
+
+export const getCSSBundleName = (options: BuildProps): string =>
+  path.join(getDistName(options), options.cssFileName || defCssFileName);
diff --git a/integrations/gatsby-theme-stories/src/gatsby-node.ts b/integrations/gatsby-theme-stories/src/gatsby-node.ts
@@ -9,11 +9,14 @@ import {
 } from '@component-controls/webpack-compile';
 import {
   BuildProps,
+  Store,
   defaultCompileProps,
+} from '@component-controls/core';
+import {
   getBundleName,
   getCSSBundleName,
-  Store,
-} from '@component-controls/core';
+} from '@component-controls/core/node-utils';
+
 import { mergeBuildConfiguration } from '@component-controls/config';
 
 import {

diff --git a/integrations/nextjs-plugin/src/build.ts b/integrations/nextjs-plugin/src/build.ts
@@ -11,8 +11,8 @@ import {
   BuildProps,
   RuleOptions,
   defaultCompileProps,
-  getCSSBundleName,
 } from '@component-controls/core';
+import { getCSSBundleName } from '@component-controls/core/node-utils';
 import { Store } from '@component-controls/core';
 import { loadStore } from '@component-controls/store';
 import { getSiteMap } from '@component-controls/routes';