Skip to content

Commit 08fd30f

Browse files
committed
fix: get sass compiling in dev env for site with smui-theme
1 parent 6405961 commit 08fd30f

File tree

7 files changed

+96
-292
lines changed

7 files changed

+96
-292
lines changed

package-lock.json

+40-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
"pages:build": "cd packages/site && npm run build && cd ../..",
2323
"pages:push": "git add -f packages/site/build && git commit -m 'chore: update built files' && git push origin $(git subtree split --prefix packages/site/build master):gh-pages --force && git reset --hard HEAD^",
2424
"prepare": "husky install && npm run build:css",
25-
"build:css": "smui-theme compile bare.css",
25+
"build:css": "echo \"temporarily disabled for development\"",
26+
"TEMP-DISABLED-build:css": "smui-theme compile bare.css",
2627
"test": "echo \"Error: no test specified\" && exit 1"
2728
},
2829
"files": [
@@ -37,7 +38,7 @@
3738
"url": "https://github.com/hperrin/svelte-material-ui/issues"
3839
},
3940
"license": "Apache-2.0",
40-
"temp-disabled-dependencies": {
41+
"TEMP-DISABLED-dependencies": {
4142
"@smui/banner": "5.0.0",
4243
"@smui/button": "5.0.0",
4344
"@smui/card": "5.0.0",
@@ -77,6 +78,9 @@
7778
"@smui/top-app-bar": "5.0.0",
7879
"@smui/touch-target": "5.0.0"
7980
},
81+
"TEMP-DISABLED-devDependencies": {
82+
"smui-theme": "file:packages/smui-theme"
83+
},
8084
"devDependencies": {
8185
"@commitlint/cli": "^14.1.0",
8286
"@commitlint/config-conventional": "^14.1.0",
@@ -85,7 +89,6 @@
8589
"prettier": "~2.4.1",
8690
"prettier-plugin-svelte": "^2.4.0",
8791
"sass": "^1.43.4",
88-
"smui-theme": "file:packages/smui-theme",
8992
"svelte": "^3.35.0",
9093
"svelte-check": "^2.2.8"
9194
}

packages/common/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"devDependencies": {
3939
"@tsconfig/svelte": "^2.0.1",
4040
"sass": "^1.43.4",
41+
"svelte": "^3.35.0",
4142
"tslib": "^2.3.1",
4243
"typescript": "^4.4.4"
4344
},

packages/site/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"clean": "test -d .svelte-kit && rm -r .svelte-kit || true",
1010
"preview": "svelte-kit preview",
1111
"prepare": "npm run smui-theme-light && npm run smui-theme-dark && npm run site-light && npm run site-dark",
12-
"smui-theme-light": "smui-theme compile static/smui.css -s expanded -i src/theme",
13-
"smui-theme-dark": "smui-theme compile static/smui-dark.css -s expanded -i src/theme/dark",
12+
"smui-theme-light": "smui-theme compile static/smui.css -s expanded -i src/theme -i node_modules/",
13+
"smui-theme-dark": "smui-theme compile static/smui-dark.css -s expanded -i src/theme/dark -i node_modules/",
1414
"site-light": "sass --no-source-map -I src/theme -I node_modules -I ../../node_modules src/site.scss static/site.css",
1515
"site-dark": "sass --no-source-map -I src/theme/dark -I node_modules -I ../../node_modules src/site.scss static/site-dark.css",
1616
"test": "echo \"Error: no test specified\" && exit 1"

packages/smui-theme/bin/index.js

+7-4
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,11 @@ yargs(hideBin(process.argv))
4949

5050
const result = sass.renderSync({
5151
// _index imports "smui-theme"
52-
file: require.resolve(
53-
'smui-theme/' + (argv.includes.length ? '_index.scss' : '_style.scss')
54-
),
52+
file: path.resolve(
53+
__dirname,
54+
'..',
55+
argv.includes.length ? '_index.scss' : '_style.scss'
56+
), // require.resolve('smui-theme/' + (argv.includes.length ? '_index.scss' : '_style.scss')),
5557
includePaths: [
5658
...argv.includes,
5759
// Include the node_modules directory for MDC styles.
@@ -63,7 +65,8 @@ yargs(hideBin(process.argv))
6365
// Include the fallback directory, with no styles, for packages
6466
// that aren't installed
6567
path.resolve(
66-
path.dirname(require.resolve('smui-theme/package.json')),
68+
__dirname,
69+
'..', // path.dirname(require.resolve('smui-theme/package.json')),
6770
'fallback'
6871
),
6972
],

packages/smui-theme/package.json

+39
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,45 @@
2929
"url": "https://github.com/hperrin/svelte-material-ui/issues"
3030
},
3131
"license": "Apache-2.0",
32+
"devDependencies": {
33+
"@smui/banner": "^5.0.0",
34+
"@smui/button": "^5.0.0",
35+
"@smui/card": "^5.0.0",
36+
"@smui/checkbox": "^5.0.0",
37+
"@smui/chips": "^5.0.0",
38+
"@smui/circular-progress": "^5.0.0",
39+
"@smui/data-table": "^5.0.0",
40+
"@smui/dialog": "^5.0.0",
41+
"@smui/drawer": "^5.0.0",
42+
"@smui/fab": "^5.0.0",
43+
"@smui/floating-label": "^5.0.0",
44+
"@smui/form-field": "^5.0.0",
45+
"@smui/icon-button": "^5.0.0",
46+
"@smui/image-list": "^5.0.0",
47+
"@smui/layout-grid": "^5.0.0",
48+
"@smui/line-ripple": "^5.0.0",
49+
"@smui/linear-progress": "^5.0.0",
50+
"@smui/list": "^5.0.0",
51+
"@smui/menu": "^5.0.0",
52+
"@smui/menu-surface": "^5.0.0",
53+
"@smui/notched-outline": "^5.0.0",
54+
"@smui/paper": "^5.0.0",
55+
"@smui/radio": "^5.0.0",
56+
"@smui/ripple": "^5.0.0",
57+
"@smui/segmented-button": "^5.0.0",
58+
"@smui/select": "^5.0.0",
59+
"@smui/slider": "^5.0.0",
60+
"@smui/snackbar": "^5.0.0",
61+
"@smui/switch": "^5.0.0",
62+
"@smui/tab": "^5.0.0",
63+
"@smui/tab-bar": "^5.0.0",
64+
"@smui/tab-indicator": "^5.0.0",
65+
"@smui/tab-scroller": "^5.0.0",
66+
"@smui/textfield": "^5.0.0",
67+
"@smui/tooltip": "^5.0.0",
68+
"@smui/top-app-bar": "^5.0.0",
69+
"@smui/touch-target": "^5.0.0"
70+
},
3271
"dependencies": {
3372
"node-fetch": "^2.6.1",
3473
"sass": "^1.43.4",

0 commit comments

Comments
 (0)