Skip to content
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.

Sign up for GitHub

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

Jump to bottom

refactor: updated dependencies regarding node-sass #1300

Merged
merged 31 commits into from
Mar 26, 2021
Merged

refactor: updated dependencies regarding node-sass #1300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
26db979
Merge pull request #1 from pattern-lab/dev
mfranzke Apr 24, 2020
7812878
Merge pull request #2 from pattern-lab/dev
mfranzke Apr 25, 2020
271dc8d
chore(docs): some typos
Apr 25, 2020
ccdf238
Revert "Merge pull request #2 from pattern-lab/dev"
Apr 25, 2020
4c2070f
Revert "Merge pull request #1 from pattern-lab/dev"
Apr 25, 2020
117ca22
Revert "chore(docs): some typos"
Apr 25, 2020
4f5bff6
Merge remote-tracking branch 'upstream/dev' into dev
Apr 28, 2020
73df9d3
Merge remote-tracking branch 'upstream/dev' into dev
Apr 30, 2020
9115c17
Merge remote-tracking branch 'upstream/dev' into dev
May 2, 2020
e86272f
Merge remote-tracking branch 'upstream/dev' into dev
May 8, 2020
a243f5d
Merge remote-tracking branch 'upstream/dev' into dev
May 11, 2020
3238ac7
Merge remote-tracking branch 'upstream/dev' into dev
May 23, 2020
7f4ba39
Merge remote-tracking branch 'upstream/dev' into dev
Jun 11, 2020
f7b514b
Merge remote-tracking branch 'upstream/dev' into dev
Jun 13, 2020
37f9749
Merge remote-tracking branch 'upstream/dev' into dev
Jun 28, 2020
572afec
Merge branch 'dev' of https://github.com/mfranzke/patternlab-node int…
Jun 28, 2020
e4a5245
Merge remote-tracking branch 'upstream/dev' into dev
Sep 6, 2020
4aa9366
Merge remote-tracking branch 'upstream/dev' into dev
Sep 11, 2020
155c253
Merge remote-tracking branch 'upstream/dev' into dev
Oct 11, 2020
3b95604
Merge remote-tracking branch 'upstream/dev' into dev
Jan 12, 2021
6b4a6fb
Merge remote-tracking branch 'upstream/dev' into dev
Feb 5, 2021
6431987
Merge remote-tracking branch 'upstream/dev' into dev
Feb 20, 2021
9b9fd65
chore: initially regenerated the yarn.lock file
mfranzke Mar 14, 2021
3286255
refactor: updated node-sass related dependencies
mfranzke Mar 14, 2021
bff9389
Merge branch 'dev' into refactor-updated-dependency-node-sass
JosefBredereck Mar 23, 2021
d486051
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Mar 23, 2021
be17657
Merge remote-tracking branch 'upstream/dev' into dev
mfranzke Mar 24, 2021
cae1528
Merge branch 'dev' into refactor-updated-dependency-node-sass
mfranzke Mar 24, 2021
e83668e
Revert "Merge branch 'dev' into refactor-updated-dependency-node-sass"
mfranzke Mar 24, 2021
9c67a4d
fix: correctly cherry-picked commit 8e784607
mfranzke Mar 24, 2021
f3eaa46
refactor: regenerated yarn.lock
mfranzke Mar 24, 2021
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
4 changes: 2 additions & 2 deletions packages/uikit-workshop/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"mini-css-extract-plugin": "^0.8.0",
"mousetrap": "^1.6.3",
"no-emit-webpack-plugin": "^1.0.0",
"node-sass": "^4.14.1",
"node-sass": "^5.0.0",
"node-sass-selector-importer": "^5.2.0",
"postcss-loader": "^3.0.0",
"preact": "8.3.1",
Expand All @@ -104,7 +104,7 @@
"react-popper-tooltip": "^2.7.0",
"redux": "3.7.2",
"redux-thunk": "^2.3.0",
"sass-loader": "^8.0.0",
"sass-loader": "^10.1.1",
"scriptjs": "^2.5.8",
"scroll-js": "^2.2.0",
"skatejs": "^5.2.4",
Expand Down
Loading