Skip to content

Commit b922f6a

Browse files
committed
refactor: Make brand-sample one layer simpler
This collapses brand-sample/src into brand-sample. The extra layer did not seem to be serving a purpose. It confused me over and over again when I was debugging tutor-contrib-paragon. This also drops the Makefile and merges its on rule (build) into package.json, removing the unnecessary package.json<->Makefile indirection that was going on.
1 parent ccc9a1d commit b922f6a

9 files changed

Lines changed: 6 additions & 22 deletions

File tree

brand-sample/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
!dist
1+
node_modules
2+
paragon

brand-sample/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ hooks.Filters.ENV_PATCHES.add_item(
6161
2. Navigate to your Tutor config directory (you can find this by running `tutor config printroot`)
6262
3. From your config directory, navigate to `env/plugins/paragon` (the full path on my dev machine is `~/.local/share/tutor-main/env/plugins/paragon`)
6363
4. You should see some directories in there, find the `theme-sources` directory.
64-
5. Place this theme's [`color.json` file](./src/tokens/src/themes/light/global/color.json) in the appropriate subdirectory of the `theme-sources` directory.
64+
5. Place this theme's [`color.json` file](./tokens/src/themes/light/global/color.json) in the appropriate subdirectory of the `theme-sources` directory.
6565
```sh
6666
$ tree ~/.local/share/tutor-main/env/plugins/paragon
6767
├── [...]
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
"scripts": {
1717
"build-tokens": "paragon build-tokens --source ./tokens/src --build-dir ./paragon/css --source-tokens-only --exclude-core",
1818
"build-scss": "paragon build-scss --themesPath ./paragon/css/themes --defaultThemeVariants light --excludeCore",
19-
"build": "make build",
20-
"build:watch": "nodemon --ignore dist -x \"make build\"",
19+
"clean": "rm -rf dist && mkdir dist",
20+
"build": "npm run clean && npm run build-tokens && npm run build-scss",
21+
"build:watch": "nodemon --ignore dist -x \"npm run build\"",
2122
"paragon:help": "paragon help"
2223
},
2324
"devDependencies": {

brand-sample/src/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

brand-sample/src/Makefile

Lines changed: 0 additions & 4 deletions
This file was deleted.

brand-sample/src/README.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

brand-sample/src/tokens/src/themes/light/global/color.json renamed to brand-sample/tokens/src/themes/light/global/color.json

File renamed without changes.

0 commit comments

Comments
 (0)