reactioncommerce · kieckhafer · Oct 4, 2019 · Oct 4, 2019 · Oct 4, 2019 · Oct 4, 2019
diff --git a/imports/node-app/core-services/core/config.js b/imports/node-app/core-services/core/config.js
@@ -0,0 +1,12 @@
+import envalid, { bool, str } from "envalid";
+
+export default envalid.cleanEnv(process.env, {
+  // This is necessary to override the envalid default
+  // validation for NODE_ENV, which uses
+  // str({ choices: ['development', 'test', 'production'] })
+  //
+  // We currently need to set NODE_ENV to "jesttest" when
+  // integration tests run.
+  NODE_ENV: str(),
+  SKIP_FIXTURES: bool({ default: false })
+});
diff --git a/...s/core/core/server/no-meteor/i18n/ar.json → .../node-app/core-services/core/i18n/ar.json b/...s/core/core/server/no-meteor/i18n/ar.json → .../node-app/core-services/core/i18n/ar.json
diff --git a/...s/core/core/server/no-meteor/i18n/bg.json → .../node-app/core-services/core/i18n/bg.json b/...s/core/core/server/no-meteor/i18n/bg.json → .../node-app/core-services/core/i18n/bg.json
diff --git a/...s/core/core/server/no-meteor/i18n/cs.json → .../node-app/core-services/core/i18n/cs.json b/...s/core/core/server/no-meteor/i18n/cs.json → .../node-app/core-services/core/i18n/cs.json
diff --git a/...s/core/core/server/no-meteor/i18n/de.json → .../node-app/core-services/core/i18n/de.json b/...s/core/core/server/no-meteor/i18n/de.json → .../node-app/core-services/core/i18n/de.json
diff --git a/...s/core/core/server/no-meteor/i18n/el.json → .../node-app/core-services/core/i18n/el.json b/...s/core/core/server/no-meteor/i18n/el.json → .../node-app/core-services/core/i18n/el.json
diff --git a/...s/core/core/server/no-meteor/i18n/en.json → .../node-app/core-services/core/i18n/en.json b/...s/core/core/server/no-meteor/i18n/en.json → .../node-app/core-services/core/i18n/en.json
diff --git a/...s/core/core/server/no-meteor/i18n/es.json → .../node-app/core-services/core/i18n/es.json b/...s/core/core/server/no-meteor/i18n/es.json → .../node-app/core-services/core/i18n/es.json
diff --git a/...s/core/core/server/no-meteor/i18n/fr.json → .../node-app/core-services/core/i18n/fr.json b/...s/core/core/server/no-meteor/i18n/fr.json → .../node-app/core-services/core/i18n/fr.json
diff --git a/...s/core/core/server/no-meteor/i18n/he.json → .../node-app/core-services/core/i18n/he.json b/...s/core/core/server/no-meteor/i18n/he.json → .../node-app/core-services/core/i18n/he.json
diff --git a/...s/core/core/server/no-meteor/i18n/hr.json → .../node-app/core-services/core/i18n/hr.json b/...s/core/core/server/no-meteor/i18n/hr.json → .../node-app/core-services/core/i18n/hr.json
diff --git a/...s/core/core/server/no-meteor/i18n/hu.json → .../node-app/core-services/core/i18n/hu.json b/...s/core/core/server/no-meteor/i18n/hu.json → .../node-app/core-services/core/i18n/hu.json
diff --git a/.../core/core/server/no-meteor/i18n/index.js → ...node-app/core-services/core/i18n/index.js b/.../core/core/server/no-meteor/i18n/index.js → ...node-app/core-services/core/i18n/index.js
diff --git a/...s/core/core/server/no-meteor/i18n/it.json → .../node-app/core-services/core/i18n/it.json b/...s/core/core/server/no-meteor/i18n/it.json → .../node-app/core-services/core/i18n/it.json
diff --git a/...s/core/core/server/no-meteor/i18n/my.json → .../node-app/core-services/core/i18n/my.json b/...s/core/core/server/no-meteor/i18n/my.json → .../node-app/core-services/core/i18n/my.json
diff --git a/...s/core/core/server/no-meteor/i18n/nb.json → .../node-app/core-services/core/i18n/nb.json b/...s/core/core/server/no-meteor/i18n/nb.json → .../node-app/core-services/core/i18n/nb.json
diff --git a/...s/core/core/server/no-meteor/i18n/nl.json → .../node-app/core-services/core/i18n/nl.json b/...s/core/core/server/no-meteor/i18n/nl.json → .../node-app/core-services/core/i18n/nl.json
diff --git a/...s/core/core/server/no-meteor/i18n/pl.json → .../node-app/core-services/core/i18n/pl.json b/...s/core/core/server/no-meteor/i18n/pl.json → .../node-app/core-services/core/i18n/pl.json
diff --git a/...s/core/core/server/no-meteor/i18n/pt.json → .../node-app/core-services/core/i18n/pt.json b/...s/core/core/server/no-meteor/i18n/pt.json → .../node-app/core-services/core/i18n/pt.json
diff --git a/...s/core/core/server/no-meteor/i18n/ro.json → .../node-app/core-services/core/i18n/ro.json b/...s/core/core/server/no-meteor/i18n/ro.json → .../node-app/core-services/core/i18n/ro.json
diff --git a/...s/core/core/server/no-meteor/i18n/ru.json → .../node-app/core-services/core/i18n/ru.json b/...s/core/core/server/no-meteor/i18n/ru.json → .../node-app/core-services/core/i18n/ru.json
diff --git a/...s/core/core/server/no-meteor/i18n/sl.json → .../node-app/core-services/core/i18n/sl.json b/...s/core/core/server/no-meteor/i18n/sl.json → .../node-app/core-services/core/i18n/sl.json
diff --git a/...s/core/core/server/no-meteor/i18n/sv.json → .../node-app/core-services/core/i18n/sv.json b/...s/core/core/server/no-meteor/i18n/sv.json → .../node-app/core-services/core/i18n/sv.json
diff --git a/...s/core/core/server/no-meteor/i18n/tr.json → .../node-app/core-services/core/i18n/tr.json b/...s/core/core/server/no-meteor/i18n/tr.json → .../node-app/core-services/core/i18n/tr.json
diff --git a/...s/core/core/server/no-meteor/i18n/vi.json → .../node-app/core-services/core/i18n/vi.json b/...s/core/core/server/no-meteor/i18n/vi.json → .../node-app/core-services/core/i18n/vi.json
diff --git a/...s/core/core/server/no-meteor/i18n/zh.json → .../node-app/core-services/core/i18n/zh.json b/...s/core/core/server/no-meteor/i18n/zh.json → .../node-app/core-services/core/i18n/zh.json
diff --git a/...ns/core/core/server/no-meteor/register.js → imports/node-app/core-services/core/index.js b/...ns/core/core/server/no-meteor/register.js → imports/node-app/core-services/core/index.js
@@ -1,7 +1,7 @@
-import i18n from "./i18n";
-import resolvers from "./resolvers";
-import schemas from "./schemas";
-import startup from "./startup";
+import i18n from "./i18n/index.js";
+import resolvers from "./resolvers/index.js";
+import schemas from "./schemas/index.js";
+import startup from "./startup.js";
 
 /**
  * @summary Import and call this function to add this plugin to your API.
@@ -12,7 +12,6 @@ export default async function register(app) {
   await app.registerPlugin({
     label: "Core",
     name: "core",
-    icon: "fa fa-th",
     i18n,
     collections: {
       Assets: {

diff --git a/imports/node-app/core-services/core/resolvers/Address.js b/imports/node-app/core-services/core/resolvers/Address.js
@@ -0,0 +1,5 @@
+import { encodeAddressOpaqueId } from "../xforms/id.js";
+
+export default {
+  _id: (node) => encodeAddressOpaqueId(node._id)
+};
diff --git a/...r/no-meteor/resolvers/ConnectionCursor.js → ...rvices/core/resolvers/ConnectionCursor.js b/...r/no-meteor/resolvers/ConnectionCursor.js → ...rvices/core/resolvers/ConnectionCursor.js
diff --git a/...meteor/resolvers/ConnectionCursor.test.js → ...s/core/resolvers/ConnectionCursor.test.js b/...meteor/resolvers/ConnectionCursor.test.js → ...s/core/resolvers/ConnectionCursor.test.js
@@ -1,5 +1,5 @@
 import { Kind } from "graphql/language";
-import ConnectionCursor from "./ConnectionCursor";
+import ConnectionCursor from "./ConnectionCursor.js";
 
 test("has a description", () => {
   expect(ConnectionCursor.description).toMatchSnapshot();

diff --git a/...no-meteor/resolvers/ConnectionLimitInt.js → ...ices/core/resolvers/ConnectionLimitInt.js b/...no-meteor/resolvers/ConnectionLimitInt.js → ...ices/core/resolvers/ConnectionLimitInt.js
diff --git a/...teor/resolvers/ConnectionLimitInt.test.js → ...core/resolvers/ConnectionLimitInt.test.js b/...teor/resolvers/ConnectionLimitInt.test.js → ...core/resolvers/ConnectionLimitInt.test.js
@@ -1,5 +1,5 @@
 import { Kind } from "graphql/language";
-import ConnectionLimitInt from "./ConnectionLimitInt";
+import ConnectionLimitInt from "./ConnectionLimitInt.js";
 
 test("has a description", () => {
   expect(ConnectionLimitInt.description).toMatchSnapshot();

diff --git a/...re/server/no-meteor/resolvers/Currency.js → .../core-services/core/resolvers/Currency.js b/...re/server/no-meteor/resolvers/Currency.js → .../core-services/core/resolvers/Currency.js
diff --git a/.../core/server/no-meteor/resolvers/Money.js → ...app/core-services/core/resolvers/Money.js b/.../core/server/no-meteor/resolvers/Money.js → ...app/core-services/core/resolvers/Money.js
diff --git a/imports/node-app/core-services/core/resolvers/Query/index.js b/imports/node-app/core-services/core/resolvers/Query/index.js
@@ -0,0 +1,7 @@
+import tag from "./tag.js";
+import tags from "./tags.js";
+
+export default {
+  tag,
+  tags
+};
diff --git a/...e/server/no-meteor/resolvers/Query/tag.js → ...core-services/core/resolvers/Query/tag.js b/...e/server/no-meteor/resolvers/Query/tag.js → ...core-services/core/resolvers/Query/tag.js
@@ -1,4 +1,4 @@
-import { decodeTagOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/tag";
+import { decodeTagOpaqueId } from "../../xforms/id.js";
 
 /**
  * Arguments passed by the client for a tags query

diff --git a/.../server/no-meteor/resolvers/Query/tags.js → ...ore-services/core/resolvers/Query/tags.js b/.../server/no-meteor/resolvers/Query/tags.js → ...ore-services/core/resolvers/Query/tags.js
@@ -1,5 +1,6 @@
-import { getPaginatedResponse, wasFieldRequested } from "@reactioncommerce/reaction-graphql-utils";
-import { decodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
+import getPaginatedResponse from "@reactioncommerce/api-utils/graphql/getPaginatedResponse.js";
+import wasFieldRequested from "@reactioncommerce/api-utils/graphql/wasFieldRequested.js";
+import { decodeShopOpaqueId } from "../../xforms/id.js";
 
 /**
  * Arguments passed by the client for a tags query

diff --git a/...er/no-meteor/resolvers/Query/tags.test.js → ...ervices/core/resolvers/Query/tags.test.js b/...er/no-meteor/resolvers/Query/tags.test.js → ...ervices/core/resolvers/Query/tags.test.js
@@ -1,5 +1,5 @@
-import tagsResolver from "./tags";
-import getFakeMongoCursor from "/imports/test-utils/helpers/getFakeMongoCursor";
+import tagsResolver from "./tags.js";
+import getFakeMongoCursor from "@reactioncommerce/api-utils/tests/getFakeMongoCursor.js";
 import Factory from "/imports/test-utils/helpers/factory";
 
 const base64ID = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123

diff --git a/...r/no-meteor/resolvers/Tag/heroMediaUrl.js → ...rvices/core/resolvers/Tag/heroMediaUrl.js b/...r/no-meteor/resolvers/Tag/heroMediaUrl.js → ...rvices/core/resolvers/Tag/heroMediaUrl.js
diff --git a/...e/server/no-meteor/resolvers/Tag/index.js → ...core-services/core/resolvers/Tag/index.js b/...e/server/no-meteor/resolvers/Tag/index.js → ...core-services/core/resolvers/Tag/index.js
@@ -1,6 +1,6 @@
-import { encodeTagOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/tag";
-import heroMediaUrl from "./heroMediaUrl";
-import subTags from "./subTags";
+import { encodeTagOpaqueId } from "../../xforms/id.js";
+import heroMediaUrl from "./heroMediaUrl.js";
+import subTags from "./subTags.js";
 
 export default {
   _id: (tag) => encodeTagOpaqueId(tag._id),

diff --git a/...server/no-meteor/resolvers/Tag/subTags.js → ...re-services/core/resolvers/Tag/subTags.js b/...server/no-meteor/resolvers/Tag/subTags.js → ...re-services/core/resolvers/Tag/subTags.js
@@ -1,5 +1,6 @@
-import { getPaginatedResponse, wasFieldRequested } from "@reactioncommerce/reaction-graphql-utils";
-import { xformArrayToConnection } from "@reactioncommerce/reaction-graphql-xforms/connection";
+import getPaginatedResponse from "@reactioncommerce/api-utils/graphql/getPaginatedResponse.js";
+import wasFieldRequested from "@reactioncommerce/api-utils/graphql/wasFieldRequested.js";
+import xformArrayToConnection from "@reactioncommerce/api-utils/graphql/xformArrayToConnection.js";
 
 /**
  * Arguments passed by the client for a tags query

diff --git a/...snapshots__/ConnectionCursor.test.js.snap → ...snapshots__/ConnectionCursor.test.js.snap b/...snapshots__/ConnectionCursor.test.js.snap → ...snapshots__/ConnectionCursor.test.js.snap
diff --git a/...apshots__/ConnectionLimitInt.test.js.snap → ...apshots__/ConnectionLimitInt.test.js.snap b/...apshots__/ConnectionLimitInt.test.js.snap → ...apshots__/ConnectionLimitInt.test.js.snap
diff --git a/.../core/server/no-meteor/resolvers/index.js → ...app/core-services/core/resolvers/index.js b/.../core/server/no-meteor/resolvers/index.js → ...app/core-services/core/resolvers/index.js
@@ -1,12 +1,12 @@
-import { getConnectionTypeResolvers } from "@reactioncommerce/reaction-graphql-utils";
+import getConnectionTypeResolvers from "@reactioncommerce/api-utils/graphql/getConnectionTypeResolvers.js";
 import { GraphQLDate, GraphQLDateTime } from "graphql-iso-date";
-import Address from "./Address";
-import ConnectionCursor from "./ConnectionCursor";
-import ConnectionLimitInt from "./ConnectionLimitInt";
-import Currency from "./Currency";
-import Money from "./Money";
-import Query from "./Query";
-import Tag from "./Tag";
+import Address from "./Address.js";
+import ConnectionCursor from "./ConnectionCursor.js";
+import ConnectionLimitInt from "./ConnectionLimitInt.js";
+import Currency from "./Currency.js";
+import Money from "./Money.js";
+import Query from "./Query/index.js";
+import Tag from "./Tag/index.js";
 
 export default {
   Address,

diff --git a/.../server/no-meteor/schemas/address.graphql → ...ore-services/core/schemas/address.graphql b/.../server/no-meteor/schemas/address.graphql → ...ore-services/core/schemas/address.graphql
diff --git a/...ore/server/no-meteor/schemas/base.graphql → ...p/core-services/core/schemas/base.graphql b/...ore/server/no-meteor/schemas/base.graphql → ...p/core-services/core/schemas/base.graphql
diff --git a/...server/no-meteor/schemas/currency.graphql → ...re-services/core/schemas/currency.graphql b/...server/no-meteor/schemas/currency.graphql → ...re-services/core/schemas/currency.graphql
diff --git a/...re/server/no-meteor/schemas/email.graphql → .../core-services/core/schemas/email.graphql b/...re/server/no-meteor/schemas/email.graphql → .../core-services/core/schemas/email.graphql
diff --git a/...re/core/server/no-meteor/schemas/index.js → ...e-app/core-services/core/schemas/index.js b/...re/core/server/no-meteor/schemas/index.js → ...e-app/core-services/core/schemas/index.js
diff --git a/...erver/no-meteor/schemas/metafield.graphql → ...e-services/core/schemas/metafield.graphql b/...erver/no-meteor/schemas/metafield.graphql → ...e-services/core/schemas/metafield.graphql
diff --git a/...ore/server/no-meteor/schemas/node.graphql → ...p/core-services/core/schemas/node.graphql b/...ore/server/no-meteor/schemas/node.graphql → ...p/core-services/core/schemas/node.graphql
diff --git a/...ore/server/no-meteor/schemas/shop.graphql → ...p/core-services/core/schemas/shop.graphql b/...ore/server/no-meteor/schemas/shop.graphql → ...p/core-services/core/schemas/shop.graphql
diff --git a/...core/server/no-meteor/schemas/tag.graphql → ...pp/core-services/core/schemas/tag.graphql b/...core/server/no-meteor/schemas/tag.graphql → ...pp/core-services/core/schemas/tag.graphql
diff --git a/...ins/core/core/server/no-meteor/startup.js → ...ts/node-app/core-services/core/startup.js b/...ins/core/core/server/no-meteor/startup.js → ...ts/node-app/core-services/core/startup.js
@@ -1,7 +1,7 @@
 import Random from "@reactioncommerce/random";
-import layouts from "./util/layouts";
-import loadSampleData from "./util/loadSampleData";
-import upsertPackages from "./util/upsertPackages";
+import layouts from "./util/layouts.js";
+import loadSampleData from "./util/loadSampleData.js";
+import upsertPackages from "./util/upsertPackages.js";
 
 /**
  * @summary Called on startup

diff --git a/...ore/core/server/no-meteor/util/layouts.js → ...de-app/core-services/core/util/layouts.js b/...ore/core/server/no-meteor/util/layouts.js → ...de-app/core-services/core/util/layouts.js
diff --git a/...e/server/no-meteor/util/loadSampleData.js → ...core-services/core/util/loadSampleData.js b/...e/server/no-meteor/util/loadSampleData.js → ...core-services/core/util/loadSampleData.js
@@ -2,8 +2,8 @@
 /* TODO: revisit `url.parse` throughout Reaction */
 import url from "url";
 import Logger from "@reactioncommerce/logger";
-import config from "/imports/node-app/core/config";
-import sampleData from "./sampleData";
+import config from "../config.js";
+import sampleData from "./sampleData.js";
 
 /**
  * @summary Loads sample dataset if collections are empty

diff --git a/.../core/server/no-meteor/util/sampleData.js → ...app/core-services/core/util/sampleData.js b/.../core/server/no-meteor/util/sampleData.js → ...app/core-services/core/util/sampleData.js
diff --git a/...e/server/no-meteor/util/upsertPackages.js → ...core-services/core/util/upsertPackages.js b/...e/server/no-meteor/util/upsertPackages.js → ...core-services/core/util/upsertPackages.js
@@ -1,6 +1,6 @@
 import Logger from "@reactioncommerce/logger";
 import Random from "@reactioncommerce/random";
-import layouts from "./layouts";
+import layouts from "./layouts.js";
 
 /**
  * @param {Object} context App context

diff --git a/imports/node-app/core-services/core/xforms/id.js b/imports/node-app/core-services/core/xforms/id.js
@@ -0,0 +1,12 @@
+import decodeOpaqueIdForNamespace from "@reactioncommerce/api-utils/decodeOpaqueIdForNamespace.js";
+import encodeOpaqueId from "@reactioncommerce/api-utils/encodeOpaqueId.js";
+
+// export const encodeCatalogItemOpaqueId = encodeOpaqueId("reaction/catalogItem");
+// export const encodeCatalogProductOpaqueId = encodeOpaqueId("reaction/catalogProduct");
+// export const encodeCatalogProductVariantOpaqueId = encodeOpaqueId("reaction/catalogProductVariant");
+// export const encodeProductOpaqueId = encodeOpaqueId("reaction/product");
+export const encodeAddressOpaqueId = encodeOpaqueId("reaction/address");
+export const encodeTagOpaqueId = encodeOpaqueId("reaction/tag");
+
+export const decodeShopOpaqueId = decodeOpaqueIdForNamespace("reaction/shop");
+export const decodeTagOpaqueId = decodeOpaqueIdForNamespace("reaction/tag");
diff --git a/imports/node-app/core-services/product/resolvers/Product/tags.js b/imports/node-app/core-services/product/resolvers/Product/tags.js
@@ -1,5 +1,6 @@
-import { getPaginatedResponse, wasFieldRequested } from "@reactioncommerce/reaction-graphql-utils";
-import { xformArrayToConnection } from "@reactioncommerce/reaction-graphql-xforms/connection";
+import getPaginatedResponse from "@reactioncommerce/api-utils/graphql/getPaginatedResponse.js";
+import wasFieldRequested from "@reactioncommerce/api-utils/graphql/wasFieldRequested.js";
+import xformArrayToConnection from "@reactioncommerce/api-utils/graphql/xformArrayToConnection.js";
 
 /**
  * @name Product/tags

diff --git a/imports/node-app/core-services/shop/resolvers/Shop/tags.js b/imports/node-app/core-services/shop/resolvers/Shop/tags.js
@@ -1,4 +1,5 @@
-import { getPaginatedResponse, wasFieldRequested } from "@reactioncommerce/reaction-graphql-utils";
+import getPaginatedResponse from "@reactioncommerce/api-utils/graphql/getPaginatedResponse.js";
+import wasFieldRequested from "@reactioncommerce/api-utils/graphql/wasFieldRequested.js";
 import { decodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
 
 /**

diff --git a/imports/node-app/core-services/shop/resolvers/Shop/tags.test.js b/imports/node-app/core-services/shop/resolvers/Shop/tags.test.js
@@ -1,5 +1,5 @@
+import getFakeMongoCursor from "@reactioncommerce/api-utils/tests/getFakeMongoCursor.js";
 import tagsResolver from "./tags.js";
-import getFakeMongoCursor from "/imports/test-utils/helpers/getFakeMongoCursor";
 
 const base64ID = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123
 

diff --git a/imports/node-app/core-services/tags/resolvers/index.js b/imports/node-app/core-services/tags/resolvers/index.js
@@ -1,4 +1,4 @@
-import { getConnectionTypeResolvers } from "@reactioncommerce/reaction-graphql-utils";
+import getConnectionTypeResolvers from "@reactioncommerce/api-utils/graphql/getConnectionTypeResolvers.js";
 import Mutation from "./Mutation/index.js";
 import Query from "./Query/index.js";
 

diff --git a/imports/node-app/plugins/navigation/resolvers/Query/navigationItemsByShopId.js b/imports/node-app/plugins/navigation/resolvers/Query/navigationItemsByShopId.js
@@ -1,4 +1,5 @@
-import { getPaginatedResponse, wasFieldRequested } from "@reactioncommerce/reaction-graphql-utils";
+import getPaginatedResponse from "@reactioncommerce/api-utils/graphql/getPaginatedResponse.js";
+import wasFieldRequested from "@reactioncommerce/api-utils/graphql/wasFieldRequested.js";
 import { decodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
 
 /**

diff --git a/imports/node-app/plugins/navigation/resolvers/Query/navigationItemsByShopId.test.js b/imports/node-app/plugins/navigation/resolvers/Query/navigationItemsByShopId.test.js
@@ -1,4 +1,4 @@
-import getFakeMongoCursor from "/imports/test-utils/helpers/getFakeMongoCursor"; // TODO: add getFakeMongoCurser to utils
+import getFakeMongoCursor from "@reactioncommerce/api-utils/tests/getFakeMongoCursor.js";
 import navigationItemsByShopIdResolver from "./navigationItemsByShopId.js";
 
 const opaqueShopId = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123

diff --git a/imports/node-app/plugins/navigation/resolvers/index.js b/imports/node-app/plugins/navigation/resolvers/index.js
@@ -1,4 +1,4 @@
-import { getConnectionTypeResolvers } from "@reactioncommerce/reaction-graphql-utils";
+import getConnectionTypeResolvers from "@reactioncommerce/api-utils/graphql/getConnectionTypeResolvers.js";
 import NavigationItem from "./NavigationItem/index.js";
 import NavigationTree from "./NavigationTree/index.js";
 import ShopSettings from "./ShopSettings/index.js";

diff --git a/...rts/node-app/plugins/shipping-rates/resolvers/Query/getFlatRateFulfillmentRestrictions.js b/...rts/node-app/plugins/shipping-rates/resolvers/Query/getFlatRateFulfillmentRestrictions.js
@@ -1,5 +1,6 @@
+import getPaginatedResponse from "@reactioncommerce/api-utils/graphql/getPaginatedResponse.js";
+import wasFieldRequested from "@reactioncommerce/api-utils/graphql/wasFieldRequested.js";
 import { decodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
-import { getPaginatedResponse, wasFieldRequested } from "@reactioncommerce/reaction-graphql-utils";
 
 /**
  * @name Query/getFlatRateFulfillmentRestrictions

diff --git a/imports/node-app/plugins/shipping-rates/resolvers/index.js b/imports/node-app/plugins/shipping-rates/resolvers/index.js
@@ -1,4 +1,4 @@
-import { getConnectionTypeResolvers } from "@reactioncommerce/reaction-graphql-utils";
+import getConnectionTypeResolvers from "@reactioncommerce/api-utils/graphql/getConnectionTypeResolvers.js";
 import FlatRateFulfillmentRestriction from "./FlatRateFulfillmentRestriction/index.js";
 import Mutation from "./Mutation/index.js";
 import Query from "./Query/index.js";

diff --git a/imports/node-app/plugins/surcharges/resolvers/Query/surcharges.js b/imports/node-app/plugins/surcharges/resolvers/Query/surcharges.js
@@ -1,5 +1,6 @@
+import getPaginatedResponse from "@reactioncommerce/api-utils/graphql/getPaginatedResponse.js";
+import wasFieldRequested from "@reactioncommerce/api-utils/graphql/wasFieldRequested.js";
 import { decodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
-import { getPaginatedResponse, wasFieldRequested } from "@reactioncommerce/reaction-graphql-utils";
 
 /**
  * @name Query/surcharges

diff --git a/imports/node-app/plugins/surcharges/resolvers/index.js b/imports/node-app/plugins/surcharges/resolvers/index.js
@@ -1,4 +1,4 @@
-import { getConnectionTypeResolvers } from "@reactioncommerce/reaction-graphql-utils";
+import getConnectionTypeResolvers from "@reactioncommerce/api-utils/graphql/getConnectionTypeResolvers.js";
 import AppliedSurcharge from "./AppliedSurcharge/index.js";
 import Surcharge from "./Surcharge/index.js";
 import Mutation from "./Mutation/index.js";

diff --git a/imports/node-app/registerPlugins.js b/imports/node-app/registerPlugins.js
@@ -1,6 +1,7 @@
 /* node-app imports */
 /* core-services */
 import registerCatalogPlugin from "./core-services/catalog/index.js";
+import registerCorePlugin from "./core-services/core/index.js";
 import registerDiscountsPlugin from "./core-services/discounts/index.js";
 import registerEmailPlugin from "./core-services/email/index.js";
 import registerFilesPlugin from "./core-services/files/index.js";
@@ -43,7 +44,6 @@ import registerUIPlugin from "./plugins/ui/index.js";
 import registerAccountsPlugin from "/imports/plugins/core/accounts/server/no-meteor/register";
 import registerCartPlugin from "/imports/plugins/core/cart/server/no-meteor/register";
 import registerCheckoutPlugin from "/imports/plugins/core/checkout/server/no-meteor/register";
-import registerCorePlugin from "/imports/plugins/core/core/server/no-meteor/register";
 import registerJobQueuePlugin from "/imports/plugins/included/job-queue/server/no-meteor/register";
 import registerOrdersPlugin from "/imports/plugins/core/orders/server/no-meteor/register";
 

diff --git a/imports/plugins/core/accounts/server/no-meteor/resolvers/Account/addressBook.js b/imports/plugins/core/accounts/server/no-meteor/resolvers/Account/addressBook.js
@@ -1,5 +1,5 @@
 import { get } from "lodash";
-import { xformArrayToConnection } from "@reactioncommerce/reaction-graphql-xforms/connection";
+import xformArrayToConnection from "@reactioncommerce/api-utils/graphql/xformArrayToConnection.js";
 
 /**
  * @name Account/addressBook

diff --git a/imports/plugins/core/accounts/server/no-meteor/resolvers/Query/administrators.js b/imports/plugins/core/accounts/server/no-meteor/resolvers/Query/administrators.js
@@ -1,4 +1,5 @@
-import { getPaginatedResponse, wasFieldRequested } from "@reactioncommerce/reaction-graphql-utils";
+import getPaginatedResponse from "@reactioncommerce/api-utils/graphql/getPaginatedResponse.js";
+import wasFieldRequested from "@reactioncommerce/api-utils/graphql/wasFieldRequested.js";
 import { decodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
 
 /**

diff --git a/imports/plugins/core/accounts/server/no-meteor/resolvers/Query/administrators.test.js b/imports/plugins/core/accounts/server/no-meteor/resolvers/Query/administrators.test.js
@@ -1,5 +1,5 @@
+import getFakeMongoCursor from "@reactioncommerce/api-utils/tests/getFakeMongoCursor.js";
 import administratorsResolver from "./administrators";
-import getFakeMongoCursor from "/imports/test-utils/helpers/getFakeMongoCursor";
 
 const base64ID = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123
 

diff --git a/imports/plugins/core/accounts/server/no-meteor/resolvers/Query/groups.js b/imports/plugins/core/accounts/server/no-meteor/resolvers/Query/groups.js
@@ -1,4 +1,5 @@
-import { getPaginatedResponse, wasFieldRequested } from "@reactioncommerce/reaction-graphql-utils";
+import getPaginatedResponse from "@reactioncommerce/api-utils/graphql/getPaginatedResponse.js";
+import wasFieldRequested from "@reactioncommerce/api-utils/graphql/wasFieldRequested.js";
 import { decodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
 
 /**

diff --git a/imports/plugins/core/accounts/server/no-meteor/resolvers/Query/groups.test.js b/imports/plugins/core/accounts/server/no-meteor/resolvers/Query/groups.test.js
@@ -1,5 +1,5 @@
+import getFakeMongoCursor from "@reactioncommerce/api-utils/tests/getFakeMongoCursor.js";
 import groups from "./groups";
-import getFakeMongoCursor from "/imports/test-utils/helpers/getFakeMongoCursor";
 
 jest.mock("graphql-fields", () => jest.fn().mockName("graphqlFields"));
 

diff --git a/imports/plugins/core/accounts/server/no-meteor/resolvers/Query/roles.js b/imports/plugins/core/accounts/server/no-meteor/resolvers/Query/roles.js
@@ -1,4 +1,5 @@
-import { getPaginatedResponse, wasFieldRequested } from "@reactioncommerce/reaction-graphql-utils";
+import getPaginatedResponse from "@reactioncommerce/api-utils/graphql/getPaginatedResponse.js";
+import wasFieldRequested from "@reactioncommerce/api-utils/graphql/wasFieldRequested.js";
 import { decodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
 
 /**

diff --git a/imports/plugins/core/accounts/server/no-meteor/resolvers/Query/roles.test.js b/imports/plugins/core/accounts/server/no-meteor/resolvers/Query/roles.test.js
@@ -1,5 +1,5 @@
+import getFakeMongoCursor from "@reactioncommerce/api-utils/tests/getFakeMongoCursor.js";
 import roles from "./roles";
-import getFakeMongoCursor from "/imports/test-utils/helpers/getFakeMongoCursor";
 
 jest.mock("graphql-fields", () => jest.fn().mockName("graphqlFields"));
 

diff --git a/imports/plugins/core/accounts/server/no-meteor/resolvers/Shop/administrators.js b/imports/plugins/core/accounts/server/no-meteor/resolvers/Shop/administrators.js
@@ -1,4 +1,5 @@
-import { getPaginatedResponse, wasFieldRequested } from "@reactioncommerce/reaction-graphql-utils";
+import getPaginatedResponse from "@reactioncommerce/api-utils/graphql/getPaginatedResponse.js";
+import wasFieldRequested from "@reactioncommerce/api-utils/graphql/wasFieldRequested.js";
 import { decodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
 
 /**

diff --git a/imports/plugins/core/accounts/server/no-meteor/resolvers/Shop/administrators.test.js b/imports/plugins/core/accounts/server/no-meteor/resolvers/Shop/administrators.test.js
@@ -1,5 +1,5 @@
+import getFakeMongoCursor from "@reactioncommerce/api-utils/tests/getFakeMongoCursor.js";
 import administratorsResolver from "./administrators";
-import getFakeMongoCursor from "/imports/test-utils/helpers/getFakeMongoCursor";
 
 const base64ID = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123
 

diff --git a/imports/plugins/core/accounts/server/no-meteor/resolvers/Shop/groups.js b/imports/plugins/core/accounts/server/no-meteor/resolvers/Shop/groups.js
@@ -1,4 +1,5 @@
-import { getPaginatedResponse, wasFieldRequested } from "@reactioncommerce/reaction-graphql-utils";
+import getPaginatedResponse from "@reactioncommerce/api-utils/graphql/getPaginatedResponse.js";
+import wasFieldRequested from "@reactioncommerce/api-utils/graphql/wasFieldRequested.js";
 import { decodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
 
 /**

diff --git a/imports/plugins/core/accounts/server/no-meteor/resolvers/Shop/groups.test.js b/imports/plugins/core/accounts/server/no-meteor/resolvers/Shop/groups.test.js
@@ -1,5 +1,5 @@
+import getFakeMongoCursor from "@reactioncommerce/api-utils/tests/getFakeMongoCursor.js";
 import groupsResolver from "./groups";
-import getFakeMongoCursor from "/imports/test-utils/helpers/getFakeMongoCursor";
 
 const base64ID = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123
 

diff --git a/imports/plugins/core/accounts/server/no-meteor/resolvers/Shop/roles.js b/imports/plugins/core/accounts/server/no-meteor/resolvers/Shop/roles.js
@@ -1,4 +1,5 @@
-import { getPaginatedResponse, wasFieldRequested } from "@reactioncommerce/reaction-graphql-utils";
+import getPaginatedResponse from "@reactioncommerce/api-utils/graphql/getPaginatedResponse.js";
+import wasFieldRequested from "@reactioncommerce/api-utils/graphql/wasFieldRequested.js";
 import { decodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
 
 /**

diff --git a/imports/plugins/core/accounts/server/no-meteor/resolvers/Shop/roles.test.js b/imports/plugins/core/accounts/server/no-meteor/resolvers/Shop/roles.test.js
@@ -1,5 +1,5 @@
+import getFakeMongoCursor from "@reactioncommerce/api-utils/tests/getFakeMongoCursor.js";
 import rolesResolver from "./roles";
-import getFakeMongoCursor from "/imports/test-utils/helpers/getFakeMongoCursor";
 
 const base64ID = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123
 

diff --git a/imports/plugins/core/accounts/server/no-meteor/resolvers/index.js b/imports/plugins/core/accounts/server/no-meteor/resolvers/index.js
@@ -1,4 +1,4 @@
-import { getConnectionTypeResolvers } from "@reactioncommerce/reaction-graphql-utils";
+import getConnectionTypeResolvers from "@reactioncommerce/api-utils/graphql/getConnectionTypeResolvers.js";
 import Account from "./Account";
 import AddAccountAddressBookEntryPayload from "./AddAccountAddressBookEntryPayload";
 import Group from "./Group";

diff --git a/imports/plugins/core/cart/server/no-meteor/resolvers/Cart/items.js b/imports/plugins/core/cart/server/no-meteor/resolvers/Cart/items.js
@@ -1,5 +1,5 @@
 import { orderBy } from "lodash";
-import { xformArrayToConnection } from "@reactioncommerce/reaction-graphql-xforms/connection";
+import xformArrayToConnection from "@reactioncommerce/api-utils/graphql/xformArrayToConnection.js";
 import { xformCartItems } from "@reactioncommerce/reaction-graphql-xforms/cart";
 
 /**

diff --git a/imports/plugins/core/cart/server/no-meteor/resolvers/CartItem/productTags.js b/imports/plugins/core/cart/server/no-meteor/resolvers/CartItem/productTags.js
@@ -1,5 +1,6 @@
-import { getPaginatedResponse, wasFieldRequested } from "@reactioncommerce/reaction-graphql-utils";
-import { xformArrayToConnection } from "@reactioncommerce/reaction-graphql-xforms/connection";
+import getPaginatedResponse from "@reactioncommerce/api-utils/graphql/getPaginatedResponse.js";
+import wasFieldRequested from "@reactioncommerce/api-utils/graphql/wasFieldRequested.js";
+import xformArrayToConnection from "@reactioncommerce/api-utils/graphql/xformArrayToConnection.js";
 
 /**
  * @name CartItem/productTags

diff --git a/imports/plugins/core/core/server/no-meteor/resolvers/Address.js b/imports/plugins/core/core/server/no-meteor/resolvers/Address.js
diff --git a/imports/plugins/core/core/server/no-meteor/resolvers/Query/index.js b/imports/plugins/core/core/server/no-meteor/resolvers/Query/index.js
diff --git a/imports/plugins/core/core/server/startup/index.js b/imports/plugins/core/core/server/startup/index.js
@@ -1,7 +1,7 @@
 import Logger from "@reactioncommerce/logger";
 import appEvents from "/imports/node-app/core/util/appEvents";
+import register from "/imports/node-app/core-services/core/index.js";
 import Reaction from "../Reaction";
-import register from "../no-meteor/register";
 import startNodeApp from "./startNodeApp";
 import "./browser-policy";
 import CollectionSecurity from "./collection-security";