spinjs - npm Package Compare versions

Comparing version 0.4.175 to 0.4.176

lib/ConfigReader.js

@@ -27,2 +27,18 @@ "use strict";
 var Stack_1 = require("./Stack");
+var upDirs_1 = require("./upDirs");
+var getProjectRoot = function (builder) {
+    var pkgPathList = upDirs_1.default(builder.require.cwd, 'package.json');
+    var projectRoot;
+    for (var _i = 0, pkgPathList_1 = pkgPathList; _i < pkgPathList_1.length; _i++) {
+        var pkg = pkgPathList_1[_i];
+        if (fs.existsSync(pkg)) {
+            try {
+                JSON.parse(fs.readFileSync(pkg, 'utf8'));
+                projectRoot = path.dirname(pkg);
+            }
+            catch (e) { }
+        }
+    }
+    return projectRoot;
+};
 var ConfigReader = (function () {
@@ -96,2 +112,3 @@ function ConfigReader(spin, plugins) {
             builder.minify = typeof builder.minify !== 'undefined' ? builder.minify : true;
+            builder.projectRoot = getProjectRoot(builder);
             builder.cache =
@@ -98,0 +115,0 @@ typeof builder.cache === 'string' && builder.cache !== 'auto'

lib/executor.js

@@ -183,2 +183,3 @@ "use strict";
 var startClientWebpack = function (hasBackend, spin, builder) {
+    var _a;
     var webpack = builder.require('webpack');
@@ -188,3 +189,5 @@ var config = builder.config;
     var VirtualModules = builder.require('webpack-virtual-modules');
-    var clientVirtualModules = new VirtualModules({ 'node_modules/backend_reload.js': '' });
+    var clientVirtualModules = new VirtualModules((_a = {},
+        _a[path.join(builder.projectRoot, 'node_modules', 'backend_reload.js')] = '',
+        _a));
     config.plugins.push(clientVirtualModules);
@@ -220,7 +223,7 @@ frontendVirtualModules.push(clientVirtualModules);
 var backendReloadCount = 0;
-var increaseBackendReloadCount = function () {
+var increaseBackendReloadCount = function (builder) {
     backendReloadCount++;
     for (var _i = 0, frontendVirtualModules_1 = frontendVirtualModules; _i < frontendVirtualModules_1.length; _i++) {
         var virtualModules = frontendVirtualModules_1[_i];
-        virtualModules.writeModule('node_modules/backend_reload.js', "var count = " + backendReloadCount + ";\n");
+        virtualModules.writeModule(path.join(builder.projectRoot, 'node_modules', 'backend_reload.js'), "var count = " + backendReloadCount + ";\n");
     }
@@ -1187,3 +1190,3 @@ };
                 debug("Increase backend reload count in " + builder_1.id);
-                increaseBackendReloadCount();
+                increaseBackendReloadCount(builder_1);
             }
@@ -1190,0 +1193,0 @@ });

package.json

 {
   "name": "spinjs",
-  "version": "0.4.175",
+  "version": "0.4.176",
   "main": "lib/index.js",
@@ -5,0 +5,0 @@ "scripts": {

src/ConfigReader.ts

@@ -7,3 +7,3 @@ import * as fs from 'fs';
 import { ConfigPlugin } from './ConfigPlugin';
-import createRequire, { RequireFunction } from './createRequire';
+import createRequire from './createRequire';
 import EnhancedError from './EnhancedError';
@@ -13,3 +13,18 @@ import inferConfig from './inferConfig';
 import Stack from './Stack';
+import upDirs from './upDirs';
 
+const getProjectRoot = (builder: Builder) => {
+  const pkgPathList = upDirs(builder.require.cwd, 'package.json');
+  let projectRoot;
+  for (const pkg of pkgPathList) {
+    if (fs.existsSync(pkg)) {
+      try {
+        JSON.parse(fs.readFileSync(pkg, 'utf8'));
+        projectRoot = path.dirname(pkg);
+      } catch (e) {}
+    }
+  }
+  return projectRoot;
+};
+
 export default class ConfigReader {
@@ -87,2 +102,3 @@ private spin: Spin;
       builder.minify = typeof builder.minify !== 'undefined' ? builder.minify : true;
+      builder.projectRoot = getProjectRoot(builder);
       builder.cache =
@@ -89,0 +105,0 @@ typeof builder.cache === 'string' && builder.cache !== 'auto'

src/executor.ts

@@ -169,3 +169,5 @@ import { exec, spawn } from 'child_process';
   const VirtualModules = builder.require('webpack-virtual-modules');
-  const clientVirtualModules = new VirtualModules({ 'node_modules/backend_reload.js': '' });
+  const clientVirtualModules = new VirtualModules({
+    [path.join(builder.projectRoot, 'node_modules', 'backend_reload.js')]: ''
+  });
   config.plugins.push(clientVirtualModules);
@@ -198,6 +200,9 @@ frontendVirtualModules.push(clientVirtualModules);
 let backendReloadCount = 0;
-const increaseBackendReloadCount = () => {
+const increaseBackendReloadCount = builder => {
   backendReloadCount++;
   for (const virtualModules of frontendVirtualModules) {
-    virtualModules.writeModule('node_modules/backend_reload.js', `var count = ${backendReloadCount};\n`);
+    virtualModules.writeModule(
+      path.join(builder.projectRoot, 'node_modules', 'backend_reload.js'),
+      `var count = ${backendReloadCount};\n`
+    );
   }
@@ -1162,3 +1167,3 @@ };
         debug(`Increase backend reload count in ${builder.id}`);
-        increaseBackendReloadCount();
+        increaseBackendReloadCount(builder);
       }
@@ -1165,0 +1170,0 @@ });

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

463845

increased by0.41%

Lines of code

7770

increased by0.52%

No dependency changes