Decouple link user dependencies

ribbitjs · Jan 25, 2019 · 306825a · 306825a
1 parent b9857c4
commit 306825a
Show file tree

Hide file tree

Showing 10 changed files with 1,068 additions and 100 deletions.
diff --git a/lib/commands/build.js b/lib/commands/build.js
@@ -1,14 +1,20 @@
 const { exec } = require('child_process');
+const path = require('path');
 const rimraf = require('rimraf');
+const { linkUserDeps, unlinkUserDeps } = require('../utils');
+
+const ribbitConfig = require(path.join(process.env.PWD, '/ribbit.config.js'));
 
 function build() {
+ linkUserDeps(ribbitConfig.dependencies, process.env.PWD);
  const child = exec(
  `npm run start-server ${process.env.PWD}`,
  {
  cwd: __dirname
  },
  () => {
  const TEMP_STATIC_FILE_FOLDER = `${__dirname}/../../dist`;
+ unlinkUserDeps(ribbitConfig.dependencies, process.env.PWD);
  rimraf(TEMP_STATIC_FILE_FOLDER, error => {
  if (error) process.stdout(error);
  process.kill(process.pid, 'SIGINT');

diff --git a/lib/utils/index.js b/lib/utils/index.js
@@ -1,5 +1,9 @@
+const prettifyJS = require('./prettifyJS');
+const linkUserDeps = require('./linkUserDeps');
+const unlinkUserDeps = require('./unlinkUserDeps');
+
 module.exports = {
- prettifyJS(obj) {
-  return JSON.parse(JSON.stringify(obj, null, 2));
- }
+ prettifyJS,
+ linkUserDeps,
+ unlinkUserDeps
 };
diff --git a/server/helpers/linkUserDeps.js → lib/utils/linkUserDeps.js b/server/helpers/linkUserDeps.js → lib/utils/linkUserDeps.js
@@ -1,8 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 
-const linkUserDeps = (ribbitConfig, appDir) => {
- const deps = ribbitConfig.dependencies;
+const linkUserDeps = (deps, appDir) => {
  for (const dep of deps) {
  const pathToRibbitDep = path.join(`${__dirname}/../../node_modules/${dep}`);
  const pathToUserDep = `${appDir}/node_modules/${dep}`;

diff --git a/lib/utils/prettifyJS.js b/lib/utils/prettifyJS.js
@@ -0,0 +1,4 @@
+function prettifyJS(obj) {
+ return JSON.parse(JSON.stringify(obj, null, 2));
+}
+module.exports = prettifyJS;
diff --git a/server/helpers/unlinkUserDeps.js → lib/utils/unlinkUserDeps.js b/server/helpers/unlinkUserDeps.js → lib/utils/unlinkUserDeps.js
@@ -1,8 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 
-const unlinkUserDeps = (ribbitConfig, appDir) => {
- const deps = ribbitConfig.dependencies;
+const unlinkUserDeps = (deps, appDir) => {
  for (const dep of deps) {
  const pathToRibbitDep = path.join(`${__dirname}/../../node_modules/${dep}`);
  if (fs.lstatSync(pathToRibbitDep).isSymbolicLink()) {