From 3188782ce7f33db5085676e4d74d772183e5b285 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Thu, 13 Sep 2018 21:53:12 -0700 Subject: [PATCH] Revert "Get ionicons imported" This reverts commit 5404b811931613aceb30a2e33e9783e0f0f486fa. --- package.json | 2 -- webpack.config.js | 11 +---------- yarn.lock | 23 ----------------------- 3 files changed, 1 insertion(+), 35 deletions(-) diff --git a/package.json b/package.json index 2d0f319f5..06411972a 100644 --- a/package.json +++ b/package.json @@ -32,10 +32,8 @@ "clean-webpack-plugin": "^0.1.19", "css-loader": "^0.28.11", "extract-text-webpack-plugin": "^4.0.0-beta.0", - "file-loader": "^2.0.0", "glob-all": "^3.1.0", "html-webpack-plugin": "^3.2.0", - "ionicons": "^4.4.3", "jquery": "^3.3.1", "lodash": "^4.17.5", "postcss": "^6.0.21", diff --git a/webpack.config.js b/webpack.config.js index 739604423..1ad40a429 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -73,11 +73,7 @@ module.exports = { hints: false, }, // Passing an array loads them all but only exports the last. - entry: [ - './resources/assets/styles/main.css', - './node_modules/ionicons/dist/css/ionicons.css', - './resources/assets/scripts/app.js' - ], + entry: ['./resources/assets/styles/main.css', './resources/assets/scripts/app.js'], output: { path: path.resolve(__dirname, 'public/assets'), filename: 'bundle-[hash].js', @@ -90,10 +86,6 @@ module.exports = { test: /\.vue$/, loader: 'vue-loader', }, - { - test: /\.(eot|woff|woff2|svg|ttf)([?]?.*)$/, - loader: 'file-loader', - }, { test: /\.js$/, include: [ @@ -105,7 +97,6 @@ module.exports = { test: /\.css$/, include: [ path.resolve(__dirname, 'resources'), - path.resolve(__dirname, 'node_modules/ionicons/dist/css/ionicons.css'), ], use: ExtractTextPlugin.extract({ fallback: 'style-loader', diff --git a/yarn.lock b/yarn.lock index 3f008cb15..8f2cd100f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -809,10 +809,6 @@ after@0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" -ajv-errors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59" - ajv-keywords@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a" @@ -2775,13 +2771,6 @@ figures@^2.0.0: dependencies: escape-string-regexp "^1.0.5" -file-loader@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde" - dependencies: - loader-utils "^1.0.2" - schema-utils "^1.0.0" - filename-regex@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" @@ -3331,10 +3320,6 @@ invert-kv@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" -ionicons@^4.4.3: - version "4.4.3" - resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.4.3.tgz#18f09b8277757721ceeb59b0ffb9d35e32c6fbb8" - is-absolute-url@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" @@ -6022,14 +6007,6 @@ schema-utils@^0.4.0, schema-utils@^0.4.4, schema-utils@^0.4.5: ajv "^6.1.0" ajv-keywords "^3.1.0" -schema-utils@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" - dependencies: - ajv "^6.1.0" - ajv-errors "^1.0.0" - ajv-keywords "^3.1.0" - semver-diff@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"