Skip to content

feat!: deprecate vars and expressvars from monorepo structure #2244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ dist-site

temp
.npmrc*
.nx
.env
.tmp
npm-debug.log*
Expand Down
6 changes: 1 addition & 5 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,11 @@
**/node_modules

components/*/dist
components/expressvars/custom.css
components/expressvars/css/**/*.css
components/vars/css/**/*.css
components/vars/custom.css
tokens/custom-*/*.css
.storybook/storybook-static/**
generator
dist
template.hbs
*.hbs

site/includes/*.js

Expand Down
10 changes: 6 additions & 4 deletions .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,7 @@ module.exports = {
{
loader: "file-loader",
options: {
outputPath: (url, resourcePath, context) => {
return `assets/images/${url.replace(/_\//g, "")}`;
},
outputPath: (url) => `assets/images/${url.replace(/_\//g, "")}`,
},
},
],
Expand All @@ -118,7 +116,11 @@ module.exports = {
loader: "file-loader",
options: {
name: "[path][name].[ext][query]",
outputPath: (url, resourcePath, context) => {
outputPath: (url) => {
if (/node_modules\/@spectrum-css/.test(url)) {
return `assets/css/${url.replace(/^_\/_\/node_modules\/@spectrum-css\//g, "")}`;
}

return `assets/css/${url.replace(/_\//g, "")}`;
},
esModule: false,
Expand Down
4 changes: 2 additions & 2 deletions .storybook/postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { resolve, relative, basename } = require("path");
const { resolve, relative, basename, sep } = require("path");
const { existsSync } = require("fs");
const warnCleaner = require("postcss-warn-cleaner");

Expand All @@ -8,7 +8,7 @@ const legacyBuilder = require("@spectrum-css/component-builder/css/processors.js
module.exports = (ctx) => {
let plugins = [];
const componentPath = resolve(__dirname, "../components");
const folderName = relative(componentPath, ctx.file).split("/")[0];
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];
const pkgPath = resolve(componentPath, folderName, "package.json");

if (["expressvars", "vars", "tokens"].includes(folderName)) {
Expand Down
3 changes: 0 additions & 3 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
components/**/*-generated.css
tokens/*
components/vars/*
components/express/*
components/expressvars/*
components/site/*
Loading