@knapsack/design-token-utils 4.67.0--canary.5f03d3b.0 → 4.67.0--canary.4437.7395813.0
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +84 -0
- package/dist/collections/token-collection-utils.d.ts.map +1 -1
- package/dist/collections/token-collection-utils.js +7 -4
- package/dist/collections/token-collection-utils.js.map +1 -1
- package/dist/converters/ks-figma-vars-to-spec/ks-figma-vars-to-spec.d.ts +3 -0
- package/dist/converters/ks-figma-vars-to-spec/ks-figma-vars-to-spec.d.ts.map +1 -1
- package/dist/converters/ks-figma-vars-to-spec/ks-figma-vars-to-spec.js +58 -18
- package/dist/converters/ks-figma-vars-to-spec/ks-figma-vars-to-spec.js.map +1 -1
- package/package.json +9 -9
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,87 @@
|
|
|
1
|
+
# v4.66.11 (Tue Jul 30 2024)
|
|
2
|
+
|
|
3
|
+
#### 🐛 Bug Fix
|
|
4
|
+
|
|
5
|
+
- Merge branch 'latest' into feature/ksp-5310-angular-improvements-redux ([@mabry1985](https://github.com/mabry1985))
|
|
6
|
+
|
|
7
|
+
#### Authors: 1
|
|
8
|
+
|
|
9
|
+
- Josh Mabry ([@mabry1985](https://github.com/mabry1985))
|
|
10
|
+
|
|
11
|
+
---
|
|
12
|
+
|
|
13
|
+
# v4.66.8 (Fri Jul 26 2024)
|
|
14
|
+
|
|
15
|
+
#### 🏠 Internal
|
|
16
|
+
|
|
17
|
+
- be sure to replace all Figma / with . in tokens [#4385](https://github.com/knapsack-labs/app-monorepo/pull/4385) ([@EvanLovely](https://github.com/EvanLovely))
|
|
18
|
+
|
|
19
|
+
#### Authors: 1
|
|
20
|
+
|
|
21
|
+
- Evan Lovely ([@EvanLovely](https://github.com/EvanLovely))
|
|
22
|
+
|
|
23
|
+
---
|
|
24
|
+
|
|
25
|
+
# v4.66.7 (Tue Jul 23 2024)
|
|
26
|
+
|
|
27
|
+
#### 🐛 Bug Fix
|
|
28
|
+
|
|
29
|
+
- fix page content not saving when there are duplicate IDs [#4381](https://github.com/knapsack-labs/app-monorepo/pull/4381) ([@EvanLovely](https://github.com/EvanLovely))
|
|
30
|
+
|
|
31
|
+
#### Authors: 1
|
|
32
|
+
|
|
33
|
+
- Evan Lovely ([@EvanLovely](https://github.com/EvanLovely))
|
|
34
|
+
|
|
35
|
+
---
|
|
36
|
+
|
|
37
|
+
# v4.66.6 (Mon Jul 22 2024)
|
|
38
|
+
|
|
39
|
+
#### 🐛 Bug Fix
|
|
40
|
+
|
|
41
|
+
- fix triple dashes on var ref css vars [#4377](https://github.com/knapsack-labs/app-monorepo/pull/4377) ([@GormanDesign](https://github.com/GormanDesign))
|
|
42
|
+
- fix triple dashes on var ref css vars ([@GormanDesign](https://github.com/GormanDesign))
|
|
43
|
+
- Merge branch 'latest' into feature/async-loading-buttons ([@GormanDesign](https://github.com/GormanDesign))
|
|
44
|
+
|
|
45
|
+
#### Authors: 1
|
|
46
|
+
|
|
47
|
+
- Matt Gorman ([@GormanDesign](https://github.com/GormanDesign))
|
|
48
|
+
|
|
49
|
+
---
|
|
50
|
+
|
|
51
|
+
# v4.66.5 (Fri Jul 19 2024)
|
|
52
|
+
|
|
53
|
+
#### 🐛 Bug Fix
|
|
54
|
+
|
|
55
|
+
- KSP-5287: CSS output with var references properly reference [#4376](https://github.com/knapsack-labs/app-monorepo/pull/4376) ([@illepic](https://github.com/illepic))
|
|
56
|
+
|
|
57
|
+
#### 🏠 Internal
|
|
58
|
+
|
|
59
|
+
- update token import replace existing language [#4375](https://github.com/knapsack-labs/app-monorepo/pull/4375) ([@GormanDesign](https://github.com/GormanDesign))
|
|
60
|
+
|
|
61
|
+
#### Authors: 2
|
|
62
|
+
|
|
63
|
+
- Christopher Bloom ([@illepic](https://github.com/illepic))
|
|
64
|
+
- Matt Gorman ([@GormanDesign](https://github.com/GormanDesign))
|
|
65
|
+
|
|
66
|
+
---
|
|
67
|
+
|
|
68
|
+
# v4.66.4 (Fri Jul 19 2024)
|
|
69
|
+
|
|
70
|
+
#### 🐛 Bug Fix
|
|
71
|
+
|
|
72
|
+
- KSP-5283: token var refs point to correct token. Figma Var imports merge correctly without deepMerge. [#4370](https://github.com/knapsack-labs/app-monorepo/pull/4370) ([@illepic](https://github.com/illepic))
|
|
73
|
+
|
|
74
|
+
#### 🏠 Internal
|
|
75
|
+
|
|
76
|
+
- update ReactMarkdown to latest version [#4369](https://github.com/knapsack-labs/app-monorepo/pull/4369) ([@GormanDesign](https://github.com/GormanDesign))
|
|
77
|
+
|
|
78
|
+
#### Authors: 2
|
|
79
|
+
|
|
80
|
+
- Christopher Bloom ([@illepic](https://github.com/illepic))
|
|
81
|
+
- Matt Gorman ([@GormanDesign](https://github.com/GormanDesign))
|
|
82
|
+
|
|
83
|
+
---
|
|
84
|
+
|
|
1
85
|
# v4.66.3 (Fri Jul 19 2024)
|
|
2
86
|
|
|
3
87
|
#### 🐛 Bug Fix
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-collection-utils.d.ts","sourceRoot":"","sources":["../../src/collections/token-collection-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,+CAA+C,CAAC;AAMtF,wBAAgB,yBAAyB,CAAC,EACxC,UAAU,EACV,MAAM,GACP,EAAE;IACD,UAAU,EAAE,mBAAmB,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;CAChB,UAEA;AAED,wBAAgB,qBAAqB,CAAC,EACpC,YAAY,EACZ,SAAS,EAAE,EAAE,eAAe,EAAE,EAC9B,QAAQ,GACT,EAAE;IACD,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"token-collection-utils.d.ts","sourceRoot":"","sources":["../../src/collections/token-collection-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,+CAA+C,CAAC;AAMtF,wBAAgB,yBAAyB,CAAC,EACxC,UAAU,EACV,MAAM,GACP,EAAE;IACD,UAAU,EAAE,mBAAmB,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;CAChB,UAEA;AAED,wBAAgB,qBAAqB,CAAC,EACpC,YAAY,EACZ,SAAS,EAAE,EAAE,eAAe,EAAE,EAC9B,QAAQ,GACT,EAAE;IACD,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GAAG,MAAM,CAuCT;AAED,wBAAgB,sBAAsB,CAAC,EACrC,SAAS,EACT,QAAQ,GACT,EAAE;IACD,SAAS,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GAAG,MAAM,CAYT;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEvE"}
|
|
@@ -20,11 +20,14 @@ export function getTokenCollectionCss({ collectionId, tokenData: { collectionsBy
|
|
|
20
20
|
return [];
|
|
21
21
|
const { value } = varInMode;
|
|
22
22
|
const { type } = value;
|
|
23
|
-
// var-refs are *groups
|
|
23
|
+
// var-refs are *groups*. Need to remove collection and root and collection
|
|
24
|
+
// id from value
|
|
24
25
|
if (type === 'var-ref') {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
// Start with the full var value, e.g. `collections.theme.brand.color`
|
|
27
|
+
// then remove just the collection root key + collection id + dot from the string
|
|
28
|
+
// e.g. `collections.theme.` -> `brand.color`
|
|
29
|
+
const refValue = value.groupId.replace(`${collection.groupId}.`, '');
|
|
30
|
+
return [` ${cssVarName(varData.id)}: var(${cssVarName(refValue)});`];
|
|
28
31
|
}
|
|
29
32
|
// Return CSS for actual vars
|
|
30
33
|
return [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-collection-utils.js","sourceRoot":"","sources":["../../src/collections/token-collection-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EACL,UAAU,EACV,qBAAqB,GACtB,MAAM,6CAA6C,CAAC;AAErD,MAAM,UAAU,yBAAyB,CAAC,EACxC,UAAU,EACV,MAAM,GAIP;IACC,OAAO,QAAQ,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,MAAM,GAAG,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,EACpC,YAAY,EACZ,SAAS,EAAE,EAAE,eAAe,EAAE,EAC9B,QAAQ,GAKT;IACC,MAAM,UAAU,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;IACjD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,gCAAgC,YAAY,EAAE,CAAC,CAAC;IAClE,CAAC;IACD,MAAM,KAAK,GAAa,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAY,EAAE;QACrE,OAAO;YACL,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;YACvB,IAAI,yBAAyB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,KAAK;YACnE,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAY,EAAE;gBAC/C,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC7C,IAAI,CAAC,SAAS;oBAAE,OAAO,EAAE,CAAC;gBAC1B,IAAI,SAAS,CAAC,IAAI,KAAK,MAAM;oBAAE,OAAO,EAAE,CAAC;gBAEzC,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;gBAC5B,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;gBAEvB,
|
|
1
|
+
{"version":3,"file":"token-collection-utils.js","sourceRoot":"","sources":["../../src/collections/token-collection-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,9 @@ import { TokenSrcGroup } from '@knapsack/types';
|
|
|
2
2
|
import { KsFigmaVarsFormat } from '../../formats/ks-figma-vars/ks-figma-vars.format.js';
|
|
3
3
|
import { ConverterGenericWarning } from '../../types.js';
|
|
4
4
|
import { TokenDataSummary } from '../spec-src-to-token-data/convert-src-to-token-data.js';
|
|
5
|
+
/**
|
|
6
|
+
* ATTENTION: this is a WIP; assume nothing, question everything
|
|
7
|
+
*/
|
|
5
8
|
export declare function convertKsFigmaVarsToSpec({ ksFigmaVars, currentTokensSrc, }: {
|
|
6
9
|
ksFigmaVars: KsFigmaVarsFormat;
|
|
7
10
|
currentTokensSrc: TokenSrcGroup;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ks-figma-vars-to-spec.d.ts","sourceRoot":"","sources":["../../../src/converters/ks-figma-vars-to-spec/ks-figma-vars-to-spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ks-figma-vars-to-spec.d.ts","sourceRoot":"","sources":["../../../src/converters/ks-figma-vars-to-spec/ks-figma-vars-to-spec.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAgC,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EACL,iBAAiB,EAMlB,MAAM,qDAAqD,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wDAAwD,CAAC;AA2E1F;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,WAAW,EACX,gBAAgB,GACjB,EAAE;IACD,WAAW,EAAE,iBAAiB,CAAC;IAC/B,gBAAgB,EAAE,aAAa,CAAC;CACjC,GAAG;IACF,QAAQ,EAAE,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACzC,GAAG,EAAE,aAAa,CAAC;IACnB,IAAI,EAAE,gBAAgB,CAAC;CACxB,CA6HA"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import loGet from 'lodash/get.js';
|
|
1
2
|
import { isKsFigmaVarValueRgb, isKsFigmaVarValueAlias, } from '../../formats/ks-figma-vars/ks-figma-vars.format.js';
|
|
2
3
|
import { TokenSrcUpdater } from '../../token-src-updater/token-src-updater.js';
|
|
3
4
|
import { convertFigmaColorToHex } from './utils.js';
|
|
@@ -65,24 +66,42 @@ function createTokenSrcValueInfo({ value, varType, }) {
|
|
|
65
66
|
}
|
|
66
67
|
}
|
|
67
68
|
}
|
|
69
|
+
/**
|
|
70
|
+
* ATTENTION: this is a WIP; assume nothing, question everything
|
|
71
|
+
*/
|
|
68
72
|
export function convertKsFigmaVarsToSpec({ ksFigmaVars, currentTokensSrc, }) {
|
|
69
|
-
// ATTENTION: this is a WIP; assume nothing, question everything
|
|
70
73
|
const warnings = [];
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
}
|
|
74
|
-
const { collectionsById, tokensById } = tsu.data;
|
|
74
|
+
// Tokens already in src
|
|
75
|
+
const tsu = new TokenSrcUpdater({ src: currentTokensSrc });
|
|
76
|
+
const { collectionsById, tokensById, tokens } = tsu.data;
|
|
75
77
|
if (!tsu.collectionsParentKey) {
|
|
76
78
|
tsu.setCollectionsParentKey({ collectionsParentKey: 'collections' });
|
|
77
79
|
}
|
|
78
80
|
const modesById = {};
|
|
81
|
+
// Start by creating empty collections and modes by looping over INCOMING collections
|
|
79
82
|
Object.values(ksFigmaVars.collectionsById).forEach(({ id, name, modes, variableIds }) => {
|
|
80
|
-
if (
|
|
81
|
-
|
|
83
|
+
if (collectionsById[name]) {
|
|
84
|
+
console.log('Collection already exists, no need to create:', name);
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
tsu.collection.create({
|
|
88
|
+
collectionId: name,
|
|
89
|
+
// Important that we do NOT create the default `mode 1` starter mode here
|
|
90
|
+
excludeInitialMode: true,
|
|
91
|
+
});
|
|
82
92
|
}
|
|
83
|
-
modes
|
|
84
|
-
|
|
85
|
-
|
|
93
|
+
// Do not create modes that already exist
|
|
94
|
+
modes.forEach((incomingMode) => {
|
|
95
|
+
var _a;
|
|
96
|
+
// Check if mode already exists
|
|
97
|
+
if ((_a = collectionsById[name]) === null || _a === void 0 ? void 0 : _a.modes.find((existingMode) => existingMode.id === incomingMode.name)) {
|
|
98
|
+
console.log('Mode already exists, no need to create:', incomingMode.name);
|
|
99
|
+
// Don't create mode if it already exists
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
// Otherwise create mode
|
|
103
|
+
modesById[incomingMode.modeId] = incomingMode.name;
|
|
104
|
+
tsu.mode.create({ modeId: incomingMode.name, collectionId: name });
|
|
86
105
|
});
|
|
87
106
|
});
|
|
88
107
|
Object.values(ksFigmaVars.collectionsById).forEach(({ variableIds }) => {
|
|
@@ -90,18 +109,38 @@ export function convertKsFigmaVarsToSpec({ ksFigmaVars, currentTokensSrc, }) {
|
|
|
90
109
|
.map((vId) => ksFigmaVars.variablesById[vId])
|
|
91
110
|
.forEach(({ collectionId, name, type: varType, valuesByMode }) => {
|
|
92
111
|
const { name: collectionName } = ksFigmaVars.collectionsById[collectionId];
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
112
|
+
// Figma treats '/' as a group separator
|
|
113
|
+
const varId = name.replace(/\//g, '.');
|
|
114
|
+
// Note, this does not indicate values for modes
|
|
115
|
+
const fullVarPath = `${tsu.collectionsParentKey}.${collectionName}.${varId}`;
|
|
116
|
+
console.log('DEBUG varId:', fullVarPath);
|
|
117
|
+
// 2024/07/18: tokensById does not appear to contain Tokens that are refs
|
|
118
|
+
// const varExists = Object.keys(tokensById).some((key) =>
|
|
119
|
+
// key.startsWith(fullVarPath),
|
|
120
|
+
// );
|
|
121
|
+
// Instead, fall back to loGet against src
|
|
122
|
+
const varExists = loGet(currentTokensSrc, fullVarPath);
|
|
123
|
+
if (varExists) {
|
|
124
|
+
console.log('Var already exists, no need to create:', fullVarPath);
|
|
125
|
+
}
|
|
126
|
+
else {
|
|
127
|
+
// Avoid creating var if it already exists
|
|
128
|
+
tsu.var.create({
|
|
129
|
+
collectionId: collectionName,
|
|
130
|
+
varId,
|
|
131
|
+
varType: mapFigmaVarType(varType),
|
|
132
|
+
});
|
|
133
|
+
}
|
|
99
134
|
Object.entries(valuesByMode).forEach(([modeId, value]) => {
|
|
135
|
+
// VAR ALIAS
|
|
100
136
|
if (isKsFigmaVarValueAlias(value)) {
|
|
101
137
|
const figmaVar = ksFigmaVars.variablesById[value.id];
|
|
102
138
|
if (!figmaVar) {
|
|
103
139
|
throw new Error(`Var ${name} has a reference, "${value.id}", that cannot be found`);
|
|
104
140
|
}
|
|
141
|
+
// Using the target Figma Var, get the Collection ID it belongs to,
|
|
142
|
+
// and use to look up that Collection's name
|
|
143
|
+
const targetCollectionName = ksFigmaVars.collectionsById[figmaVar.collectionId].name;
|
|
105
144
|
tsu.var.setModeValue({
|
|
106
145
|
collectionId: collectionName,
|
|
107
146
|
varId,
|
|
@@ -113,13 +152,14 @@ export function convertKsFigmaVarsToSpec({ ksFigmaVars, currentTokensSrc, }) {
|
|
|
113
152
|
isVarRef: true,
|
|
114
153
|
referencedTokenId: [
|
|
115
154
|
tsu.collectionsParentKey,
|
|
116
|
-
|
|
117
|
-
figmaVar.name.replace(
|
|
155
|
+
targetCollectionName,
|
|
156
|
+
figmaVar.name.replace(/\//g, '.'),
|
|
118
157
|
].join('.'),
|
|
119
158
|
},
|
|
120
159
|
});
|
|
121
160
|
return;
|
|
122
161
|
}
|
|
162
|
+
// ALL OTHER VAR TYPES
|
|
123
163
|
tsu.var.setModeValue({
|
|
124
164
|
collectionId: collectionName,
|
|
125
165
|
varId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ks-figma-vars-to-spec.js","sourceRoot":"","sources":["../../../src/converters/ks-figma-vars-to-spec/ks-figma-vars-to-spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ks-figma-vars-to-spec.js","sourceRoot":"","sources":["../../../src/converters/ks-figma-vars-to-spec/ks-figma-vars-to-spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@knapsack/design-token-utils",
|
|
3
3
|
"description": "",
|
|
4
|
-
"version": "4.67.0--canary.
|
|
4
|
+
"version": "4.67.0--canary.4437.7395813.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
7
7
|
".": {
|
|
@@ -26,19 +26,19 @@
|
|
|
26
26
|
"test": "time npm run ava"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@knapsack/color-utils": "4.67.0--canary.
|
|
30
|
-
"@knapsack/file-utils": "4.67.0--canary.
|
|
31
|
-
"@knapsack/types": "4.67.0--canary.
|
|
32
|
-
"@knapsack/utils": "4.67.0--canary.
|
|
29
|
+
"@knapsack/color-utils": "4.67.0--canary.4437.7395813.0",
|
|
30
|
+
"@knapsack/file-utils": "4.67.0--canary.4437.7395813.0",
|
|
31
|
+
"@knapsack/types": "4.67.0--canary.4437.7395813.0",
|
|
32
|
+
"@knapsack/utils": "4.67.0--canary.4437.7395813.0",
|
|
33
33
|
"flat": "^5.0.2",
|
|
34
34
|
"immer": "^10.0.4",
|
|
35
35
|
"lodash": "^4.17.21",
|
|
36
36
|
"superstruct": "^0.16.7"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
|
-
"@knapsack/eslint-config-starter": "4.67.0--canary.
|
|
40
|
-
"@knapsack/test-ava": "4.67.0--canary.
|
|
41
|
-
"@knapsack/typescript-config-starter": "4.67.0--canary.
|
|
39
|
+
"@knapsack/eslint-config-starter": "4.67.0--canary.4437.7395813.0",
|
|
40
|
+
"@knapsack/test-ava": "4.67.0--canary.4437.7395813.0",
|
|
41
|
+
"@knapsack/typescript-config-starter": "4.67.0--canary.4437.7395813.0",
|
|
42
42
|
"@microsoft/api-extractor": "^7.43.8",
|
|
43
43
|
"@types/flat": "^5.0.5",
|
|
44
44
|
"@types/fs-extra": "^11.0.4",
|
|
@@ -63,5 +63,5 @@
|
|
|
63
63
|
"directory": "libs/design-token-utils",
|
|
64
64
|
"type": "git"
|
|
65
65
|
},
|
|
66
|
-
"gitHead": "
|
|
66
|
+
"gitHead": "73958133918228c65bb700a21a69090764b2fe19"
|
|
67
67
|
}
|