Skip to content

Commit 12b640f

Browse files
authored
Merge pull request #2516 from hashicorp/alex-ju/fix-yarn-warnings
Fix incorrectly met dev dependencies
2 parents c820f88 + edd5a4a commit 12b640f

File tree

6 files changed

+59
-145
lines changed

6 files changed

+59
-145
lines changed

packages/components/package.json

+2
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
"concurrently": "^8.2.2",
8787
"ember-basic-dropdown": "^8.1.0",
8888
"ember-concurrency": "^4.0.2",
89+
"ember-source": "~5.9.0",
8990
"ember-template-lint": "^6.0.0",
9091
"ember-template-lint-plugin-prettier": "^5.0.0",
9192
"eslint": "^8.57.0",
@@ -95,6 +96,7 @@
9596
"eslint-plugin-n": "^17.7.0",
9697
"eslint-plugin-prettier": "^5.1.3",
9798
"eslint-plugin-qunit": "^8.1.1",
99+
"postcss": "^8.4.47",
98100
"prettier": "^3.3.2",
99101
"rollup": "^4.22.4",
100102
"rollup-plugin-copy": "^3.5.0",

packages/tokens/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@typescript-eslint/eslint-plugin": "^8.5.0",
3030
"@typescript-eslint/parser": "^8.5.0",
3131
"del": "^5.1.0",
32-
"eslint": "^7.32.0",
32+
"eslint": "^8.57.0",
3333
"fs-extra": "^11.1.1",
3434
"lodash": "^4.17.21",
3535
"path": "^0.12.7",

packages/tokens/scripts/build-parts/generateCssHelpers.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const PREFIX = 'hds';
1616

1717
export async function generateCssHelpers(dictionary: Dictionary, config: Platform ): Promise<void> {
1818

19-
fs.ensureDir(`${config.buildPath}/helpers/`);
19+
fs.ensureDir(`${config.buildPath}helpers/`);
2020

2121
// tried to use style-dictionary/lib/common/formatHelpers/fileHeader.js but didn't work
2222
const header = `/**\n * Do not edit directly\n * Generated on ${new Date().toUTCString()}\n */\n`;
@@ -31,24 +31,24 @@ export async function generateCssHelpers(dictionary: Dictionary, config: Platfor
3131
// so it's simpler to process all the tokens (flat structure) and filter them
3232
const helpers = generateColorHelpers(dictionary.allTokens, outputCssVars);
3333
const content = `${header}\n${helpers.join('\n')}\n`;
34-
await fs.writeFile(`${config.buildPath}/helpers/color.css`, content);
34+
await fs.writeFile(`${config.buildPath}helpers/color.css`, content);
3535
}
3636

3737
if (dictionary.tokens.typography) {
3838
const helpers = generateTypographyHelpers(dictionary.tokens.typography, outputCssVars);
3939
const content = `${header}\n${helpers.join('\n')}\n`;
40-
await fs.writeFile(`${config.buildPath}/helpers/typography.css`, content);
40+
await fs.writeFile(`${config.buildPath}helpers/typography.css`, content);
4141
}
4242

4343
if (dictionary.tokens.elevation) {
4444
const helpers = generateElevationHelpers(dictionary.tokens.elevation, dictionary.tokens.surface, outputCssVars);
4545
const content = `${header}\n${helpers.join('\n')}\n`;
46-
await fs.writeFile(`${config.buildPath}/helpers/elevation.css`, content);
46+
await fs.writeFile(`${config.buildPath}helpers/elevation.css`, content);
4747
}
4848

4949
if (dictionary.tokens['focus-ring']) {
5050
const helpers = generateFocusRingHelpers(dictionary.tokens['focus-ring'], outputCssVars);
5151
const content = `${header}\n${helpers.join('\n')}\n`;
52-
await fs.writeFile(`${config.buildPath}/helpers/focus-ring.css`, content);
52+
await fs.writeFile(`${config.buildPath}helpers/focus-ring.css`, content);
5353
}
5454
}

showcase/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
"eslint-plugin-prettier": "^5.1.3",
9898
"eslint-plugin-qunit": "^8.1.1",
9999
"loader.js": "^4.7.0",
100+
"postcss": "^8.4.47",
100101
"prettier": "^3.3.2",
101102
"prettier-plugin-ember-template-tag": "^2.0.2",
102103
"qunit": "^2.21.0",

website/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
"mdast-util-to-string": "^4.0.0",
109109
"npm-run-all": "^4.1.5",
110110
"object-hash": "^3.0.0",
111+
"postcss": "^8.4.47",
111112
"prember": "^2.0.0",
112113
"prember-middleware": "^0.1.0",
113114
"prember-sitemap-generator": "https://github.com/shipshapecode/prember-sitemap-generator.git#commit=c95f47042d86c4fa7b8b631f271da090672e13df",

0 commit comments

Comments
 (0)