Skip to content

Commit c1ffc8a

Browse files
committed
feat(vars,expressvars)!: deprecate packages
BREAKING CHANGE: as no additional changes have been or are planned to be made to these legacy token packages, these assets no longer need to exist in the monorepo structure for Spectrum CSS.
1 parent 224106c commit c1ffc8a

File tree

236 files changed

+140
-328821
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+140
-328821
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ dist-site
66

77
temp
88
.npmrc*
9+
.nx
910
.env
1011
.tmp
1112
npm-debug.log*

.prettierignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@
44
**/node_modules
55

66
components/*/dist
7-
components/expressvars/custom.css
8-
components/expressvars/css/**/*.css
9-
components/vars/css/**/*.css
10-
components/vars/custom.css
117
tokens/custom-*/*.css
128
.storybook/storybook-static/**
139
generator
1410
dist
15-
template.hbs
11+
*.hbs
1612

1713
site/includes/*.js
1814

.storybook/main.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@ module.exports = {
9494
{
9595
loader: "file-loader",
9696
options: {
97-
outputPath: (url, resourcePath, context) => {
98-
return `assets/images/${url.replace(/_\//g, "")}`;
99-
},
97+
outputPath: (url) => `assets/images/${url.replace(/_\//g, "")}`,
10098
},
10199
},
102100
],
@@ -118,7 +116,11 @@ module.exports = {
118116
loader: "file-loader",
119117
options: {
120118
name: "[path][name].[ext][query]",
121-
outputPath: (url, resourcePath, context) => {
119+
outputPath: (url) => {
120+
if (/node_modules\/@spectrum-css/.test(url)) {
121+
return `assets/css/${url.replace(/^_\/_\/node_modules\/@spectrum-css\//g, "")}`;
122+
}
123+
122124
return `assets/css/${url.replace(/_\//g, "")}`;
123125
},
124126
esModule: false,

.storybook/manager.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import logo from "./assets/logo.svg";
77
import pkg from "./package.json";
88

99
// Load global styles
10-
import "@spectrum-css/vars/css/globals/index.css";
11-
import "@spectrum-css/vars/css/components/index.css";
12-
13-
import "@spectrum-css/vars/css/scales/spectrum-medium.css";
14-
import "@spectrum-css/vars/css/themes/spectrum-light.css";
10+
import "@spectrum-css/vars/dist/spectrum-global.css";
11+
import "@spectrum-css/vars/dist/spectrum-light.css";
12+
import "@spectrum-css/vars/dist/spectrum-medium.css";
1513

1614
import "./global.js";
1715

16+
import "@spectrum-css/tokens";
17+
1818
addons.setConfig({
1919
theme: create({
2020
base: "light",

.storybook/package.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,21 @@
8585
"{workspaceRoot}/storybook-static"
8686
]
8787
},
88+
"storybook": {
89+
"dependsOn": [
90+
"^build"
91+
],
92+
"inputs": [
93+
"{workspaceRoot}/assets",
94+
"{workspaceRoot}/decorators",
95+
"{workspaceRoot}/*.js",
96+
"{workspaceRoot}/*.html",
97+
"{projectRoot}/components/*/dist"
98+
],
99+
"outputs": [
100+
"{workspaceRoot}/storybook-static"
101+
]
102+
},
88103
"clean": {
89104
"inputs": [
90105
"{workspaceRoot}/storybook-static"

.storybook/postcss.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { resolve, relative, basename } = require("path");
1+
const { resolve, relative, basename, sep } = require("path");
22
const { existsSync } = require("fs");
33
const warnCleaner = require("postcss-warn-cleaner");
44

@@ -8,7 +8,7 @@ const legacyBuilder = require("@spectrum-css/component-builder/css/processors.js
88
module.exports = (ctx) => {
99
let plugins = [];
1010
const componentPath = resolve(__dirname, "../components");
11-
const folderName = relative(componentPath, ctx.file).split("/")[0];
11+
const folderName = ctx.file.includes('node_modules') ? relative(resolve(__dirname, "../../node_modules/@spectrum-css"), ctx.file)?.split(sep)?.shift() : relative(componentPath, ctx.file).split("/")[0];
1212
const pkgPath = resolve(componentPath, folderName, "package.json");
1313

1414
if (["expressvars", "vars", "tokens"].includes(folderName)) {

.storybook/preview.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import "@spectrum-css/vars/dist/spectrum-dark.css";
2525
import "@spectrum-css/vars/dist/spectrum-darkest.css";
2626
import "@spectrum-css/vars/dist/spectrum-light.css";
2727

28+
import "@spectrum-css/vars/dist/components/index.css";
2829
import "@spectrum-css/vars/dist/spectrum-global.css";
2930

3031
import "@spectrum-css/expressvars/dist/spectrum-large.css";
@@ -34,6 +35,7 @@ import "@spectrum-css/expressvars/dist/spectrum-dark.css";
3435
import "@spectrum-css/expressvars/dist/spectrum-darkest.css";
3536
import "@spectrum-css/expressvars/dist/spectrum-light.css";
3637

38+
import "@spectrum-css/expressvars/dist/components/index.css";
3739
import "@spectrum-css/expressvars/dist/spectrum-global.css";
3840

3941
import "@spectrum-css/tokens";

.stylelintignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
components/**/*-generated.css
22
tokens/*
3-
components/vars/*
4-
components/express/*
5-
components/expressvars/*
63
components/site/*

0 commit comments

Comments
 (0)