From 72ee847702bdd78ad3e7ad5dbff4656837681065 Mon Sep 17 00:00:00 2001 From: Kamal Reddy Date: Thu, 11 May 2017 22:28:51 +0530 Subject: [PATCH 1/2] changed to absolute paths --- .gitignore | 1 + index.js | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index ece679c..863b848 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ npm-debug.log /node_modules /example/installed /example/data +.idea/ diff --git a/index.js b/index.js index 8806477..a6baf6e 100644 --- a/index.js +++ b/index.js @@ -146,7 +146,7 @@ class ArchaeServer extends EventEmitter { const _getOldCerts = () => { const _getCertFile = fileName => { try { - return fs.readFileSync(path.join(dirname, cryptoDirectory, 'cert', fileName), 'utf8'); + return fs.readFileSync(path.join(cryptoDirectory, 'cert', fileName), 'utf8'); } catch(err) { if (err.code !== 'ENOENT') { console.warn(err); @@ -174,7 +174,7 @@ class ArchaeServer extends EventEmitter { commonName: hostname, }); - const certDirectory = path.join(dirname, cryptoDirectory, 'cert'); + const certDirectory = path.join(cryptoDirectory, 'cert'); const _makeCertDirectory = () => { mkdirp.sync(certDirectory); }; @@ -463,7 +463,7 @@ class ArchaeServer extends EventEmitter { if (!err) { if (fileName) { const {dirname, installDirectory} = this; - const modulePath = path.join(dirname, installDirectory, 'plugins', pluginName, 'node_modules', pluginName, fileName); + const modulePath = path.join( installDirectory, 'plugins', pluginName, 'node_modules', pluginName, fileName); const moduleInstance = require(modulePath); this.plugins[pluginName] = moduleInstance; @@ -672,7 +672,7 @@ class ArchaeServer extends EventEmitter { // user public if (publicDirectory) { - app.use('/', express.static(path.join(dirname, publicDirectory))); + app.use('/', express.static(publicDirectory)); } class UpgradeEvent { @@ -735,7 +735,7 @@ class ArchaeServer extends EventEmitter { // archae bundles const _serveJsFile = (req, res, {module, build = null}) => { - const srcPath = path.join(dirname, installDirectory, 'plugins', module, 'node_modules', module, '.archae', (build ? ('build/' + build) : 'client') + '.js'); + const srcPath = path.join(installDirectory, 'plugins', module, 'node_modules', module, '.archae', (build ? ('build/' + build) : 'client') + '.js'); fs.readFile(srcPath, (err, d) => { if (!err) { @@ -1068,7 +1068,7 @@ class ArchaePather { getInstalledModulePath(moduleName) { const {dirname, installDirectory} = this; - return path.join(dirname, installDirectory, 'plugins', moduleName, 'node_modules', moduleName); + return path.join( installDirectory, 'plugins', moduleName, 'node_modules', moduleName); } getLocalModulePath(module) { @@ -1120,7 +1120,7 @@ class ArchaeInstaller { addModules(modules, moduleNames, force, cb) { const {dirname, installDirectory, pather} = this; - const _getInstalledFlagFilePath = moduleName => path.join(dirname, installDirectory, 'plugins', moduleName, 'node_modules', moduleName, '.archae', 'installed.txt'); + const _getInstalledFlagFilePath = moduleName => path.join(installDirectory, 'plugins', moduleName, 'node_modules', moduleName, '.archae', 'installed.txt'); const _writeFile = (p, d) => new Promise((accept, reject) => { mkdirp(path.dirname(p), err => { if (!err) { @@ -1167,7 +1167,7 @@ class ArchaeInstaller { const moduleName = moduleNames[index]; const _ensureNodeModules = (module, moduleName) => new Promise((accept, reject) => { - mkdirp(path.join(dirname, installDirectory, 'plugins', moduleName, 'node_modules'), err => { + mkdirp(path.join( installDirectory, 'plugins', moduleName, 'node_modules'), err => { if (!err) { accept(); } else { @@ -1186,11 +1186,11 @@ class ArchaeInstaller { const npmInstall = child_process.spawn( npmCommands.install[0], npmCommands.install.slice(1).concat([ - '--cache-folder', path.join(dirname, installDirectory, 'caches', moduleName), + '--cache-folder', path.join(installDirectory, 'caches', moduleName), modulePath, ]), { - cwd: path.join(dirname, installDirectory, 'plugins', moduleName), + cwd: path.join( installDirectory, 'plugins', moduleName), } ); npmInstall.stdout.pipe(process.stdout); @@ -1211,8 +1211,8 @@ class ArchaeInstaller { pather.getPluginClient(moduleName, (err, clientFileName) => { if (!err) { if (typeof clientFileName === 'string') { - const srcPath = path.join(dirname, installDirectory, 'plugins', moduleName, 'node_modules', moduleName, clientFileName); - const dstPath = path.join(dirname, installDirectory, 'plugins', moduleName, 'node_modules', moduleName, '.archae', 'client.js'); + const srcPath = path.join(installDirectory, 'plugins', moduleName, 'node_modules', moduleName, clientFileName); + const dstPath = path.join(installDirectory, 'plugins', moduleName, 'node_modules', moduleName, '.archae', 'client.js'); return _requestRollup(srcPath) .then(code => _writeFile(dstPath, code)) @@ -1231,8 +1231,8 @@ class ArchaeInstaller { if (!err) { if (Array.isArray(buildFileNames)) { Promise.all(buildFileNames.map(buildFileName => { - const srcPath = path.join(dirname, installDirectory, 'plugins', moduleName, 'node_modules', moduleName, buildFileName); - const dstPath = path.join(dirname, installDirectory, 'plugins', moduleName, 'node_modules', moduleName, '.archae', 'build', buildFileName); + const srcPath = path.join(installDirectory, 'plugins', moduleName, 'node_modules', moduleName, buildFileName); + const dstPath = path.join( installDirectory, 'plugins', moduleName, 'node_modules', moduleName, '.archae', 'build', buildFileName); return _requestRollup(srcPath) .then(code => _writeFile(dstPath, code)) From c5be7441aa5b2499648938a1a06b792bc3f9eb11 Mon Sep 17 00:00:00 2001 From: Kamal Reddy Date: Thu, 11 May 2017 22:46:57 +0530 Subject: [PATCH 2/2] updated package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1f3abfb..36eb5ad 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/modulesio/archae.git" + "url": "https://github.com/toomu/archae.git" }, "dependencies": { "autows": "0.0.5",