Skip to content

Commit 2a9279b

Browse files
authored
feat(tokens)!: migrate package to root; out of components
1 parent 1c6cb0f commit 2a9279b

33 files changed

+124
-94
lines changed

.prettierignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ components/expressvars/custom.css
88
components/expressvars/css/**/*.css
99
components/vars/css/**/*.css
1010
components/vars/custom.css
11-
components/tokens/custom-*/*.css
11+
tokens/custom-*/*.css
1212
.storybook/storybook-static/**
1313
generator
1414
dist

.stylelintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
components/**/*-generated.css
2-
components/tokens/*
2+
tokens/*
33
components/vars/*
44
components/express/*
55
components/expressvars/*

generator/plopfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { spawn } from 'child_process';
22
import { existsSync, readdirSync, readFileSync } from 'fs';
33
import { readFile } from 'fs/promises';
4-
import { resolve } from 'path';
4+
import { dirname, resolve } from 'path';
55

66
import cheerio from 'cheerio';
77
import yaml from 'js-yaml';
@@ -22,7 +22,7 @@ export default async (plop) => {
2222
const projectName = process.env.PROJECT_NAME ?? 'Spectrum CSS';
2323
const pkg = await fetchPackage(rootFolder);
2424

25-
const tokens = await fetchPackage(resolve(srcPath, 'tokens'));
25+
const tokens = await fetchPackage(dirname(require.resolve('@spectrum-css/tokens/package.json')));
2626
const builder = await fetchPackage(resolve(process.cwd(), '../tools/component-builder-simple'));
2727

2828
/* Fetch the project name */

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
"components/*",
6565
"tools/*",
6666
"plugins/*",
67+
"tokens",
6768
"generator",
6869
".storybook",
6970
".github/actions/*"

site/gulpfile.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,17 @@ function buildSite_prism() {
3939
])
4040
.pipe(gulp.dest(path.join(__dirname, "../dist/css/prism/")));
4141
}
42+
function buildSite_tokens() {
43+
return gulp
44+
.src([
45+
require.resolve("@spectrum-css/tokens"),
46+
])
47+
.pipe(gulp.dest(path.join(__dirname, "../dist/components/tokens/")));
48+
}
4249

4350
exports.copySiteResources = gulp.parallel(
4451
buildSite_resources,
52+
buildSite_tokens,
4553
buildSite_loadicons,
4654
buildSite_lunr,
4755
buildSite_prism

tasks/clean-up-after-migration.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ test -d "tools/preview" && rm -rf tools/preview
2222
# Legacy tokens packages
2323
# test -d "components/vars" && rm -rf components/vars
2424
# test -d "components/expressvars" && rm -rf components/expressvars
25-
# test -d "components/tokens" && rm -rf components/tokens
25+
test -d "components/tokens" && rm -rf components/tokens
2626

2727
# test -d "plugins/legacy-postcss-dropdupedvars" && rm -rf plugins/legacy-postcss-dropdupedvars
2828
# test -d "plugins/legacy-postcss-dropunusedvars" && rm -rf plugins/legacy-postcss-dropunusedvars
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)