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

package/package.json

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

package/webpack.base.config.js

@@ -168,11 +168,13 @@ function makeBaseConfig(options) {
   ];
 
   // Admin entries
-  const adminScripts = glob.sync(path.join(sourcePath, 'assets', 'admin', '*.js'));
+  const adminScripts = glob.sync(path.join(sourcePath, 'admin', '*.js'));
 
-  const adminStyles = glob.sync(path.join(sourcePath, 'assets', 'admin', '*.scss'));
+  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);
+
   const blockJsonFiles = [];
 
   glob.sync(path.join(sourcePath, 'blocks', '***', '*.json')).forEach((filePath) => {
@@ -184,11 +186,11 @@ function makeBaseConfig(options) {
 
   blockJsonFiles.forEach((file) => {
     const content = JSON.parse(fs.readFileSync(file, 'utf-8'));
-    if (content.editorScript && fs.existsSync(content.editorScript)) {
+    if (content.editorScript) {
       const editorScript = `${path.dirname(file)}/${content.editorScript}`;
       blockJsonScripts.push(editorScript);
     }
-    if (content.editorStyle && fs.existsSync(content.editorStyle)) {
+    if (content.editorStyle) {
       const editorStyle = `${path.dirname(file)}/${content.editorStyle}`;
       blockJsonStyles.push(editorStyle);
     }

package/webpack.wp.config.js

@@ -27,11 +27,11 @@ function makeWpWebpackConfig() {
 
   blockJsonFiles.forEach((file) => {
     const content = JSON.parse(fs.readFileSync(file, 'utf-8'));
-    if (content.viewScript && fs.existsSync(content.viewScript)) {
+    if (content.viewScript) {
       const viewScript = `${path.dirname(file)}/${content.viewScript}`;
       blockJsonScripts.push(viewScript);
     }
-    if (content.style && fs.existsSync(content.style)) {
+    if (content.style) {
       const style = `${path.dirname(file)}/${content.style}`;
       blockJsonStyles.push(style);
     }
@@ -49,7 +49,7 @@ function makeWpWebpackConfig() {
   return {
     entry: {
       main: [...blockJsonScripts, ...entryScript],
-      style: [...blockJsonStyles, ...mainStyles],
+      style: [...blockJsonScripts, ...mainStyles],
     },
     plugins: [
       new MiniCssExtractPlugin({