From 0dfde9336861a108534f27c757367e5217fa3818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Tr=C3=A4nklein?= <dominik@bleech.de>
Date: Thu, 24 Oct 2019 14:39:49 +0200
Subject: [PATCH] feat(PremiumComponents): add as Components subdir

---
 .gitignore        | 2 +-
 assets/admin.js   | 3 ---
 assets/admin.scss | 4 +---
 assets/main.js    | 3 ---
 assets/main.scss  | 4 +---
 functions.php     | 3 ---
 webpack.config.js | 9 +++------
 7 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index b7fa43231..ae5a5b287 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/flyntPremium/
+/Components/PremiumComponents/
 /dist
 node_modules
 npm-debug.log
diff --git a/assets/admin.js b/assets/admin.js
index 012465a52..6a3d340a8 100644
--- a/assets/admin.js
+++ b/assets/admin.js
@@ -6,6 +6,3 @@ function importAll (r) {
 }
 
 importAll(require.context('../Components/', true, /admin\.js$/))
-if (PREMIUM_COMPONENTS_EXIST) {
-  importAll(require.context('../flyntPremium/Components/', true, /admin\.js$/))
-}
diff --git a/assets/admin.scss b/assets/admin.scss
index 95e03cd9c..86ec209cd 100644
--- a/assets/admin.scss
+++ b/assets/admin.scss
@@ -3,6 +3,4 @@
   'styles/mixins';
 
 // stylelint-disable-next-line scss/at-import-no-partial-leading-underscore, scss/at-import-partial-extension-blacklist
-@import '../Components/*/_admin.scss';
-// stylelint-disable-next-line scss/at-import-no-partial-leading-underscore, scss/at-import-partial-extension-blacklist
-@import '../FlyntPremium/Components/*/_admin.scss';
+@import '../Components/**/_admin.scss';
diff --git a/assets/main.js b/assets/main.js
index cb2711f5b..fbbc99a67 100644
--- a/assets/main.js
+++ b/assets/main.js
@@ -26,6 +26,3 @@ function importAll (r) {
 }
 
 importAll(require.context('../Components/', true, /script\.js$/))
-if (PREMIUM_COMPONENTS_EXIST) {
-  importAll(require.context('../FlyntPremium/Components/', true, /script\.js$/))
-}
diff --git a/assets/main.scss b/assets/main.scss
index 16817d12c..6b5d0a014 100644
--- a/assets/main.scss
+++ b/assets/main.scss
@@ -6,6 +6,4 @@
   'styles/base';
 
 // stylelint-disable-next-line scss/at-import-no-partial-leading-underscore, scss/at-import-partial-extension-blacklist
-@import '../Components/*/_style.scss';
-// stylelint-disable-next-line scss/at-import-no-partial-leading-underscore, scss/at-import-partial-extension-blacklist
-@import '../FlyntPremium/Components/*/_style.scss';
+@import '../Components/**/_style.scss';
diff --git a/functions.php b/functions.php
index af3b4f1ed..25ee41468 100644
--- a/functions.php
+++ b/functions.php
@@ -17,7 +17,4 @@
     FileLoader::loadPhpFiles('inc');
     add_action('after_setup_theme', ['Flynt\Init', 'initTheme']);
     add_action('after_setup_theme', ['Flynt\Init', 'loadComponents'], 101);
-    if (file_exists(__DIR__ . '/flyntPremium/functions.php')) {
-        require_once __DIR__ . '/flyntPremium/functions.php';
-    }
 }
diff --git a/webpack.config.js b/webpack.config.js
index d116c757c..d0319de56 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,5 +1,4 @@
 const path = require('path')
-const fs = require('fs')
 const webpack = require('webpack')
 const TerserPlugin = require('terser-webpack-plugin')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
@@ -110,7 +109,7 @@ const webpackConfig = {
     }
   }
 }
-const premiumComponentsExist = fs.existsSync('flyntPremium/Components')
+
 webpackConfig.plugins = webpackConfig.plugins || []
 if (production) {
   webpackConfig.plugins.push(
@@ -118,8 +117,7 @@ if (production) {
       PRODUCTION: JSON.stringify(true),
       'process.env': {
         'NODE_ENV': JSON.stringify('production')
-      },
-      PREMIUM_COMPONENTS_EXIST: JSON.stringify(premiumComponentsExist)
+      }
     })
   )
   webpackConfig.plugins.push(new webpack.optimize.AggressiveMergingPlugin())
@@ -137,8 +135,7 @@ if (production) {
       PRODUCTION: JSON.stringify(false),
       'process.env': {
         'NODE_ENV': JSON.stringify('development')
-      },
-      PREMIUM_COMPONENTS_EXIST: JSON.stringify(premiumComponentsExist)
+      }
     })
   )
 }