diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-09-30 12:23:57 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-09-30 12:23:57 +0200 |
| commit | 16ff7c5627c12a0c9658e9d2fac7c48002e1b788 (patch) | |
| tree | 465a73fb9f42bc2b01127b2d477b0715fb6185b4 /package.json | |
| parent | febcdad2e2c98aee62b55ee21bdf0debf7c6fd6b (diff) | |
| parent | 3babf8464b0903b854ec16d355909444ef3ca0bc (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package.json b/package.json index 97d3ec497..6282f1439 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "mastodon", + "name": "@tootsuite/mastodon", "license": "AGPL-3.0-or-later", "engines": { "node": ">=8.12 <13" @@ -114,7 +114,7 @@ "lodash": "^4.17.14", "mark-loader": "^0.1.6", "marky": "^1.2.1", - "mini-css-extract-plugin": "^0.7.0", + "mini-css-extract-plugin": "^0.8.0", "mkdirp": "^0.5.1", "npmlog": "^4.1.2", "object-assign": "^4.1.1", @@ -155,7 +155,7 @@ "requestidlecallback": "^0.3.0", "reselect": "^4.0.0", "rimraf": "^3.0.0", - "sass": "^1.22.9", + "sass": "^1.22.12", "sass-loader": "^7.0.3", "stringz": "^2.0.0", "substring-trie": "^1.0.2", @@ -174,10 +174,10 @@ }, "devDependencies": { "babel-eslint": "^10.0.3", - "babel-jest": "^24.8.0", + "babel-jest": "^24.9.0", "enzyme": "^3.10.0", "enzyme-adapter-react-16": "^1.14.0", - "eslint": "^6.1.0", + "eslint": "^6.4.0", "eslint-plugin-import": "~2.18.2", "eslint-plugin-jsx-a11y": "~6.2.3", "eslint-plugin-promise": "~4.2.1", |