Merge pull request #744 from buttercup/deps-update

User Interface updates
buttercup · Feb 10, 2019 · bf57402 · bf57402
2 parents 8ce9c28 + 8c40a31
commit bf57402
Show file tree

Hide file tree

Showing 68 changed files with 7,358 additions and 10,395 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,7 +1,6 @@
 {
   "presets": [
     "@babel/preset-react",
-    "@babel/preset-flow",
     [
       "@babel/preset-env",
       {

diff --git a/.eslintrc b/.eslintrc
@@ -1,8 +1,7 @@
 {
   "parser": "babel-eslint",
   "plugins": [
-    "jsx-control-statements",
-    "flowtype"
+    "jsx-control-statements"
   ],
   "extends": [
     "standard",
@@ -38,10 +37,5 @@
     "comma-dangle": "off",
     "jsx-control-statements/jsx-use-if-tag": 0,
     "jsx-control-statements/jsx-jcs-no-undef": "off"
-  },
-  "settings": {
-    "flowtype": {
-      "onlyFilesWithFlowAnnotation": true
-    }
   }
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,3 @@
 {
-  "flow.pathToFlow": "${workspaceRoot}/node_modules/.bin/flow",
-  "flow.useLSP": true,
   "eslint.enable": true
 }
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -9,6 +9,7 @@
   "author": "Buttercup <info@buttercup.pw>",
   "dependencies": {
     "@buttercup/exporter": "~0.1.0",
+    "@buttercup/iconographer": "~1.1.1",
     "@buttercup/importer": "~0.14.1",
     "buttercup": "~2.7.0",
     "conf": "~1.0.0",

diff --git a/config/webpack.config.base.js b/config/webpack.config.base.js
@@ -40,5 +40,12 @@ module.exports = {
     }
   },
   plugins: [new NormalModuleReplacementPlugin(/\/iconv-loader/, 'node-noop')],
-  externals: ['@buttercup/importer', 'zxcvbn', 'dropbox', 'webdav', 'conf']
+  externals: [
+    '@buttercup/importer',
+    '@buttercup/iconographer',
+    'zxcvbn',
+    'dropbox',
+    'webdav',
+    'conf'
+  ]
 };
diff --git a/config/webpack.config.development.js b/config/webpack.config.development.js
@@ -31,24 +31,6 @@ module.exports = merge(baseConfig, {
     publicPath: 'http://localhost:3000/app/'
   },
 
-  module: {
-    rules: [
-      {
-        test: /\.global\.scss$/,
-        use: ['style-loader', 'css-loader?sourceMap', 'sass-loader']
-      },
-
-      {
-        test: /^((?!\.global).)*\.scss$/,
-        use: [
-          'style-loader',
-          'css-loader?modules&sourceMap&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]',
-          'sass-loader'
-        ]
-      }
-    ]
-  },
-
   plugins: [
     new webpack.HotModuleReplacementPlugin(),
     new webpack.DefinePlugin({

diff --git a/config/webpack.config.production.js b/config/webpack.config.production.js
@@ -22,44 +22,6 @@ module.exports = merge(baseConfig, {
     publicPath: '../dist/'
   },
 
-  module: {
-    rules: [
-      {
-        test: /\.global\.scss$/,
-        use: [
-          {
-            loader: MiniCssExtractPlugin.loader
-          },
-          {
-            loader: 'css-loader',
-            options: {
-              minimize: true
-            }
-          },
-          'sass-loader'
-        ]
-      },
-      {
-        test: /^((?!\.global).)*\.scss$/,
-        use: [
-          {
-            loader: MiniCssExtractPlugin.loader
-          },
-          {
-            loader: 'css-loader',
-            options: {
-              modules: true,
-              importLoaders: true,
-              localIdentName: '[name]__[local]___[hash:base64:5]',
-              minimize: true
-            }
-          },
-          'sass-loader'
-        ]
-      }
-    ]
-  },
-
   node: {
     __dirname: false
   },