kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity

Move and alias node_module.

Browse Source
This commit is contained in:
Michael Teeuw 2020-01-01 19:17:23 +01:00
parent 29f3ac065f
commit 04dde74572
6 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -59,12 +59,6 @@ Temporary Items
.directory .directory
.Trash-* .Trash-*
# Various Magic Mirror ignoramuses and anti-ignoramuses.
# Don't ignore the node_helper core module.
!/modules/node_helper
!/modules/node_helper/**
# Ignore all modules except the default modules. # Ignore all modules except the default modules.
/modules/** /modules/**
!/modules/default !/modules/default

5
js/app.js
View File

@ -11,8 +11,11 @@ var Utils = require(__dirname + "/utils.js");
var defaultModules = require(__dirname + "/../modules/default/defaultmodules.js"); var defaultModules = require(__dirname + "/../modules/default/defaultmodules.js");
var path = require("path"); var path = require("path");
// Alias modules mentioned in package.js under _moduleAliases.
require("module-alias/register");
// add timestamps in front of log messages // add timestamps in front of log messages
require('console-stamp')(console, 'HH:MM:ss.l'); require("console-stamp")(console, "HH:MM:ss.l");
// Get version number. // Get version number.
global.version = JSON.parse(fs.readFileSync("package.json", "utf8")).version; global.version = JSON.parse(fs.readFileSync("package.json", "utf8")).version;

2
modules/node_modules/node_helper/index.js → js/node_helper.js
View File

@ -5,7 +5,7 @@
* MIT Licensed. * MIT Licensed.
*/ */
var Class = require("../../../js/class.js"); var Class = require("./class.js");
var express = require("express"); var express = require("express");
var path = require("path"); var path = require("path");

5
package-lock.json generated
View File

@ -5635,6 +5635,11 @@
} }
} }
}, },
"module-alias": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.2.tgz",
"integrity": "sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q=="
},
"moment": { "moment": {
"version": "2.24.0", "version": "2.24.0",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",

4
package.json
View File

@ -67,6 +67,7 @@
"helmet": "^3.21.2", "helmet": "^3.21.2",
"iconv-lite": "latest", "iconv-lite": "latest",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"module-alias": "^2.2.2",
"moment": "latest", "moment": "latest",
"request": "^2.88.0", "request": "^2.88.0",
"rrule": "^2.6.2", "rrule": "^2.6.2",
@ -74,5 +75,8 @@
"simple-git": "^1.85.0", "simple-git": "^1.85.0",
"socket.io": "^2.1.1", "socket.io": "^2.1.1",
"valid-url": "latest" "valid-url": "latest"
},
"_moduleAliases": {
"node_helper" : "js/node_helper.js"
} }
} }

2
vendor/package-lock.json generated vendored
View File

@ -5,7 +5,7 @@
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": { "@fortawesome/fontawesome-free": {
"version": "5.6.3", "version": "5.6.3",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.6.3.tgz", "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.6.3.tgz",
"integrity": "sha512-s5PLdI9NYgjBvfrv6rhirPHlAHWx+Sfo/IjsAeiXYfmemC/GSjwsyz1wLnGPazbLPXWfk62ks980o9AmsxYUEQ==" "integrity": "sha512-s5PLdI9NYgjBvfrv6rhirPHlAHWx+Sfo/IjsAeiXYfmemC/GSjwsyz1wLnGPazbLPXWfk62ks980o9AmsxYUEQ=="
}, },
"a-sync-waterfall": { "a-sync-waterfall": {