From 1b90855ab0553b5cdb4c5bb9c1a66d8cb5cd48c6 Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Sun, 8 Apr 2018 17:46:57 +0200 Subject: [PATCH] [core] Prune dead dependencies (#10963) * [core] Prune dead dependencies * upgrade docker versions --- .babelrc | 13 +++++++++++-- .circleci/config.yml | 8 ++++---- docker-compose.yml | 4 ++-- package.json | 4 ---- test/utils/setup.js | 5 ----- yarn.lock | 14 +------------- 6 files changed, 18 insertions(+), 30 deletions(-) diff --git a/.babelrc b/.babelrc index 49a9bcf792381a..d48c5306a664a3 100644 --- a/.babelrc +++ b/.babelrc @@ -6,9 +6,17 @@ "env": { "coverage": { "plugins": [ + "istanbul", [ - "istanbul" - ] + "module-resolver", + { + "root": ["./"], + "alias": { + "material-ui": "./src", + "@material-ui/icons": "./packages/material-ui-icons/src" + } + } + ], ] }, "development": { @@ -100,6 +108,7 @@ [ "module-resolver", { + "root": ["./"], "alias": { "material-ui": "./src", "@material-ui/icons": "./packages/material-ui-icons/src" diff --git a/.circleci/config.yml b/.circleci/config.yml index fda1319cd2b797..43493e2faad43f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ defaults: &defaults working_directory: /tmp/material-ui docker: - - image: circleci/node:9.5 + - image: circleci/node:9.10 restore_repo: &restore_repo restore_cache: keys: @@ -69,7 +69,7 @@ jobs: # This isn't user facing code. # Let's take advantage of the most up to date node version. docker: - - image: circleci/node:9.5 + - image: circleci/node:9.10 steps: - *restore_repo - run: @@ -97,8 +97,8 @@ jobs: test_regressions: <<: *defaults docker: - - image: circleci/node:9.5 - - image: selenium/standalone-chrome:3.9.0 + - image: circleci/node:9.10 + - image: selenium/standalone-chrome:3.11.0 steps: - *restore_repo - run: diff --git a/docker-compose.yml b/docker-compose.yml index e795236f64a9a3..e05e9af831a14c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,8 @@ hub: - image: selenium/hub:3.9.0 + image: selenium/hub:3.11.0 ports: - 4444:4444 chrome: - image: selenium/node-chrome:3.9.0 + image: selenium/node-chrome:3.11.0 links: - hub diff --git a/package.json b/package.json index 5aebb42e8754cf..9e0c316366c635 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,6 @@ "devDependencies": { "@types/enzyme": "^3.1.4", "@types/react": "16.3.4", - "app-module-path": "^2.2.0", "argos-cli": "^0.0.9", "autoprefixer": "^8.0.0", "autosuggest-highlight": "^3.1.1", @@ -142,7 +141,6 @@ "eslint-plugin-prettier": "^2.3.1", "eslint-plugin-react": "^7.4.0", "eslint-plugin-spellcheck": "^0.0.10", - "eventsource-polyfill": "^0.9.6", "fg-loadcss": "^2.0.1", "file-loader": "^1.1.5", "flow-bin": "0.62.0", @@ -167,7 +165,6 @@ "mocha": "^5.0.0", "next": "^5.0.1-canary.7", "nyc": "^11.3.0", - "phantomjs-prebuilt": "^2.1.16", "postcss": "^6.0.16", "prettier": "^1.8.2", "raw-loader": "^0.5.1", @@ -185,7 +182,6 @@ "react-test-renderer": "^16.1.1", "react-text-mask": "^5.0.2", "recast": "^0.14.4", - "recursive-readdir-sync": "^1.0.6", "redux": "^3.7.2", "redux-logger": "^3.0.6", "rimraf": "^2.6.2", diff --git a/test/utils/setup.js b/test/utils/setup.js index b33f7d24a2cc11..c1e685aba3d4cd 100644 --- a/test/utils/setup.js +++ b/test/utils/setup.js @@ -1,9 +1,4 @@ -// @flow - -require('app-module-path').addPath(`${__dirname}'./../../`); - const createDOM = require('./createDOM'); createDOM(); - require('./init'); diff --git a/yarn.lock b/yarn.lock index 6322b25f02cfca..7d280792292ab4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -343,10 +343,6 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -app-module-path@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/app-module-path/-/app-module-path-2.2.0.tgz#641aa55dfb7d6a6f0a8141c4b9c0aa50b6c24dd5" - append-transform@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991" @@ -3900,10 +3896,6 @@ events@^1.0.0, events@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" -eventsource-polyfill@^0.9.6: - version "0.9.6" - resolved "https://registry.yarnpkg.com/eventsource-polyfill/-/eventsource-polyfill-0.9.6.tgz#10e0d187f111b167f28fdab918843ce7d818f13c" - evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" @@ -7648,7 +7640,7 @@ performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" -phantomjs-prebuilt@^2.1.16, phantomjs-prebuilt@^2.1.7: +phantomjs-prebuilt@^2.1.7: version "2.1.16" resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz#efd212a4a3966d3647684ea8ba788549be2aefef" dependencies: @@ -8674,10 +8666,6 @@ recursive-copy@2.0.6: promise "^7.0.1" slash "^1.0.0" -recursive-readdir-sync@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/recursive-readdir-sync/-/recursive-readdir-sync-1.0.6.tgz#1dbf6d32f3c5bb8d3cde97a6c588d547a9e13d56" - redent@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"