From 37bcfe06aa3f0a6eec13226ddb1f36b6a69fe3f2 Mon Sep 17 00:00:00 2001 From: "[ Cassondra ]" Date: Wed, 25 Jan 2023 14:55:40 -0500 Subject: [PATCH] chore: remove dupe build run during release (#1596) --- components/switch/package.json | 6 +++--- components/textfield/index.css | 1 + components/tokens/package.json | 5 ++++- components/vars/package.json | 1 + lerna.json | 1 + package.json | 13 ++++++------- tools/component-builder-simple/css/index.js | 11 ++++++++++- tools/component-builder/css/lib/varUtils.js | 8 ++++++-- yarn.lock | 5 ----- 9 files changed, 32 insertions(+), 19 deletions(-) diff --git a/components/switch/package.json b/components/switch/package.json index 5cef271843..e1b76af835 100644 --- a/components/switch/package.json +++ b/components/switch/package.json @@ -17,14 +17,14 @@ "build": "gulp" }, "peerDependencies": { - "@spectrum-css/tokens": "^1.0.7" + "@spectrum-css/tokens": "^6.2.2" }, "devDependencies": { "@spectrum-css/component-builder-simple": "^2.0.2", - "@spectrum-css/tokens": "^1.0.7", + "@spectrum-css/tokens": "^6.2.2", "gulp": "^4.0.0" }, "publishConfig": { "access": "public" } -} \ No newline at end of file +} diff --git a/components/textfield/index.css b/components/textfield/index.css index 75e3d99c51..b3fbec1813 100644 --- a/components/textfield/index.css +++ b/components/textfield/index.css @@ -49,6 +49,7 @@ governing permissions and limitations under the License. /* hack: define var so it's not reported as undefined */ .🤫 { --spectrum-textfield-icon-inline-end-override: 0; + --spectrum-textfield-texticon-padding-left: 0; } .spectrum-Textfield { diff --git a/components/tokens/package.json b/components/tokens/package.json index 018e64dd04..5761313c60 100644 --- a/components/tokens/package.json +++ b/components/tokens/package.json @@ -14,12 +14,15 @@ }, "main": "dist/index.css", "scripts": { - "build": "gulp build" + "prebuild": "rimraf dist/*", + "build": "style-dictionary build", + "postbuild": "gulp rebuildCustoms" }, "devDependencies": { "@adobe/spectrum-tokens": "12.0.0-beta.63", "gulp": "^4.0.0", "gulp-concat": "^2.6.1", + "rimraf": "^4.1.1", "style-dictionary": "^3.7.0", "style-dictionary-sets": "^2.0.2" }, diff --git a/components/vars/package.json b/components/vars/package.json index 3eefbc4281..079ad6c080 100644 --- a/components/vars/package.json +++ b/components/vars/package.json @@ -14,6 +14,7 @@ }, "main": "dist/spectrum-metadata.json", "scripts": { + "build": "gulp build", "update": "gulp update" }, "devDependencies": { diff --git a/lerna.json b/lerna.json index 13395844bf..3f844f1450 100644 --- a/lerna.json +++ b/lerna.json @@ -2,6 +2,7 @@ "version": "independent", "npmClient": "yarn", "useWorkspaces": true, + "noPrivate": true, "command": { "publish": { "conventionalCommits": true, diff --git a/package.json b/package.json index bc8e66db69..68ed588ee0 100644 --- a/package.json +++ b/package.json @@ -31,10 +31,11 @@ "backstop:test-all": "backstop test --docker --config=backstop_data/backstop_test.js --env=local themes=light,dark,darkest scales=medium,large", "build": "run-s build:site build:preview # preview cannot be built until the component assets are finished", "build:clean": "run-s clean build", - "build:components": "gulp buildComponents -LLL ", + "build:components": "lerna run --stream --scope \"@spectrum-css/*\" --ignore \"@spectrum-css/{*-builder*,preview,generator,site}\" build", "build:preview": "yarn workspace @spectrum-css/preview build", "postbuild:preview": "rimraf dist/preview && mv tools/preview/storybook-static dist/preview", "build:site": "gulp -LL", + "check:peerDeps": "gulp checkPeerDependencies # validate peer deps for components; escapes before running lerna if they are not valid", "ci-all": "yarn build", "clean": "gulp clean", "dev": "NODE_ENV=development BROWSERSYNC_OPEN=true gulp dev", @@ -42,15 +43,13 @@ "new": "yarn workspace @spectrum-css/generator new", "precommit": "lint-staged", "prepare": "husky install && gulp prepare", - "prerelease": "yarn build:clean", - "release": "lerna publish --no-private", - "prerelease:beta-from-package": "yarn build:clean", - "release:beta-from-package": "lerna publish from-package --conventional-prerelease --preid beta --pre-dist-tag beta --no-private", + "prerelease": "run-s check:peerDeps version:build", + "release": "lerna publish", + "release:beta-from-package": "yarn release from-package --conventional-prerelease --preid beta --pre-dist-tag beta --no-private", "release:bundles": "gulp releaseBundles", "release:site": "gulp prepareSite && gh-pages -d dist-site/ -f -e .", "start": "NODE_ENV=development yarn workspace @spectrum-css/preview start", - "preversion": "yarn build:clean", - "version": "gulp version", + "version:build": "SCOPE=$(lerna changed | tr \"\\\\n\" ,) && lerna run --stream --scope \"{${SCOPE%,}}\" --ignore \"@spectrum-css/{*-builder*,preview,generator,site}\" build", "watch": "gulp watch" }, "workspaces": [ diff --git a/tools/component-builder-simple/css/index.js b/tools/component-builder-simple/css/index.js index 3345d8dedc..78ef626a10 100644 --- a/tools/component-builder-simple/css/index.js +++ b/tools/component-builder-simple/css/index.js @@ -83,7 +83,16 @@ function getTokensDefinedInCSS(root) { } async function getCoreTokens() { - const coreTokensFile = require.resolve('@spectrum-css/tokens'); + const fetchOptions = { + paths: [ + process.cwd(), + path.join(process.cwd(), '../../') + ] + }; + /* Resolve core tokens first from the current working directory, or if not found, from the root of the monorepo */ + const coreTokensFile = require.resolve('@spectrum-css/tokens', fetchOptions); + const coreTokensPkg = require.resolve('@spectrum-css/tokens/package.json', fetchOptions); + if (coreTokensPkg) console.log('Core tokens version:', await fsp.readFile(coreTokensPkg, 'utf8').then(JSON.parse).then(pkg => pkg.version)); let contents = await fsp.readFile(coreTokensFile, 'utf8'); let root = postcssReal.parse(contents); return getTokensDefinedInCSS(root); diff --git a/tools/component-builder/css/lib/varUtils.js b/tools/component-builder/css/lib/varUtils.js index 81e135391f..ce735ac47d 100644 --- a/tools/component-builder/css/lib/varUtils.js +++ b/tools/component-builder/css/lib/varUtils.js @@ -124,8 +124,12 @@ function resolveValue(value, vars) { } } -const varDir = path.join(path.dirname(require.resolve('@spectrum-css/vars')), '..'); -const coreTokensFile = require.resolve('@spectrum-css/tokens'); +const varDir = path.join(path.dirname(require.resolve('@spectrum-css/vars', { + paths: [process.cwd(), path.join(process.cwd(), '../../')] +})), '..'); +const coreTokensFile = require.resolve('@spectrum-css/tokens', { + paths: [process.cwd(), path.join(process.cwd(), '../../')] +}); async function readDNAVariables(file) { let css = await fsp.readFile(path.join(varDir, 'css', file)); diff --git a/yarn.lock b/yarn.lock index bff739f73d..aeb90a7289 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2722,11 +2722,6 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/tag/-/tag-3.3.15.tgz#971184fd8cb977b85a529f808313851863123278" integrity sha512-pF6Wh61Z7hmAy20twIlpjdDuivYj6UPtWIzK7giyJKr/qcn20BjVN2ChIeFB1N+vBamJdLsuQOewv4AJ3+LZ2Q== -"@spectrum-css/tokens@^1.0.7": - version "1.0.7" - resolved "https://registry.yarnpkg.com/@spectrum-css/tokens/-/tokens-1.0.7.tgz#7256ed9383ac4555f7bc0cf43a9ebe4f5e41b117" - integrity sha512-KGP78ZBPLVyj1+2uHU4IOVcPrQipqGkO9e9j3p3eQVbb4JuBJ9v9sJ5p5Z+z3nmcJV6wdg/zLpf1ZH0tnjl3hg== - "@spectrum-css/tokens@^4.0.0": version "4.0.0" resolved "https://registry.npmjs.org/@spectrum-css/tokens/-/tokens-4.0.0.tgz#581b858225aae05b9b784db1aa0e257c3e9c53cf"