merge master

.gitignore

@@ -51,4 +51,5 @@ src/**/styles/themes/*
 src/**/package-lock\.json
 unmigrated/
 
+## Dev output for hosting
 pages

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rei/cedar",
-  "version": "15.2.0",
+  "version": "15.2.1",
   "description": "REI Cedar Component Library",
   "homepage": "https://rei.github.io/rei-cedar/",
   "license": "MIT",
@@ -13,12 +13,12 @@
   },
   "author": "REI Software Engineering",
   "main": "./dist/cedar.umd.js",
-  "module": "./dist/src/lib.mjs",
+  "module": "./dist/lib.mjs",
   "types": "./dist/lib.d.ts",
   "exports": {
     ".": {
       "types": "./dist/lib.d.ts",
-      "import": "./dist/src/lib.mjs",
+      "import": "./dist/lib.mjs",
       "require": "./dist/cedar.umd.js"
     },
     "./dist/": "./dist/"
@@ -59,7 +59,6 @@
   "devDependencies": {
     "@babel/preset-env": "^7.18.2",
     "@emotion/is-prop-valid": "^1.2.1",
-    "@rei/cdr-tokens": "^12.4.0",
     "@rei/cedar-icons": "^2.6.1",
     "@rollup/plugin-babel": "^6.0.3",
     "@types/tabbable": "^3.1.2",
@@ -128,6 +127,7 @@
     }
   },
   "dependencies": {
+    "@rei/cdr-tokens": "^12.4.2",
     "tabbable": "^4.0.0"
   },
   "peerDependencies": {

rollupOptions.mjs

@@ -3,9 +3,10 @@ import browserTargets from './browserTargets.mjs';
 
 export default {
   // Externalize peerDependencies
-  external: (id) => ['vue', 'core-js', 'tabbable'].some(
-    (dep) => dep === id || id.startsWith(`${dep}/`),
-  ),
+  external: (id) =>
+    ['vue', 'core-js', '@rei/cdr-tokens', 'tabbable'].some(
+      (dep) => dep === id || id.startsWith(`${dep}/`),
+    ),
   output: {
     globals: {
       vue: 'Vue',

src/components/modal/CdrModal.vue

@@ -15,7 +15,7 @@ import {
   CdrBreakpointSm,
   CdrSpaceOneX,
   CdrSpaceTwoX,
-} from '@rei/cdr-tokens/dist/rei-dot-com/js/cdr-tokens.mjs';
+} from '@rei/cdr-tokens';
 import onTransitionEnd from './onTransitionEnd';
 import CdrButton from '../button/CdrButton.vue';
 import IconXLg from '../icon/comps/x-lg.vue';

src/components/tabs/CdrTabs.vue

@@ -6,7 +6,7 @@ import type { ComponentInternalInstance } from 'vue';
 import { debounce } from '../../utils/debounce'
 import {
   CdrColorBackgroundPrimary, CdrSpaceOneX, CdrSpaceHalfX,
-} from '@rei/cdr-tokens/dist/rei-dot-com/js/cdr-tokens.mjs';
+} from '@rei/cdr-tokens';
 import mapClasses from '../../utils/mapClasses';
 import { modifyClassName } from '../../utils/buildClass';
 import { selectedTabKey } from '../../types/symbols';

src/mixins/breakpoints.ts

@@ -2,7 +2,7 @@ import {
   CdrBreakpointSm,
   CdrBreakpointMd,
   CdrBreakpointLg,
-} from '@rei/cdr-tokens/dist/rei-dot-com/js/cdr-tokens.mjs';
+} from '@rei/cdr-tokens';
 
 export default function getCurrentBreakpoint() {
   const screenWidth = (window && window.innerWidth) || 0;