Skip to content

Commit 00f63af

Browse files
castastrophecastastrophe
committed
chore: update circle ci config
1 parent 8ff5d1f commit 00f63af

File tree

13 files changed

+115
-61
lines changed

13 files changed

+115
-61
lines changed

‎.circleci/config.yml

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ commands:
2222
downstream:
2323
steps:
2424
- checkout
25-
# - restore_cache:
26-
# keys:
27-
# - v4c-dependencies-{{ arch }}-{{ checksum "yarn.lock" }}
28-
# - restore_cache:
29-
# keys:
30-
# - v4b-<< pipeline.parameters.wireit_cache_name >>-{{ arch }}-{{ checksum "package.json" }}-
25+
- restore_cache:
26+
keys:
27+
- v4c-dependencies-{{ arch }}-{{ checksum "yarn.lock" }}
28+
- restore_cache:
29+
keys:
30+
- v4b-<< pipeline.parameters.wireit_cache_name >>-{{ arch }}-{{ checksum "package.json" }}-
3131
- run:
32-
name: Installing Dependencies
32+
name: Installing dependencies
3333
command: |
3434
corepack enable
3535
yarn --immutable
@@ -225,18 +225,9 @@ jobs:
225225
executor: node
226226
steps:
227227
- downstream
228-
- run:
229-
name: Generate Custom Elements Manifest
230-
command: yarn analyze:docs
231-
- run:
232-
name: Move CEM to Storybook directory
233-
command: cp projects/documentation/custom-elements.json storybook/
234228
- run:
235229
name: Build documentation
236-
command: yarn docs:build
237-
- run:
238-
name: Build Storybook
239-
command: yarn storybook:build
230+
command: yarn docs:preview
240231
- run: echo '/* /index.html 200' > projects/documentation/dist/_redirects
241232
- run: |
242233
branch=$(git symbolic-ref --short HEAD)
@@ -248,18 +239,9 @@ jobs:
248239

249240
steps:
250241
- downstream
251-
- run:
252-
name: Generate Custom Elements Manifest
253-
command: yarn analyze:docs
254-
- run:
255-
name: Move CEM to Storybook directory
256-
command: cp projects/documentation/custom-elements.json storybook/
257242
- run:
258243
name: Build documentation
259-
command: yarn docs:build
260-
- run:
261-
name: Build Storybook
262-
command: yarn storybook:build
244+
command: yarn docs:ci
263245
- run: echo '/* /index.html 200' > projects/documentation/dist/_redirects
264246
- run: |
265247
branch=$(git symbolic-ref --short HEAD)
@@ -372,7 +354,6 @@ jobs:
372354
regression_dir: << parameters.dir >>
373355

374356
workflows:
375-
version: 2
376357
commitlint:
377358
jobs:
378359
- commitlint

‎.eslintrc.cjs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
/* eslint-disable @typescript-eslint/no-var-requires */
2+
/*
3+
Copyright 2025 Adobe. All rights reserved.
4+
This file is licensed to you under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License. You may obtain a copy
6+
of the License at http://www.apache.org/licenses/LICENSE-2.0
7+
8+
Unless required by applicable law or agreed to in writing, software distributed under
9+
the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
10+
OF ANY KIND, either express or implied. See the License for the specific language
11+
governing permissions and limitations under the License.
12+
*/
13+
114
const path = require('path');
215

316
module.exports = {
@@ -81,7 +94,7 @@ module.exports = {
8194
],
8295
overrides: [
8396
{
84-
files: ['tasks/*', 'scripts/*'],
97+
files: ['scripts/*'],
8598
rules: {
8699
'no-console': ['off'],
87100
},

‎package.json

Lines changed: 57 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@
4747
"prepack": "pinst --disable",
4848
"prepublishOnly": "rimraf react && yarn build",
4949
"pretest:bench": "yarn build:tests && test -f test/benchmark/cli.js ||:",
50-
"publish": "yarn prepublishOnly && yarn changeset version && yarn lint:versions --fix && yarn install && git add . && yarn changeset publish && git push -f --follow-tags && yarn publish:react",
51-
"publish:react": "yarn publish:react:build && yarn publish:react:tag && yarn publish:react:clean",
52-
"publish:react:build": "yarn build:react && sed -i \"\" \"s/react/# react/g\" .gitignore && git commit -am \"chore: commit React watch\" --no-verify",
53-
"publish:react:clean": "git reset --hard HEAD^ && git prune && rimraf react",
54-
"publish:react:tag": "yarn changeset publish --no-git-tag --tag latest --no-push",
50+
"publish": "wireit",
5551
"publish:snapshot": "yarn prepublishOnly && yarn changeset version --snapshot latest && genversion --esm --semi tools/base/src/version.js && yarn lint:versions --fix && yarn install && git add . && yarn changeset publish --no-git-tag --tag snapshot",
5652
"start": "yarn storybook",
5753
"storybook": "wireit",
@@ -206,6 +202,7 @@
206202
],
207203
"wireit": {
208204
"build": {
205+
"command": "yarn lint:ts --fix",
209206
"dependencies": [
210207
"build:icons",
211208
"build:ts",
@@ -214,6 +211,9 @@
214211
]
215212
},
216213
"build:cem": {
214+
"dependencies": [
215+
"build:icons"
216+
],
217217
"command": "yarn workspaces foreach --all --parallel --no-private --verbose run analyze",
218218
"files": [
219219
"packages/**/*.ts",
@@ -274,16 +274,9 @@
274274
"tools/**/*.css.ts"
275275
]
276276
},
277-
"build:icons": {
278-
"dependencies": [
279-
"build:icons:scales",
280-
"build:icons:ui",
281-
"build:icons:workflow"
282-
]
283-
},
284277
"build:react": {
285278
"clean": "if-file-deleted",
286-
"command": "node ./scripts/build-react.js && tsc --build tsconfig-react-wrapper.json",
279+
"command": "rimraf react && node ./scripts/build-react.js && tsc --build tsconfig-react-wrapper.json",
287280
"files": [
288281
"packages/react/src/**/*.ts",
289282
"packages/react/src/**/*.js",
@@ -409,6 +402,14 @@
409402
],
410403
"outputs": []
411404
},
405+
"build:icons": {
406+
"command": "eslint -f pretty \"packages/icons*/src/*/*.ts\" --fix",
407+
"dependencies": [
408+
"build:icons:scales",
409+
"build:icons:ui",
410+
"build:icons:workflow"
411+
]
412+
},
412413
"build:icons:scales": {
413414
"clean": "if-file-deleted",
414415
"command": "yarn workspace @spectrum-web-components/icons build",
@@ -490,6 +491,49 @@
490491
"tools/*/test/*.test-vrt.ts"
491492
]
492493
},
494+
"publish": {
495+
"dependencies": [
496+
"build",
497+
"version",
498+
"publish:tags",
499+
"publish:react"
500+
]
501+
},
502+
"version": {
503+
"dependencies": [
504+
"build"
505+
],
506+
"command": "yarn changeset version && yarn lint:versions --fix && yarn install && git add ."
507+
},
508+
"publish:tags": {
509+
"dependencies": [
510+
"build",
511+
"version"
512+
],
513+
"command": "yarn changeset publish && git push -f --follow-tags"
514+
},
515+
"publish:react": {
516+
"command": "git reset --hard HEAD^ && git prune && rimraf react",
517+
"dependencies": [
518+
"build",
519+
"version",
520+
"publish:tags",
521+
"publish:react:build",
522+
"publish:react:tag"
523+
]
524+
},
525+
"publish:react:build": {
526+
"dependencies": [
527+
"build:react"
528+
],
529+
"command": "sed -i \"\" \"s/react/# react/g\" .gitignore && git commit -am \"chore: commit React watch\" --no-verify"
530+
},
531+
"publish:react:tag": {
532+
"dependencies": [
533+
"publish:react:build"
534+
],
535+
"command": "yarn changeset publish --no-git-tag --tag latest --no-push"
536+
},
493537
"watch": {
494538
"dependencies": [
495539
"watch:css",

‎packages/icons-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"cheerio": "^1.0.0",
6363
"eslint": "^8.23.0",
6464
"fast-glob": "^3.2.12",
65-
"prettier": "^3.0.0"
65+
"prettier": "^3.5.3"
6666
},
6767
"types": "./src/index.d.ts",
6868
"customElements": "custom-elements.json",

‎packages/icons-workflow/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"case": "^1.6.3",
6262
"cheerio": "^1.0.0",
6363
"fast-glob": "^3.2.12",
64-
"prettier": "^3.0.0"
64+
"prettier": "^3.5.3"
6565
},
6666
"types": "./src/index.d.ts",
6767
"customElements": "custom-elements.json",

0 commit comments

Comments
 (0)