Skip to content

Commit

Permalink
Use mindful-web packages
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonbk committed Dec 16, 2024
1 parent 0c90fcb commit 7bc78c7
Show file tree
Hide file tree
Showing 125 changed files with 915 additions and 914 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// eslint-disable-next-line import/no-extraneous-dependencies
module.exports = require('@parameter1/base-cms-eslint/eslintrc.server');
module.exports = require('@mindful-web/eslint/eslintrc.server');
6 changes: 3 additions & 3 deletions .github/workflows/deploy-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
###############################################
with:
ecr_registry: ${{ vars.AWS_ECR_REGISTRY }}
docker_image: ${{ vars.AWS_ECR_REGISTRY }}/base-cms-websites:${{ matrix.site.account }}-${{ matrix.site.dir }}-${{ needs.version.outputs.version }}
docker_image: ${{ vars.AWS_ECR_REGISTRY }}/mindful-web/websites:${{ matrix.site.account }}-${{ matrix.site.dir }}-${{ needs.version.outputs.version }}
site_host: ${{ matrix.site.dir }}
push: true
secrets: inherit
Expand All @@ -85,9 +85,9 @@ jobs:
###############################################
with:
ecr_registry: ${{ vars.AWS_ECR_REGISTRY }}
docker_image: ${{ vars.AWS_ECR_REGISTRY }}/base-cms-websites:${{ matrix.site.account }}-${{ matrix.site.dir }}-${{ needs.version.outputs.version }}
docker_image: ${{ vars.AWS_ECR_REGISTRY }}/mindful-web/websites:${{ matrix.site.account }}-${{ matrix.site.dir }}-${{ needs.version.outputs.version }}
infra_stack: ${{ matrix.site.stack }}
rancher_label_key: basecms-website
rancher_label_key: mindful-web-website
rancher_label_val: ${{ matrix.site.rancher_label }}
site_dir: ${{ matrix.site.dir }}
site_id: ${{ matrix.site.id }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
#v# Make sure this matches the site matrix! #v#
###############################################
site:
- { dir: ccnewsnow.com, stack: virgon, id: 60c28bc3d28860bc334ebcb2, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-ccnewsnow.com }
- { dir: ccnewsnow.com, stack: leonis, id: 60c28bc3d28860bc334ebcb2, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-ccnewsnow.com }
- { dir: diverseeducation.com, stack: leonis, id: 60c281c6d28860bc33464ae0, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diverseeducation.com }
- { dir: diversemilitary.net, stack: leonis, id: 60c28c0dd28860bc334ed723, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diversemilitary.net }
- { dir: divhealth.net, stack: leonis, id: 60c28c4bd28860bc334f485d, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-divhealth.net }
Expand All @@ -61,7 +61,7 @@ jobs:
###############################################
with:
ecr_registry: ${{ vars.AWS_ECR_REGISTRY }}
docker_image: ${{ vars.AWS_ECR_REGISTRY }}/base-cms-websites-staging:${{ matrix.site.account }}-${{ matrix.site.dir }}-${{ needs.version.outputs.version }}
docker_image: ${{ vars.AWS_ECR_REGISTRY }}/mindful-web/websites-staging:${{ matrix.site.account }}-${{ matrix.site.dir }}-${{ needs.version.outputs.version }}
site_host: ${{ matrix.site.dir }}
push: true
secrets: inherit
Expand All @@ -75,16 +75,16 @@ jobs:
#v# Make sure this matches the site matrix! #v#
###############################################
site:
- { dir: ccnewsnow.com, stack: virgon, id: 60c28bc3d28860bc334ebcb2, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-ccnewsnow.com }
- { dir: ccnewsnow.com, stack: leonis, id: 60c28bc3d28860bc334ebcb2, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-ccnewsnow.com }
- { dir: diverseeducation.com, stack: leonis, id: 60c281c6d28860bc33464ae0, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diverseeducation.com }
- { dir: diversemilitary.net, stack: leonis, id: 60c28c0dd28860bc334ed723, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diversemilitary.net }
- { dir: divhealth.net, stack: leonis, id: 60c28c4bd28860bc334f485d, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-divhealth.net }
###############################################
#^# Make sure this matches the site matrix! #^#
###############################################
with:
docker_image: ${{ vars.AWS_ECR_REGISTRY }}/base-cms-websites-staging:${{ matrix.site.account }}-${{ matrix.site.dir }}-${{ needs.version.outputs.version }}
docker_image: ${{ vars.AWS_ECR_REGISTRY }}/mindful-web/websites-staging:${{ matrix.site.account }}-${{ matrix.site.dir }}-${{ needs.version.outputs.version }}
infra_stack: ${{ matrix.site.stack }}
rancher_label_key: basecms-website
rancher_label_key: mindful-web-website
rancher_label_val: ${{ matrix.site.rancher_label }}
secrets: inherit
3 changes: 2 additions & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ jobs:
#v# Make sure this matches the site matrix! #v#
###############################################
site:
- { dir: ccnewsnow.com, stack: virgon, id: 60c28bc3d28860bc334ebcb2, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-ccnewsnow.com }
- { dir: ccnewsnow.com, stack: leonis, id: 60c28bc3d28860bc334ebcb2, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-ccnewsnow.com }
- { dir: diverseeducation.com, stack: leonis, id: 60c281c6d28860bc33464ae0, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diverseeducation.com }
- { dir: diversemilitary.net, stack: leonis, id: 60c28c0dd28860bc334ed723, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diversemilitary.net }
- { dir: divhealth.net, stack: leonis, id: 60c28c4bd28860bc334f485d, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-divhealth.net }
- { dir: ccnewsnow.com, stack: virgon, id: 60c28bc3d28860bc334ebcb2, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-ccnewsnow.com }
- { dir: diverseeducation.com, stack: virgon, id: 60c281c6d28860bc33464ae0, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diverseeducation.com }
- { dir: diversemilitary.net, stack: virgon, id: 60c28c0dd28860bc334ed723, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diversemilitary.net }
- { dir: divhealth.net, stack: virgon, id: 60c28c4bd28860bc334f485d, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-divhealth.net }
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/node-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 14.21

- uses: actions/cache@v3
- uses: actions/cache@v4
id: yarn-cache
with:
path: '**/node_modules'
Expand Down
18 changes: 9 additions & 9 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ x-env-defaults: &env
IDENTITYX_API_TOKEN: ${IDENTITYX_API_TOKEN-(unset)}
RECAPTCHA_V3_SITE_KEY: ${RECAPTCHA_V3_SITE_KEY-}
RECAPTCHA_V3_SECRET_KEY: ${RECAPTCHA_V3_SECRET_KEY-}
BASE_BROWSE_GRAPHQL_URI: ${BASE_BROWSE_GRAPHQL_URI-https://base-browse.virgon.base.parameter1.com/graphql}
BASE_BROWSE_GRAPHQL_URI: ${BASE_BROWSE_GRAPHQL_URI-https://browse.virgon.mindful-web.parameter1.com/graphql}
SENDGRID_API_KEY: ${SENDGRID_API_KEY-(unset)}
SENDGRID_DEV_TO: [email protected]
YARN_CACHE_FOLDER: /.yarn-cache
Expand All @@ -36,16 +36,16 @@ x-env-defaults: &env
NATIVEX_SERVE_URI: ${NATIVEX_SERVE_URI-}

x-env-leonis: &env-leonis
GRAPHQL_URI: ${GRAPHQL_URI-https://graphql.leonis.base.parameter1.com}
OEMBED_URI: ${OEMBED_URI-https://oembed.leonis.base.parameter1.com}
RSS_URI: ${RSS_URI-https://rss.leonis.base.parameter1.com}
SITEMAPS_URI: ${SITEMAPS_URI-https://sitemaps.leonis.base.parameter1.com}
GRAPHQL_URI: ${GRAPHQL_URI-https://graphql.leonis.mindful-web.parameter1.com}
OEMBED_URI: ${OEMBED_URI-https://oembed.leonis.mindful-web.parameter1.com}
RSS_URI: ${RSS_URI-https://rss.leonis.mindful-web.parameter1.com}
SITEMAPS_URI: ${SITEMAPS_URI-https://sitemaps.leonis.mindful-web.parameter1.com}

x-env-virgon: &env-virgon
GRAPHQL_URI: ${GRAPHQL_URI-https://virgon.graphql.base.parameter1.com}
OEMBED_URI: ${OEMBED_URI-https://virgon.oembed.base.parameter1.com}
RSS_URI: ${RSS_URI-https://virgon.rss.base.parameter1.com}
SITEMAPS_URI: ${SITEMAPS_URI-https://virgon.sitemaps.base.parameter1.com}
GRAPHQL_URI: ${GRAPHQL_URI-https://virgon.graphql.mindful-web.parameter1.com}
OEMBED_URI: ${OEMBED_URI-https://virgon.oembed.mindful-web.parameter1.com}
RSS_URI: ${RSS_URI-https://virgon.rss.mindful-web.parameter1.com}
SITEMAPS_URI: ${SITEMAPS_URI-https://virgon.sitemaps.mindful-web.parameter1.com}

x-env-development: &env-development
GRAPHQL_URI: ${GRAPHQL_URI-http://host.docker.internal:10002}
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
"scripts": {
"build": "lerna run build",
"compile": "lerna run compile",
"generate-gha-workflows": "basecms-website generate-gha-workflows",
"generate-gha-workflows": "mindful-web-website generate-gha-workflows",
"lint": "lerna run lint",
"lint:fix": "lerna run lint:fix",
"test": "lerna run test"
},
"devDependencies": {
"@parameter1/base-cms-eslint": "^4.74.0",
"@parameter1/base-cms-marko-compiler": "^4.74.0",
"@parameter1/browserslist-config-base-cms": "^4.74.0",
"@mindful-web/eslint": "^1.0.0",
"@mindful-web/marko-compiler": "^1.0.0",
"@mindful-web/browserslist-config": "^1.0.0",
"lerna": "^6.5.1"
},
"engines": {
Expand All @@ -34,6 +34,6 @@
],
"dependencies": {},
"browserslist": [
"extends @parameter1/browserslist-config-base-cms"
"extends @mindful-web/browserslist-config"
]
}
2 changes: 1 addition & 1 deletion packages/global/browser/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// eslint-disable-next-line import/no-extraneous-dependencies
module.exports = require('@parameter1/base-cms-eslint/eslintrc.browser');
module.exports = require('@mindful-web/eslint/eslintrc.browser');
6 changes: 3 additions & 3 deletions packages/global/browser/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import GCSE from '@parameter1/base-cms-marko-web-gcse/browser';
import ContactUs from '@parameter1/base-cms-marko-web-contact-us/browser';
import MonoRail from '@parameter1/base-cms-marko-web-theme-monorail/browser';
import GCSE from '@mindful-web/marko-web-gcse/browser';
import ContactUs from '@mindful-web/marko-web-contact-us/browser';
import MonoRail from '@mindful-web/marko-web-theme-monorail/browser';

const GlobalPremiumEmployers = () => import(/* webpackChunkName: "global-premium-employers" */ './premium-employers.vue');

Expand Down
2 changes: 1 addition & 1 deletion packages/global/browser/ssr.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ThemeComponents from '@parameter1/base-cms-marko-web-theme-monorail/browser/ssr';
import ThemeComponents from '@mindful-web/marko-web-theme-monorail/browser/ssr';
import GlobalPremiumEmployers from './premium-employers.vue';

export default {
Expand Down
2 changes: 1 addition & 1 deletion packages/global/components/blocks/esurveypro.marko
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import defaultValue from "@parameter1/base-cms-marko-core/utils/default-value";
import defaultValue from "@mindful-web/marko-core/utils/default-value";

$ const showHeader = defaultValue(input.showHeader, true);

Expand Down
2 changes: 1 addition & 1 deletion packages/global/components/blocks/featured-jobs-list.marko
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import defaultValue from "@parameter1/base-cms-marko-core/utils/default-value";
import defaultValue from "@mindful-web/marko-core/utils/default-value";
import queryFragment from "../../graphql/fragments/featured-job-list";
import shuffle from "../../utils/shuffle-array";

Expand Down
2 changes: 1 addition & 1 deletion packages/global/components/blocks/featured-jobs.marko
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import defaultValue from "@parameter1/base-cms-marko-core/utils/default-value";
import defaultValue from "@mindful-web/marko-core/utils/default-value";
import queryFragment from "../../graphql/fragments/featured-job-list";
import shuffle from "../../utils/shuffle-array";

Expand Down
4 changes: 2 additions & 2 deletions packages/global/components/blocks/premium-employers.marko
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import defaultValue from "@parameter1/base-cms-marko-core/utils/default-value";
import queryFragment from "@parameter1/base-cms-marko-web-theme-monorail/graphql/fragments/section-feed-block";
import defaultValue from "@mindful-web/marko-core/utils/default-value";
import queryFragment from "@mindful-web/marko-web-theme-monorail/graphql/fragments/section-feed-block";
import shuffle from "../../utils/shuffle-array";

$ const { GAM } = out.global;
Expand Down
4 changes: 2 additions & 2 deletions packages/global/components/blocks/recommended-content.marko
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { get, getAsArray } from "@parameter1/base-cms-object-path";
import defaultValue from "@parameter1/base-cms-marko-core/utils/default-value";
import { get, getAsArray } from "@mindful-web/object-path";
import defaultValue from "@mindful-web/marko-core/utils/default-value";
import shuffle from "../../utils/shuffle-array";

$ const { site, } = out.global;
Expand Down
4 changes: 2 additions & 2 deletions packages/global/components/blocks/section-cards.marko
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import defaultValue from "@parameter1/base-cms-marko-core/utils/default-value";
import queryFragment from "@parameter1/base-cms-marko-web-theme-monorail/graphql/fragments/section-feed-block";
import defaultValue from "@mindful-web/marko-core/utils/default-value";
import queryFragment from "@mindful-web/marko-web-theme-monorail/graphql/fragments/section-feed-block";

$ const { GAM } = out.global;
$ const queryParams = {
Expand Down
2 changes: 1 addition & 1 deletion packages/global/components/blocks/section-list.marko
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import defaultValue from "@parameter1/base-cms-marko-core/utils/default-value";
import defaultValue from "@mindful-web/marko-core/utils/default-value";

$ const withSection = defaultValue(input.withSection, false);
$ const withViewMore = defaultValue(input.withViewMore, false);
Expand Down
4 changes: 2 additions & 2 deletions packages/global/components/document.marko
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import createOmedaIdentityBuilder from "@parameter1/base-cms-marko-web-p1-events/utils/create-omeda-identity-builder";
import { getAsObject } from "@parameter1/base-cms-object-path";
import createOmedaIdentityBuilder from "@mindful-web/marko-web-p1-events/utils/create-omeda-identity-builder";
import { getAsObject } from "@mindful-web/object-path";

$ const {
config,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getAsArray, getAsObject } from "@parameter1/base-cms-object-path";
import { getAsArray, getAsObject } from "@mindful-web/object-path";

$ const content = getAsObject(input, "obj");
$ const showEmail = input.showEmail != null ? input.showEmail : true;
Expand Down
6 changes: 3 additions & 3 deletions packages/global/components/layouts/content/company.marko
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { getAsArray } from "@parameter1/base-cms-object-path";
import { buildImgixUrl } from "@parameter1/base-cms-image";
import imageHeight from "@parameter1/base-cms-marko-web/components/node/utils/image-height";
import { getAsArray } from "@mindful-web/object-path";
import { buildImgixUrl } from "@mindful-web/image";
import imageHeight from "@mindful-web/marko-web/components/node/utils/image-height";

$ const { id, type, pageNode, ...rest } = input;
$ const sections = getAsArray(input, "sections");
Expand Down
8 changes: 4 additions & 4 deletions packages/global/components/layouts/content/default.marko
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { get, getAsArray, getAsObject } from "@parameter1/base-cms-object-path";
import defaultValue from "@parameter1/base-cms-marko-core/utils/default-value";
import getContentPreview from "@parameter1/base-cms-marko-web-theme-monorail/utils/get-content-preview";
import { shouldOverlay, restrictContentByReg, shouldTruncate } from "@parameter1/base-cms-marko-web-theme-monorail/utils/content-meter-helpers";
import { get, getAsArray, getAsObject } from "@mindful-web/object-path";
import defaultValue from "@mindful-web/marko-core/utils/default-value";
import getContentPreview from "@mindful-web/marko-web-theme-monorail/utils/get-content-preview";
import { shouldOverlay, restrictContentByReg, shouldTruncate } from "@mindful-web/marko-web-theme-monorail/utils/content-meter-helpers";

import shuffle from "../../../utils/shuffle-array";

Expand Down
2 changes: 1 addition & 1 deletion packages/global/components/layouts/content/product.marko
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getAsArray } from "@parameter1/base-cms-object-path";
import { getAsArray } from "@mindful-web/object-path";

$ const { id, type, pageNode, ...rest } = input;
$ const sections = getAsArray(input, "sections");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getAsArray } from "@parameter1/base-cms-object-path";
import { getAsArray } from "@mindful-web/object-path";

$ const { req, site } = out.global;
$ const { id, type, pageNode, ...rest } = input;
Expand Down
4 changes: 2 additions & 2 deletions packages/global/components/layouts/content/wrapper.marko
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import hierarchyAliases from "@parameter1/base-cms-marko-web/utils/hierarchy-aliases";
import { getAsArray, get } from "@parameter1/base-cms-object-path";
import hierarchyAliases from "@mindful-web/marko-web/utils/hierarchy-aliases";
import { getAsArray, get } from "@mindful-web/object-path";

$ const { id, type, pageNode } = input;
$ const { GAM } = out.global;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getAsArray } from "@parameter1/base-cms-object-path";
import { getAsArray } from "@mindful-web/object-path";

$ const { id, alias, name, pageNode } = input;
$ const sections = getAsArray(input, "sections");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import hierarchyAliases from "@parameter1/base-cms-marko-web/utils/hierarchy-aliases";
import { getAsArray } from "@parameter1/base-cms-object-path";
import hierarchyAliases from "@mindful-web/marko-web/utils/hierarchy-aliases";
import { getAsArray } from "@mindful-web/object-path";

$ const { id, alias, name, pageNode } = input;
$ const sections = getAsArray(input, "sections");
Expand Down
4 changes: 2 additions & 2 deletions packages/global/components/layouts/website-section/feed.marko
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import defaultValue from "@parameter1/base-cms-marko-core/utils/default-value";
import { getAsArray } from "@parameter1/base-cms-object-path";
import defaultValue from "@mindful-web/marko-core/utils/default-value";
import { getAsArray } from "@mindful-web/object-path";

$ const { id, alias, name, pageNode } = input;
$ const withNativeX = defaultValue(input.withNativeX, true);
Expand Down
4 changes: 2 additions & 2 deletions packages/global/components/layouts/website-section/home.marko
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getAsArray } from "@parameter1/base-cms-object-path";
import queryFragment from "@parameter1/base-cms-marko-web-theme-monorail/graphql/fragments/content-list";
import { getAsArray } from "@mindful-web/object-path";
import queryFragment from "@mindful-web/marko-web-theme-monorail/graphql/fragments/content-list";

$ const { id, alias, name, pageNode } = input;
$ const sections = getAsArray(input, "sections");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getAsArray } from "@parameter1/base-cms-object-path";
import { getAsArray } from "@mindful-web/object-path";
import queryFragment from '../../../graphql/fragments/content-page'

$ const { id, alias, name, pageNode } = input;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getAsArray } from "@parameter1/base-cms-object-path";
import queryFragment from "@parameter1/base-cms-marko-web-theme-monorail/graphql/fragments/content-list";
import { getAsArray } from "@mindful-web/object-path";
import queryFragment from "@mindful-web/marko-web-theme-monorail/graphql/fragments/content-list";

$ const { id, alias, name, pageNode } = input;
$ const sections = getAsArray(input, "sections");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getAsArray } from "@parameter1/base-cms-object-path";
import { getAsArray } from "@mindful-web/object-path";
$ const now = Date.now();

$ const { id, alias, name, pageNode } = input;
Expand Down
8 changes: 4 additions & 4 deletions packages/global/components/site-footer.marko
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import getNavItems from "@parameter1/base-cms-marko-web-theme-monorail/components/site-navbar/utils/get-nav-items";
import { asObject } from "@parameter1/base-cms-utils";
import { getAsObject, getAsArray } from "@parameter1/base-cms-object-path";
import defaultValue from "@parameter1/base-cms-marko-core/utils/default-value";
import getNavItems from "@mindful-web/marko-web-theme-monorail/components/site-navbar/utils/get-nav-items";
import { asObject } from "@mindful-web/utils";
import { getAsObject, getAsArray } from "@mindful-web/object-path";
import defaultValue from "@mindful-web/marko-core/utils/default-value";

$ const { config, site } = out.global;

Expand Down
2 changes: 1 addition & 1 deletion packages/global/components/site-header-2.marko
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { get, getAsArray, getAsObject } from "@parameter1/base-cms-object-path";
import { get, getAsArray, getAsObject } from "@mindful-web/object-path";

$ const { config, site } = out.global;

Expand Down
4 changes: 2 additions & 2 deletions packages/global/components/site-menu/index.marko
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { asObject } from "@parameter1/base-cms-utils";
import defaultValue from "@parameter1/base-cms-marko-core/utils/default-value";
import { asObject } from "@mindful-web/utils";
import defaultValue from "@mindful-web/marko-core/utils/default-value";

$ const blockName = input.blockName || "site-menu";

Expand Down
4 changes: 2 additions & 2 deletions packages/global/components/social-icon-link.marko
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { readFileSync } from 'fs';
import { resolve } from 'path';
import { get } from "@parameter1/base-cms-object-path";
import createClasses from "@parameter1/base-cms-marko-web-icons/utils/create-classes";
import { get } from "@mindful-web/object-path";
import createClasses from "@mindful-web/marko-web-icons/utils/create-classes";

$ const getProvider = ({ provider, label }) => {
let formatted = provider ? `${provider}`.toLowerCase() : '';
Expand Down
Loading

0 comments on commit 7bc78c7

Please sign in to comment.