@smart-link/auto-config - npm Package Compare versions

Comparing version 0.5.0 to 0.6.0

autoConfig.js

@@ -23,3 +23,3 @@ "use strict";
 function autoConfigI18nInConfig(config) {
-  var context; // config no i18n context = require.context('__appPath/config/i18n', false, /\.js$/);
+  var context; // config no i18n context = require.context('__appPath/config/i18n', false, /\.[jt]sx?$/);
 
@@ -35,3 +35,3 @@ if (!context) {
 function autoConfigI18nInAssets(config) {
-  var context; // assets no i18n context = require.context('__appPath/assets/i18n', false, /\.js$/);
+  var context; // assets no i18n context = require.context('__appPath/assets/i18n', false, /\.[jt]sx?$/);
 
@@ -60,3 +60,7 @@ if (!context) {
 
-    config.i18n.i18nResources = i18nResources;
+    config.i18n.i18nResources = i18nResources; // set loadType
+
+    config.i18n.i18nResources.forEach(function (resource) {
+      resource.loadType = 'app';
+    });
   }
@@ -68,3 +72,3 @@ }
   var reducers = {};
-  var importSlices = (0, _importAll["default"])(require.context('__appPath', true, /slice\.js$/), 'reducer');
+  var importSlices = (0, _importAll["default"])(require.context('__appPath', true, /\.slice\.[tj]sx?$/), 'reducer');
   Object.keys(importSlices).forEach(function (key) {
@@ -79,3 +83,3 @@ var reducerName = key.substr(0, key.indexOf('.'));
   });
-  var importReducers = (0, _importAll["default"])(require.context('__appPath', true, /reducer\.js$/));
+  var importReducers = (0, _importAll["default"])(require.context('__appPath', true, /\.reducer\.[tj]sx?$/));
   Object.keys(importReducers).forEach(function (key) {
@@ -110,3 +114,3 @@ var reducerName = key.substr(0, key.indexOf('.'));
 function autoConfigIcons(config) {
-  var context; // assets no icons context = require.context('__appPath/assets/icons', false, /\.(js|jsx)$/);
+  var context; // assets no icons context = require.context('__appPath/assets/icons', false, /\.[jt]sx?$/);
 
@@ -132,2 +136,17 @@ if (!context) {
 
+function autoConfigApi(config) {
+  var context; // no apis context = require.context('__appPath/apis', false, /api\.[jt]sx?$/);
+
+  if (!context) {
+    return;
+  }
+
+  var importApi = (0, _importAll["default"])(context);
+
+  if (importApi && Object.values(importApi).length > 0) {
+    // eslint-disable-next-line no-param-reassign,prefer-destructuring
+    config.api = Object.values(importApi)[0];
+  }
+}
+
 function autoConfig() {
@@ -137,3 +156,3 @@ var config = {
   };
-  var context; // no config context = require.context('__appPath/config', false, /\.js$/);
+  var context; // no config context = require.context('__appPath/config', false, /\.[jt]sx?$/);
 
@@ -153,2 +172,3 @@ if (context) {
   autoConfigIcons(config);
+  autoConfigApi(config);
   (0, _starter["default"])(config);
@@ -155,0 +175,0 @@

esm/autoConfig.js

@@ -9,3 +9,3 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 function autoConfigI18nInConfig(config) {
-  var context; // config no i18n context = require.context('__appPath/config/i18n', false, /\.js$/);
+  var context; // config no i18n context = require.context('__appPath/config/i18n', false, /\.[jt]sx?$/);
 
@@ -21,3 +21,3 @@ if (!context) {
 function autoConfigI18nInAssets(config) {
-  var context; // assets no i18n context = require.context('__appPath/assets/i18n', false, /\.js$/);
+  var context; // assets no i18n context = require.context('__appPath/assets/i18n', false, /\.[jt]sx?$/);
 
@@ -46,3 +46,7 @@ if (!context) {
 
-    config.i18n.i18nResources = i18nResources;
+    config.i18n.i18nResources = i18nResources; // set loadType
+
+    config.i18n.i18nResources.forEach(function (resource) {
+      resource.loadType = 'app';
+    });
   }
@@ -54,3 +58,3 @@ }
   var reducers = {};
-  var importSlices = importAll(require.context('__appPath', true, /slice\.js$/), 'reducer');
+  var importSlices = importAll(require.context('__appPath', true, /\.slice\.[tj]sx?$/), 'reducer');
   Object.keys(importSlices).forEach(function (key) {
@@ -65,3 +69,3 @@ var reducerName = key.substr(0, key.indexOf('.'));
   });
-  var importReducers = importAll(require.context('__appPath', true, /reducer\.js$/));
+  var importReducers = importAll(require.context('__appPath', true, /\.reducer\.[tj]sx?$/));
   Object.keys(importReducers).forEach(function (key) {
@@ -96,3 +100,3 @@ var reducerName = key.substr(0, key.indexOf('.'));
 function autoConfigIcons(config) {
-  var context; // assets no icons context = require.context('__appPath/assets/icons', false, /\.(js|jsx)$/);
+  var context; // assets no icons context = require.context('__appPath/assets/icons', false, /\.[jt]sx?$/);
 
@@ -118,2 +122,17 @@ if (!context) {
 
+function autoConfigApi(config) {
+  var context; // no apis context = require.context('__appPath/apis', false, /api\.[jt]sx?$/);
+
+  if (!context) {
+    return;
+  }
+
+  var importApi = importAll(context);
+
+  if (importApi && Object.values(importApi).length > 0) {
+    // eslint-disable-next-line no-param-reassign,prefer-destructuring
+    config.api = Object.values(importApi)[0];
+  }
+}
+
 function autoConfig() {
@@ -123,3 +142,3 @@ var config = {
   };
-  var context; // no config context = require.context('__appPath/config', false, /\.js$/);
+  var context; // no config context = require.context('__appPath/config', false, /\.[jt]sx?$/);
 
@@ -139,2 +158,3 @@ if (context) {
   autoConfigIcons(config);
+  autoConfigApi(config);
   autoConfigStarter(config);
@@ -141,0 +161,0 @@

esm/importAll.js

@@ -7,3 +7,3 @@ export default function importAll(context) {
 
-    if (fileName === 'index.js') {
+    if (/^index\.[jt]sx?$/.test(fileName)) {
       return;
@@ -10,0 +10,0 @@ }

esm/index.js

@@ -1,2 +0,2 @@
-/** @license SmartLink-UI v0.5.0
+/** @license SmartLink-UI v0.6.0
  *
@@ -3,0 +3,0 @@ * This source code is licensed under the MIT license found in the

esm/routes/autoConfigRoutes.js

@@ -5,3 +5,3 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 function autoConfigRoutes() {
-  var importRoutes = importAll(require.context('__appPath', true, /routes\.js$/));
+  var importRoutes = importAll(require.context('__appPath', true, /\.routes\.[jt]sx?$/));
   var routes = [];
@@ -8,0 +8,0 @@ Object.values(importRoutes).forEach(function (route) {

esm/starter/autoConfigStarter.js

@@ -13,7 +13,9 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 
-    starterConfig.i18nResources && configI18n(config, starterConfig.i18nResources);
-    starterConfig.reducer && configReducer(config, starterConfig.starterKey, starterConfig.reducer);
-    starterConfig.initAction && configInitAction(config, starterConfig.starterKey, starterConfig.initAction);
-    starterConfig.routes && configRoutes(config, starterConfig.routes);
-    starterConfig.icons && configIcons(config, starterConfig.icons);
+    if (!config.starters) {
+      config.starters = {};
+    }
+
+    config.starters[starterConfig.starterKey] = starterConfig;
+    mergeToConfig(starterConfig, config);
+    starterConfig.initActions && configInitActions(config, starterConfig.starterKey, starterConfig.initActions);
     starterConfig.afterConfigInit && starterConfig.afterConfigInit(config);
@@ -23,10 +25,23 @@ });
 
+function mergeToConfig(starterConfig, config) {
+  starterConfig.i18nResources && configI18n(config, starterConfig.i18nResources);
+  starterConfig.reducer && configReducer(config, starterConfig.starterKey, starterConfig.reducer);
+  starterConfig.routes && configRoutes(config, starterConfig.routes);
+  starterConfig.icons && configIcons(config, starterConfig.icons);
+  starterConfig.appWrapper && configAppWrapper(config, starterConfig.appWrapper);
+}
+
 function configI18n(config, i18nResources) {
+  var _config$i18n$i18nReso;
+
   if (!config.i18n) {
     // eslint-disable-next-line no-param-reassign
     config.i18n = {};
-  } // eslint-disable-next-line no-param-reassign
+  }
 
+  i18nResources.forEach(function (resource) {
+    resource.loadType = 'starter';
+  }); // eslint-disable-next-line no-param-reassign
 
-  config.i18n.i18nResources = [].concat(_toConsumableArray(config.i18n.i18nResources), _toConsumableArray(i18nResources));
+  config.i18n.i18nResources = [].concat(_toConsumableArray((_config$i18n$i18nReso = config.i18n.i18nResources) !== null && _config$i18n$i18nReso !== void 0 ? _config$i18n$i18nReso : []), _toConsumableArray(i18nResources));
 }
@@ -54,3 +69,13 @@
 
-function configInitAction(config, starterKey, initAction) {
+function configAppWrapper(config, appWrapper) {
+  if (!config.appWrappers) {
+    // eslint-disable-next-line no-param-reassign
+    config.appWrappers = [];
+  } // eslint-disable-next-line no-param-reassign
+
+
+  config.appWrappers.push(appWrapper);
+}
+
+function configInitActions(config, starterKey, initActions) {
   if (!config.starterInitActions) {
@@ -62,3 +87,3 @@ // eslint-disable-next-line no-param-reassign
 
-  config.starterInitActions[starterKey] = initAction;
+  config.starterInitActions[starterKey] = initActions;
 }

importAll.js

@@ -14,3 +14,3 @@ "use strict";
 
-    if (fileName === 'index.js') {
+    if (/^index\.[jt]sx?$/.test(fileName)) {
       return;
@@ -17,0 +17,0 @@ }

index.js

@@ -1,2 +0,2 @@
-/** @license SmartLink-UI v0.5.0
+/** @license SmartLink-UI v0.6.0
  *
@@ -3,0 +3,0 @@ * This source code is licensed under the MIT license found in the

package.json

 {
   "name": "@smart-link/auto-config",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "private": false,
@@ -28,3 +28,5 @@ "main": "./index.js",
     "redux": "^4.0.5"
-  }
+  },
+  "sideEffects": true,
+  "typings": "./index.d.ts"
 }

routes/autoConfigRoutes.js

@@ -15,3 +15,3 @@ "use strict";
 function autoConfigRoutes() {
-  var importRoutes = (0, _importAll["default"])(require.context('__appPath', true, /routes\.js$/));
+  var importRoutes = (0, _importAll["default"])(require.context('__appPath', true, /\.routes\.[jt]sx?$/));
   var routes = [];
@@ -18,0 +18,0 @@ Object.values(importRoutes).forEach(function (route) {

routes/package.json

 {
+    "sideEffects": false,
     "module": "../esm/routes/index.js"
 }

starter/autoConfigStarter.js

@@ -25,7 +25,9 @@ "use strict";
 
-    starterConfig.i18nResources && configI18n(config, starterConfig.i18nResources);
-    starterConfig.reducer && configReducer(config, starterConfig.starterKey, starterConfig.reducer);
-    starterConfig.initAction && configInitAction(config, starterConfig.starterKey, starterConfig.initAction);
-    starterConfig.routes && configRoutes(config, starterConfig.routes);
-    starterConfig.icons && configIcons(config, starterConfig.icons);
+    if (!config.starters) {
+      config.starters = {};
+    }
+
+    config.starters[starterConfig.starterKey] = starterConfig;
+    mergeToConfig(starterConfig, config);
+    starterConfig.initActions && configInitActions(config, starterConfig.starterKey, starterConfig.initActions);
     starterConfig.afterConfigInit && starterConfig.afterConfigInit(config);
@@ -35,10 +37,23 @@ });
 
+function mergeToConfig(starterConfig, config) {
+  starterConfig.i18nResources && configI18n(config, starterConfig.i18nResources);
+  starterConfig.reducer && configReducer(config, starterConfig.starterKey, starterConfig.reducer);
+  starterConfig.routes && configRoutes(config, starterConfig.routes);
+  starterConfig.icons && configIcons(config, starterConfig.icons);
+  starterConfig.appWrapper && configAppWrapper(config, starterConfig.appWrapper);
+}
+
 function configI18n(config, i18nResources) {
+  var _config$i18n$i18nReso;
+
   if (!config.i18n) {
     // eslint-disable-next-line no-param-reassign
     config.i18n = {};
-  } // eslint-disable-next-line no-param-reassign
+  }
 
+  i18nResources.forEach(function (resource) {
+    resource.loadType = 'starter';
+  }); // eslint-disable-next-line no-param-reassign
 
-  config.i18n.i18nResources = [].concat((0, _toConsumableArray2["default"])(config.i18n.i18nResources), (0, _toConsumableArray2["default"])(i18nResources));
+  config.i18n.i18nResources = [].concat((0, _toConsumableArray2["default"])((_config$i18n$i18nReso = config.i18n.i18nResources) !== null && _config$i18n$i18nReso !== void 0 ? _config$i18n$i18nReso : []), (0, _toConsumableArray2["default"])(i18nResources));
 }
@@ -66,3 +81,13 @@
 
-function configInitAction(config, starterKey, initAction) {
+function configAppWrapper(config, appWrapper) {
+  if (!config.appWrappers) {
+    // eslint-disable-next-line no-param-reassign
+    config.appWrappers = [];
+  } // eslint-disable-next-line no-param-reassign
+
+
+  config.appWrappers.push(appWrapper);
+}
+
+function configInitActions(config, starterKey, initActions) {
   if (!config.starterInitActions) {
@@ -74,3 +99,3 @@ // eslint-disable-next-line no-param-reassign
 
-  config.starterInitActions[starterKey] = initAction;
+  config.starterInitActions[starterKey] = initActions;
 }

starter/package.json

 {
+    "sideEffects": false,
     "module": "../esm/starter/index.js"
 }

No alert changes

Improved metrics

Total package byte prevSize

22326

increased by14.63%

Number of package files

21

increased by5%

Lines of code

508

increased by15.98%

No dependency changes