Skip to content

Commit 6604012

Browse files
committed
Merge branch 'feature/meta_migration' of https://github.com/MetaCell/netpyne-ui into feature/meta_migration
2 parents 4e8ecf3 + a7c106c commit 6604012

5 files changed

Lines changed: 869 additions & 654 deletions

File tree

webapp/dev_package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
"react-redux": "^7.2.0",
3737
"react-sortable-tree": "^2.8.0",
3838
"redux": "^4.1.0",
39-
"three": "0.111.0"
39+
"three": "0.111.0",
40+
"sass-loader": "^7.2.0",
41+
"node-sass": "^4.0.0"
4042
},
4143
"resolutions": {
4244
"@material-ui/core": "4.11.4"

webapp/package.bak

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
"react-redux": "^7.2.0",
3737
"react-sortable-tree": "^2.8.0",
3838
"redux": "^4.1.0",
39-
"three": "0.111.0"
39+
"three": "0.111.0",
40+
"sass-loader": "^7.2.0",
41+
"node-sass": "^5.0.0"
4042
},
4143
"resolutions": {
4244
"@material-ui/core": "4.11.4"

webapp/package.json

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
"react-redux": "^7.2.0",
3737
"react-sortable-tree": "^2.8.0",
3838
"redux": "^4.1.0",
39-
"three": "0.111.0"
39+
"three": "0.111.0",
40+
"sass-loader": "^7.2.0",
41+
"node-sass": "^5.0.0"
4042
},
4143
"resolutions": {
4244
"@material-ui/core": "4.11.4"
@@ -83,15 +85,8 @@
8385
"less": "^3.11.1",
8486
"less-loader": "^5.0.0",
8587
"mini-css-extract-plugin": "^0.7.0",
86-
"postcss-flexbugs-fixes": "4.2.1",
87-
"postcss-loader": "3.0.0",
88-
"postcss-normalize": "8.0.1",
89-
"postcss-preset-env": "6.7.0",
90-
"postcss-safe-parser": "5.0.2",
9188
"raw-loader": "^0.5.1",
9289
"react-resize-detector": "^6.7.4",
93-
"sass": "^1.32.12",
94-
"sass-loader": "^10.0.5",
9590
"slimerjs": "^1.0.0",
9691
"source-map-loader": "^0.2.3",
9792
"style-loader": "^0.13.2",

webapp/yalc.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"version": "v1",
33
"packages": {
44
"@metacell/geppetto-meta-client": {
5-
"signature": "8b0d0d1a321f5ee50b02500942c70bdd",
5+
"signature": "9f667d89932afb12e262f8d8746fcbc0",
66
"file": true
77
},
88
"@metacell/geppetto-meta-core": {
99
"signature": "0fec34906589f67e813f2fc1d8697ecf",
1010
"file": true
1111
},
1212
"@metacell/geppetto-meta-ui": {
13-
"signature": "e7a6a3e215cbb1c11db0a3974ebd31ac",
13+
"signature": "8971ad352d957f4f5ddf5518790845d5",
1414
"file": true
1515
}
1616
}

0 commit comments

Comments
 (0)