Merge field-kit-utils into field-scripts.

package.json

@@ -17,7 +17,6 @@
   "workspaces": [
     "packages/create-field-module",
     "packages/field-kit",
-    "packages/field-kit-utils",
     "packages/field-scripts",
     "packages/field-module-tasks",
     "packages/farm-ui"

packages/create-field-module/bin/template/package.json

@@ -13,6 +13,6 @@
     "farmOS"
   ],
   "devDependencies": {
-    "@farmos.org/field-scripts": "2.0.0-alpha.1"
+    "@farmos.org/field-scripts": "2.0.0-alpha.2"
   }
 }

packages/field-kit/package.json

@@ -17,10 +17,10 @@
   },
   "dependencies": {
     "@farmos.org/farmos-map": "^1.4.2",
+    "@farmos.org/field-scripts": "2.0.0-alpha.2",
     "@turf/turf": "^5.1.6",
     "farmos": "^2.0.0-beta.14",
     "farm-ui": "2.0.0-alpha.2",
-    "field-kit-utils": "2.0.0-alpha.1",
     "ramda": "^0.27.1",
     "uuid": "^8.3.2",
     "vue": "^3.1.0",

packages/field-kit/src/field-modules/import.js

@@ -1,4 +1,4 @@
-import { resolveModulePathname } from 'field-kit-utils/constants';
+import { resolveModulePathname } from '@farmos.org/field-scripts';
 import { getHost } from '../farm/remote';
 
 // Takes module info from the API and uses it to inject a script tag and run

packages/field-kit/src/field-modules/index.js

@@ -1,7 +1,6 @@
 import { reactive, readonly } from 'vue';
 import { compose, map, path } from 'ramda';
-import { kebab } from 'field-kit-utils/string-case';
-import { FM_API_ENDPOINT } from 'field-kit-utils/constants';
+import { FM_API_ENDPOINT, kebab } from '@farmos.org/field-scripts';
 import farm from '../farm';
 import { alert } from '../warnings/alert';
 import importFieldModule from './import';

packages/field-kit/src/field-modules/mount.js

@@ -1,7 +1,7 @@
 import {
   assoc, compose, curry, evolve, map, mapObjIndexed, pick, prop,
 } from 'ramda';
-import { kebab } from 'field-kit-utils/string-case';
+import { kebab } from '@farmos.org/field-scripts';
 import { upsertModuleConfig } from './index';
 
 const parseWidgetName = curry((modName, widget) =>

packages/field-module-tasks/package.json

@@ -17,7 +17,7 @@
   "author": "Jamie Gaehring <gaehj457@gmail.com> (https://jgaehring.com)",
   "license": "GPL-3.0-or-later",
   "devDependencies": {
-    "@farmos.org/field-scripts": "2.0.0-alpha.1"
+    "@farmos.org/field-scripts": "2.0.0-alpha.2"
   },
   "repository": {
     "type": "git",

packages/field-scripts/README.md

@@ -1,4 +1,4 @@
 # `field-scripts`
-Shared scripts and tooling for the development environment and build tools used both farmOS Field Kit and its associated Field Modules. Powered by [Vite](https://vitejs.dev).
+Shared scripts, tooling and utilities for the development environment and build process used by both farmOS Field Kit and its associated Field Modules. Powered by [Vite](https://vitejs.dev).
 
 These are included in the dependencies when [`create-field-module`](https://www.npmjs.com/package/@jgaehring/create-field-module) is used to scaffold projects.

packages/field-scripts/build-module/bundler.js

@@ -4,7 +4,7 @@ import { build } from 'vite';
 import createVuePlugin from '@vitejs/plugin-vue';
 import { viteCommonjs } from '@originjs/vite-plugin-commonjs';
 import jsYaml from 'js-yaml';
-import { snake } from 'field-kit-utils/string-case.js';
+import { snake } from '../lib/string-case.js';
 import fieldModulePlugin from './rollup-plugin-field-module.js';
 
 const writeYaml = (filepath, data) => {

packages/field-scripts/develop-module/index.js

@@ -3,8 +3,8 @@ import { createRequire } from 'module';
 import { createServer } from 'vite';
 import createVuePlugin from '@vitejs/plugin-vue';
 import { viteCommonjs } from '@originjs/vite-plugin-commonjs';
-import { FM_API_ENDPOINT, FM_SCRIPT_DIR } from 'field-kit-utils/constants.js';
-import { snake } from 'field-kit-utils/string-case.js';
+import { FM_API_ENDPOINT, FM_SCRIPT_DIR } from '../lib/constants.js';
+import { snake } from '../lib/string-case.js';
 import createMockServer from './mock-server.js';
 
 const require = createRequire(import.meta.url);

packages/field-scripts/develop-module/mock-server.js

@@ -1,5 +1,5 @@
 import http from 'http';
-import { FM_API_ENDPOINT, resolveModulePathname } from 'field-kit-utils/constants.js';
+import { FM_API_ENDPOINT, resolveModulePathname } from '../lib/constants.js';
 import { fmtScript, fmtJsonApi } from '../shared/format.js';
 
 const trimPath = p => (typeof p === 'string' ? p : '').replaceAll(/^\/|\/$/g, '');

packages/field-scripts/lib/index.js

@@ -0,0 +1,2 @@
+export * from './constants.js';
+export * from './string-case.js';

packages/field-scripts/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@farmos.org/field-scripts",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0-alpha.2",
   "description": "Node scripts for farmOS Field Kit and Field Modules.",
   "bin":  "bin/field-scripts.js",
-  "main": "bin/field-scripts.js",
+  "main": "lib/index.js",
   "type": "module",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -16,7 +16,6 @@
   "dependencies": {
     "@originjs/vite-plugin-commonjs": "^1.0.3",
     "@vitejs/plugin-vue": "^4.2.3",
-    "field-kit-utils": "2.0.0-alpha.1",
     "js-yaml": "^4.1.0",
     "minimist": "^1.2.8",
     "ramda": "^0.28.0",

packages/field-scripts/shared/format.js

@@ -1,6 +1,6 @@
 import path from 'path';
 import { evolve } from 'ramda';
-import { snake } from 'field-kit-utils/string-case.js';
+import { snake } from '../lib/string-case.js';
 
 const fmtImport = (name, value) =>
   (value ? `import ${name} from '${value}';` : '');