wp-blank-scripts 2.6.11 → 2.7.0

package/lib/deployProject.js

@@ -278,6 +278,7 @@ module.exports = async (selectOptions, callbacks) => {
 
   if (options.sql) {
     if (isCI()) {
+      console.log(options);
       return deploySQLFromCI(options);
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wp-blank-scripts",
-  "version": "2.6.11",
+  "version": "2.7.0",
   "description": "Personal Wordpress Scripts",
   "main": "index.js",
   "bin": {
@@ -66,6 +66,7 @@
     "lint-staged": "^9.2.5",
     "mini-css-extract-plugin": "^0.9.0",
     "mysql": "^2.13.0",
+    "node-fetch": "2",
     "node-sass": "^4.14.1",
     "normalize.css": "^8.0.1",
     "opn": "^6.0.0",

package/utils/deploySQLFromCI.js

@@ -1,14 +1,16 @@
 const fs = require('fs');
+const fetch = require('node-fetch');
 
 const getMostRecentSqlFile = require('./getMostRecentSqlFile');
 const getSettings = require('./projectSettings');
+const replaceSQL = require('../utils/replaceSQL');
 
-const DEPLOY_URL = 'https://57e5-60-241-189-248.au.ngrok.io/prod/deploy';
+const DEPLOY_URL = 'https://a64vpm7gjh4nzgmrys6vmltsva0dydvc.lambda-url.ap-southeast-2.on.aws/';
 
 async function deploySQLFromCI(options) {
-  const { default: fetch } = await import('node-fetch');
   const file = getMostRecentSqlFile(true);
-  console.log({ file, repo });
+
+  console.log({ file });
 
   await replaceSQL({
     environmentIn: 'local',
@@ -27,8 +29,6 @@ async function deploySQLFromCI(options) {
   });
 
   console.log(response.status);
-  const body = await response.json();
-  console.log(body);
 }
 
 module.exports = deploySQLFromCI;

package/webpack.base.config.js

@@ -127,10 +127,16 @@ function makeBaseConfig(options) {
 
   const mainStyleVariables = path.join(sourcePath, 'assets', 'css', 'utils', 'variables.scss');
 
-  let sassVariables;
+  let sassVariables = `$env: ${process.env.NODE_ENV};`;
+
+  for (const key of Object.keys(process.env)) {
+    if (key.startsWith('VIVO_')) {
+      sassVariables += `$${key.replace('VIVO_', '').toLowerCase()}: ${process.env[key]};`;
+    }
+  }
 
   if (fs.existsSync(mainStyleVariables)) {
-    sassVariables = fs.readFileSync(mainStyleVariables, 'utf8');
+    sassVariables += fs.readFileSync(mainStyleVariables, 'utf8');
   }
 
   let loaderOverrides = {};