wp-blank-scripts 4.0.0-dev-2 → 4.0.0-dev-3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wp-blank-scripts",
-  "version": "4.0.0-dev-2",
+  "version": "4.0.0-dev-3",
   "description": "Personal Wordpress Scripts",
   "main": "index.js",
   "bin": {

package/webpack.base.config.js

@@ -139,15 +139,6 @@ function makeBaseConfig(options) {
     { from: 'wp-content', to: 'wp-content' },
   ];
 
-  // @TODO: temporary for development of blocks package
-  const includeBlocks = process.env.MASTER_BLOCKS;
-  const masterBlocks = [
-    {
-      from: path.join(process.cwd(), 'vendor/vivo-digital/vivo-master-blocks/dist'),
-      to: path.join(themePath, 'inc', 'vivo-master-blocks'),
-    },
-  ];
-
   let customFiles = [];
   if (typeof copyFiles === 'function') {
     customFiles = copyFiles({
@@ -159,21 +150,20 @@ function makeBaseConfig(options) {
     });
   }
 
-  const filesToCopy = [
-    ...sourceFiles,
-    ...envFiles,
-    ...wordpressFiles,
-    ...customFiles,
-    ...(includeBlocks ? masterBlocks : []),
-  ];
+  const filesToCopy = [...sourceFiles, ...envFiles, ...wordpressFiles, ...customFiles];
 
   // Admin entries
   const adminScripts = glob.sync(path.join(sourcePath, 'admin', '*.js'));
-
   const adminStyles = glob.sync(path.join(sourcePath, 'admin', '*.scss'));
   const mainStyleVariables = path.join(sourcePath, 'assets', 'css', 'utils', 'variables.scss'); //* Not sure if this is needed.
 
-  console.log(adminStyles);
+  // @TODO: should these be importable into JSX bundle instead? 🤔
+  const adminComponentStyles = [];
+  glob
+    .sync(path.join(sourcePath, 'admin', 'components', '***', '*.{scss,css}'))
+    .forEach((filePath) => {
+      adminComponentStyles.push(filePath);
+    });
 
   const blockJsonFiles = [];
 
@@ -220,7 +210,12 @@ function makeBaseConfig(options) {
     target: 'web',
     entry: {
       adminScripts: [...fxFiles.admin.js, ...blockJsonScripts, ...adminScripts],
-      'admin.style': [...fxFiles.admin.sass, ...blockJsonStyles, ...adminStyles],
+      'admin.style': [
+        ...fxFiles.admin.sass,
+        ...blockJsonStyles,
+        ...adminComponentStyles,
+        ...adminStyles,
+      ],
     },
     output: {
       path: buildPath,