mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 03:39:55 +00:00
factory again
This commit is contained in:
parent
209e049893
commit
9aa0af4f9c
@ -3,25 +3,22 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
let config = {
|
||||
port: 8080,
|
||||
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
|
||||
exports.configFactory = function (options) {
|
||||
return Object.assign({
|
||||
port: 8080,
|
||||
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
|
||||
|
||||
language: "en",
|
||||
timeFormat: 24,
|
||||
units: "metric",
|
||||
electronOptions: {
|
||||
webPreferences: {
|
||||
nodeIntegration: true,
|
||||
enableRemoteModule: true,
|
||||
contextIsolation: false
|
||||
}
|
||||
},
|
||||
language: "en",
|
||||
timeFormat: 24,
|
||||
units: "metric",
|
||||
electronOptions: {
|
||||
webPreferences: {
|
||||
nodeIntegration: true,
|
||||
enableRemoteModule: true,
|
||||
contextIsolation: false
|
||||
}
|
||||
},
|
||||
|
||||
modules: []
|
||||
modules: []
|
||||
}, options);
|
||||
};
|
||||
|
||||
/*************** DO NOT EDIT THE LINE BELOW ***************/
|
||||
if (typeof module !== "undefined") {
|
||||
module.exports = config;
|
||||
}
|
||||
|
@ -3,8 +3,9 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
let config = require("./default.js");
|
||||
config.ipWhitelist = [];
|
||||
const config = require("./default.js").configFactory({
|
||||
ipWhitelist: []
|
||||
});
|
||||
|
||||
/*************** DO NOT EDIT THE LINE BELOW ***************/
|
||||
if (typeof module !== "undefined") {
|
||||
|
11
tests/configs/env.js
Normal file
11
tests/configs/env.js
Normal file
@ -0,0 +1,11 @@
|
||||
/* Magic Mirror Test config sample environment
|
||||
*
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const config = require("./default.js").configFactory();
|
||||
|
||||
/*************** DO NOT EDIT THE LINE BELOW ***************/
|
||||
if (typeof module !== "undefined") {
|
||||
module.exports = config;
|
||||
}
|
@ -3,9 +3,7 @@
|
||||
* By rejas
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
modules: [
|
||||
{
|
||||
module: "alert",
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rejas
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -5,9 +5,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rejas
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Sergey Morozov
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Sergey Morozov
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
modules: [
|
||||
{
|
||||
module: "clock",
|
||||
|
@ -2,9 +2,7 @@
|
||||
*
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
modules: [
|
||||
{
|
||||
module: "clock",
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Sergey Morozov
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Johan Hammar
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../../default.js").configFactory({
|
||||
language: "es",
|
||||
timeFormat: 12,
|
||||
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../../default.js").configFactory({
|
||||
language: "es",
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../../default.js").configFactory({
|
||||
language: "es",
|
||||
timeFormat: 12,
|
||||
|
||||
|
@ -4,9 +4,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../../default.js").configFactory({
|
||||
language: "es",
|
||||
timeFormat: 12,
|
||||
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rejas
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rejas
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../default.js");
|
||||
|
||||
let config = configFacory({
|
||||
let config = require("../default.js").configFactory({
|
||||
modules: [
|
||||
{
|
||||
module: "helloworld",
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
modules: [
|
||||
{
|
||||
module: "helloworld",
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
modules: [
|
||||
{
|
||||
module: "helloworld",
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -2,9 +2,7 @@
|
||||
*
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -2,9 +2,7 @@
|
||||
*
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../default.js").configFactory({
|
||||
modules:
|
||||
// Using exotic content. This is why don't accept go to JSON configuration file
|
||||
(function () {
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By rejas https://github.com/rejas
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
modules: [
|
||||
{
|
||||
module: "compliments",
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By fewieden https://github.com/fewieden
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By fewieden https://github.com/fewieden
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
modules: [
|
||||
{
|
||||
module: "weather",
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By fewieden https://github.com/fewieden
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
units: "imperial",
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By fewieden https://github.com/fewieden
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By fewieden https://github.com/fewieden
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
timeFormat: 12,
|
||||
|
||||
modules: [
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By rejas
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("../../default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("../../default.js").configFactory({
|
||||
units: "imperial",
|
||||
|
||||
modules: [
|
||||
|
@ -3,8 +3,9 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
let config = require("./default.js");
|
||||
config.ipWhitelist = ["x.x.x.x"];
|
||||
const config = require("./default.js").configFactory({
|
||||
ipWhitelist: ["x.x.x.x"]
|
||||
});
|
||||
|
||||
/*************** DO NOT EDIT THE LINE BELOW ***************/
|
||||
if (typeof module !== "undefined") {
|
||||
|
@ -3,8 +3,9 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
let config = require("./default.js");
|
||||
config.port = 8090;
|
||||
const config = require("./default.js").configFactory({
|
||||
port: 8090
|
||||
});
|
||||
|
||||
/*************** DO NOT EDIT THE LINE BELOW ***************/
|
||||
if (typeof module !== "undefined") {
|
||||
|
@ -3,9 +3,7 @@
|
||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||
* MIT Licensed.
|
||||
*/
|
||||
const configFactory = require("./default.js");
|
||||
|
||||
const config = configFacory({
|
||||
const config = require("./default.js").configFactory({
|
||||
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.10.1"]
|
||||
});
|
||||
|
||||
|
@ -7,7 +7,7 @@ describe("Development console tests", function () {
|
||||
|
||||
beforeAll(function () {
|
||||
// Set config sample for use in test
|
||||
process.env.MM_CONFIG_FILE = "tests/configs/default.js";
|
||||
process.env.MM_CONFIG_FILE = "tests/configs/env.js";
|
||||
});
|
||||
|
||||
describe("Without 'dev' commandline argument", function () {
|
||||
|
@ -8,7 +8,7 @@ describe("Electron app environment", function () {
|
||||
|
||||
beforeAll(function () {
|
||||
// Set config sample for use in test
|
||||
process.env.MM_CONFIG_FILE = "tests/configs/default.js";
|
||||
process.env.MM_CONFIG_FILE = "tests/configs/env.js";
|
||||
});
|
||||
|
||||
beforeEach(function () {
|
||||
|
@ -10,7 +10,7 @@ describe("Vendors", function () {
|
||||
let app = null;
|
||||
|
||||
beforeAll(function () {
|
||||
process.env.MM_CONFIG_FILE = "tests/configs/default.js";
|
||||
process.env.MM_CONFIG_FILE = "tests/configs/env.js";
|
||||
return helpers
|
||||
.startApplication({
|
||||
args: ["js/electron.js"]
|
||||
|
Loading…
x
Reference in New Issue
Block a user