Revert 708400d and separate field-scripts pkg.

package.json

@@ -18,7 +18,8 @@
     "packages/create-field-module",
     "packages/field-components",
     "packages/field-kit",
-    "packages/field-module-tasks"
+    "packages/field-module-tasks",
+    "packages/field-scripts"
   ],
   "keywords": [
     "farmOS",

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

@@ -14,6 +14,7 @@
   ],
   "devDependencies": {
     "@farmos.org/field-kit": "2.0.0-alpha.8",
+    "@farmos.org/field-scripts": "2.0.0-alpha.3",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
     "@vitejs/plugin-vue": "^4.2.3",
     "js-yaml": "^4.1.0",

packages/create-field-module/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farmos.org/create-field-module",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.3",
   "description": "Scaffold a Field Module for development with farmOS Field Kit.",
   "bin": "bin/run.js",
   "main": "bin/run.js",

packages/field-components/package.json

@@ -25,6 +25,9 @@
     "storybook": "^7.0.23",
     "vite": "^4.3.9"
   },
+  "peerDependencies": {
+    "@farmos.org/field-kit": "2.0.0-alpha.8"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/farmOS/field-kit.git"

packages/field-kit/package.json

@@ -7,9 +7,6 @@
   "private": false,
   "main": "main.js",
   "type": "module",
-  "bin": {
-    "field-scripts": "bin/field-scripts/index.js"
-  },
   "scripts": {
     "start": "npm run dev",
     "BROKEN-test": "mocha --require test-setup.js 'src/**/*.test.js' --watch",
@@ -32,6 +29,7 @@
     "wellknown": "^0.5.0"
   },
   "devDependencies": {
+    "@farmos.org/field-scripts": "2.0.0-alpha.3",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
     "@vitejs/plugin-vue": "^4.2.3",
     "@vue/runtime-dom": "^3.2.26",

packages/field-module-tasks/package.json

@@ -17,7 +17,13 @@
   "author": "Jamie Gaehring <gaehj457@gmail.com> (https://jgaehring.com)",
   "license": "GPL-3.0-or-later",
   "devDependencies": {
-    "@farmos.org/field-kit": "2.0.0-alpha.8"
+    "@farmos.org/field-kit": "2.0.0-alpha.8",
+    "@farmos.org/field-scripts": "2.0.0-alpha.3",
+    "@originjs/vite-plugin-commonjs": "^1.0.3",
+    "@vitejs/plugin-vue": "^4.2.3",
+    "js-yaml": "^4.1.0",
+    "minimist": "^1.2.8",
+    "vite": "^4.3.9"
   },
   "repository": {
     "type": "git",

packages/field-kit/bin/field-scripts/build-module/bundler.js → packages/field-scripts/bin/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 '../../../namespaces/index.js';
+import { snake } from '@farmos.org/field-kit/namespaces/index.js';
 import fieldModulePlugin from './rollup-plugin-field-module.js';
 
 const writeYaml = (filepath, data) => {

packages/field-kit/bin/field-scripts/develop-module/index.js → packages/field-scripts/bin/develop-module/index.js

@@ -5,7 +5,7 @@ import process from 'node:process';
 import { createServer } from 'vite';
 import createVuePlugin from '@vitejs/plugin-vue';
 import { viteCommonjs } from '@originjs/vite-plugin-commonjs';
-import { FM_API_ENDPOINT, FM_SCRIPT_DIR, snake } from '../../../namespaces/index.js';
+import { FM_API_ENDPOINT, FM_SCRIPT_DIR, snake } from '@farmos.org/field-kit/namespaces/index.js';
 import createMockServer from './mock-server.js';
 
 // The current working directory of the downstream application, which will call

packages/field-kit/bin/field-scripts/develop-module/mock-server.js → packages/field-scripts/bin/develop-module/mock-server.js

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

packages/field-kit/bin/field-scripts/format.js → packages/field-scripts/bin/format.js

@@ -1,5 +1,5 @@
 import path from 'path';
-import { snake } from '../../namespaces/index.js';
+import { snake } from '@farmos.org/field-kit/namespaces/index.js';
 
 const fmtImport = (name, value) =>
   (value ? `import ${name} from '${value}';` : '');

packages/field-scripts/package.json

@@ -0,0 +1,32 @@
+{
+  "name": "@farmos.org/field-scripts",
+  "version": "2.0.0-alpha.3",
+  "description": "Node scripts for farmOS Field Kit and Field Modules.",
+  "bin":  "bin/index.js",
+  "main": "bin/index.js",
+  "type": "module",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [
+    "farmOS"
+  ],
+  "author": "Jamie Gaehring <gaehj457@gmail.com> (https://jgaehring.com)",
+  "license": "GPL-3.0-or-later",
+  "peerDependencies": {
+    "@farmos.org/field-kit": "^2.0.0-alpha.8",
+    "@originjs/vite-plugin-commonjs": "^1.0.3",
+    "@vitejs/plugin-vue": "^4.2.3",
+    "js-yaml": "^4.1.0",
+    "minimist": "^1.2.8",
+    "vite": "^4.3.9"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/farmOS/field-kit.git"
+  },
+  "bugs": {
+    "url": "https://github.com/farmOS/field-kit/issues"
+  },
+  "homepage": "https://farmos.org"
+}