Skip to content

Commit

Permalink
rename v3 to next and add to export (#531)
Browse files Browse the repository at this point in the history
* rename v3 to next and add to export
  • Loading branch information
lukasoppermann authored Mar 28, 2023
1 parent fd4c24f commit 8e1412a
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tokens-v2-private/
tokens-v3-private/
tokens-next-private/
.cache/
docs/public/
CHANGELOG.md
Expand Down
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ module.exports = {
'.cache',
'coverage/**/*',
'docs/public/**/*',
'docs',
'dist/**/*',
'types/**/*',
'README.md',
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
with:
node_version: 16
install: npm ci --no-audit --no-fund
build: npm run build:tokens && npm run build && npm run build:v3 && cd docs && npm run build:preview
build: npm run build:tokens && npm run build && npm run build:next && cd docs && npm run build:preview
output_dir: docs/public

post_storybook:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ node_modules
*.log
/dist/
/tokens-v2-private/
/tokens-v3-private/
/tokens-next-private/
yarn.lock
coverage/
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tokens-v2-private/
tokens-v3-private/
tokens-next-private/
.cache/
docs/public/
# next line needed for <Note> reference
Expand Down
54 changes: 27 additions & 27 deletions docs/storybook/.storybook/preview.css
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
/* size/typography */
@import '../../../tokens-v3-private/css/base/size/size.css';
@import '../../../tokens-v3-private/css/base/typography/typography.css';
@import '../../../tokens-v3-private/css/functional/size/border.css';
@import '../../../tokens-v3-private/css/functional/size/breakpoints.css';
@import '../../../tokens-v3-private/css/functional/size/size-coarse.css';
@import '../../../tokens-v3-private/css/functional/size/size-fine.css';
@import '../../../tokens-v3-private/css/functional/size/size.css';
@import '../../../tokens-v3-private/css/functional/size/viewport.css';
@import '../../../tokens-v3-private/css/functional/typography/typography.css';
@import '../../../tokens-next-private/css/base/size/size.css';
@import '../../../tokens-next-private/css/base/typography/typography.css';
@import '../../../tokens-next-private/css/functional/size/border.css';
@import '../../../tokens-next-private/css/functional/size/breakpoints.css';
@import '../../../tokens-next-private/css/functional/size/size-coarse.css';
@import '../../../tokens-next-private/css/functional/size/size-fine.css';
@import '../../../tokens-next-private/css/functional/size/size.css';
@import '../../../tokens-next-private/css/functional/size/viewport.css';
@import '../../../tokens-next-private/css/functional/typography/typography.css';

/* color */
/* scales */
@import '../../../tokens-v3-private/css/base/color/light.css';
@import '../../../tokens-v3-private/css/base/color/light-tritanopia.css';
@import '../../../tokens-v3-private/css/base/color/light-high-contrast.css';
@import '../../../tokens-v3-private/css/base/color/light-colorblind.css';
@import '../../../tokens-v3-private/css/base/color/dark.css';
@import '../../../tokens-v3-private/css/base/color/dark-colorblind.css';
@import '../../../tokens-v3-private/css/base/color/dark-dimmed.css';
@import '../../../tokens-v3-private/css/base/color/dark-high-contrast.css';
@import '../../../tokens-v3-private/css/base/color/dark-tritanopia.css';
@import '../../../tokens-next-private/css/base/color/light.css';
@import '../../../tokens-next-private/css/base/color/light-tritanopia.css';
@import '../../../tokens-next-private/css/base/color/light-high-contrast.css';
@import '../../../tokens-next-private/css/base/color/light-colorblind.css';
@import '../../../tokens-next-private/css/base/color/dark.css';
@import '../../../tokens-next-private/css/base/color/dark-colorblind.css';
@import '../../../tokens-next-private/css/base/color/dark-dimmed.css';
@import '../../../tokens-next-private/css/base/color/dark-high-contrast.css';
@import '../../../tokens-next-private/css/base/color/dark-tritanopia.css';
/* functional */
@import '../../../tokens-v3-private/css/functional/themes/light.css';
@import '../../../tokens-v3-private/css/functional/themes/light-tritanopia.css';
@import '../../../tokens-v3-private/css/functional/themes/light-high-contrast.css';
@import '../../../tokens-v3-private/css/functional/themes/light-colorblind.css';
@import '../../../tokens-v3-private/css/functional/themes/dark.css';
@import '../../../tokens-v3-private/css/functional/themes/dark-colorblind.css';
@import '../../../tokens-v3-private/css/functional/themes/dark-dimmed.css';
@import '../../../tokens-v3-private/css/functional/themes/dark-high-contrast.css';
@import '../../../tokens-v3-private/css/functional/themes/dark-tritanopia.css';
@import '../../../tokens-next-private/css/functional/themes/light.css';
@import '../../../tokens-next-private/css/functional/themes/light-tritanopia.css';
@import '../../../tokens-next-private/css/functional/themes/light-high-contrast.css';
@import '../../../tokens-next-private/css/functional/themes/light-colorblind.css';
@import '../../../tokens-next-private/css/functional/themes/dark.css';
@import '../../../tokens-next-private/css/functional/themes/dark-colorblind.css';
@import '../../../tokens-next-private/css/functional/themes/dark-dimmed.css';
@import '../../../tokens-next-private/css/functional/themes/dark-high-contrast.css';
@import '../../../tokens-next-private/css/functional/themes/dark-tritanopia.css';
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"files": [
"dist",
"tokens-v2-private",
"tokens-next-private",
"build.js",
"tokens/"
],
Expand All @@ -27,9 +28,9 @@
"homepage": "https://github.com/primer/primitives#readme",
"scripts": {
"build": "ts-node ./scripts/build.ts && tsc --project tsconfig.build.json",
"build:v3": "ts-node -r tsconfig-paths/register ./scripts/buildTokens.ts",
"build:next": "ts-node -r tsconfig-paths/register ./scripts/buildTokens.ts",
"build:tokens": "node -e \"require('./build')._init()\"",
"build:new-tokens": "npm run build:tokens && npm run build:v3",
"build:new-tokens": "npm run build:tokens && npm run build:next",
"check:tokenJson": "ts-node scripts/diffThemes.ts && ts-node scripts/diffTokenProps.ts",
"contrast-check": "npx ts-node ./scripts/color-contrast.ts",
"format": "prettier --write '**/*.{js,jsx,ts,tsx,md,mdx,css}'",
Expand All @@ -41,11 +42,11 @@
"postbuild": "ts-node ./scripts/color-contrast.ts",
"prebuild": "rm -rf dist",
"prebuild:tokens": "rm -rf tokens-v2-private",
"prebuild:v3": "rm -rf tokens-v3-private",
"prebuild:next": "rm -rf tokens-next-private",
"prepack": "npm run build && npm run build:tokens",
"prepare": "husky install && npm run install:docs && npm run install:storybook",
"release": "changeset publish",
"start:storybook": "npm run build:v3 && cd docs/storybook && npm run storybook",
"start:storybook": "npm run build:next && cd docs/storybook && npm run storybook",
"test": "jest --verbose --coverage",
"watch": "ls data/**/*.scss scripts/**/*.ts | entr -s 'npm run build'"
},
Expand Down
2 changes: 1 addition & 1 deletion scripts/buildTokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -188,5 +188,5 @@ export const buildDesignTokens = (buildOptions: ConfigGeneratorOptions): void =>
* Run build script
* ----------------------------------- */
buildDesignTokens({
buildPath: 'tokens-v3-private/',
buildPath: 'tokens-next-private/',
})

0 comments on commit 8e1412a

Please sign in to comment.