Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mark @rei/cdr-tokens as external #188

Merged
merged 4 commits into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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/"
Expand Down Expand Up @@ -58,7 +58,6 @@
"devDependencies": {
"@babel/preset-env": "^7.18.2",
"@emotion/is-prop-valid": "^1.2.1",
"@rei/cdr-tokens": "^12.3.0",
"@rei/cedar-icons": "^2.6.1",
"@rollup/plugin-babel": "^6.0.3",
"@types/tabbable": "^3.1.2",
Expand Down Expand Up @@ -127,6 +126,7 @@
}
},
"dependencies": {
"@rei/cdr-tokens": "^12.3.0",
"tabbable": "^4.0.0"
},
"peerDependencies": {
Expand Down
7 changes: 4 additions & 3 deletions rollupOptions.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/components/modal/CdrModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/components/tabs/CdrTabs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/mixins/breakpoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading