Comparing version 0.4.14 to 0.4.15
@@ -8,9 +8,4 @@ "use strict"; | ||
ReactNativeWebPlugin.prototype.configure = function (builder, spin) { | ||
var _this = this; | ||
var stack = builder.stack; | ||
if (stack.hasAll(['react-native-web', 'server', 'webpack'])) { | ||
var nodeExternals = requireModule_1.default('webpack-node-externals'); | ||
var nodeExternalsFn_1 = nodeExternals({ | ||
whitelist: [/(^webpack|^react-native)/] | ||
}); | ||
builder.config = spin.merge(builder.config, { | ||
@@ -24,14 +19,11 @@ resolve: { | ||
builder.config.externals = function (context, request, callback) { | ||
return nodeExternalsFn_1(context, request, function () { | ||
var args = []; | ||
for (var _i = 0; _i < arguments.length; _i++) { | ||
args[_i] = arguments[_i]; | ||
} | ||
if (request.indexOf('react-native') >= 0) { | ||
return callback(null, 'commonjs ' + request + '-web'); | ||
} | ||
else { | ||
return callback.apply(_this, args); | ||
} | ||
}); | ||
if (request.indexOf('react-native') >= 0) { | ||
return callback(null, 'commonjs ' + request + '-web'); | ||
} | ||
else if (request.indexOf('webpack') < 0 && | ||
!request.startsWith('.') && | ||
requireModule_1.default.probe(request, context)) { | ||
return callback(null, 'commonjs ' + request); | ||
} | ||
callback(); | ||
}; | ||
@@ -38,0 +30,0 @@ } |
@@ -147,7 +147,8 @@ "use strict"; | ||
__filename: true | ||
}, externals: [ | ||
requireModule_1.default('webpack-node-externals')({ | ||
whitelist: [/(^webpack|^react-native)/] | ||
}) | ||
] }); | ||
}, externals: function (context, request, callback) { | ||
if (request.indexOf('webpack') < 0 && !request.startsWith('.') && requireModule_1.default.probe(request, context)) { | ||
return callback(null, 'commonjs ' + request); | ||
} | ||
callback(); | ||
} }); | ||
} | ||
@@ -154,0 +155,0 @@ else { |
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
var path = require("path"); | ||
var requireModule = function (name) { | ||
var modulePath = path.join(process.cwd(), name.indexOf('.') !== 0 ? 'node_modules' : '', name); | ||
return require(modulePath); | ||
var requireRelative = require("require-relative"); | ||
var requireModule = function (name, relativeTo) { | ||
return name.indexOf('.') !== 0 | ||
? requireRelative(name, relativeTo) | ||
: require(path.join(relativeTo || process.cwd(), name)); | ||
}; | ||
requireModule.resolve = function (name) { | ||
var modulePath = path.join(process.cwd(), name.indexOf('.') !== 0 ? 'node_modules' : '', name); | ||
return require.resolve(modulePath); | ||
requireModule.resolve = function (name, relativeTo) { | ||
return name.indexOf('.') !== 0 | ||
? requireRelative.resolve(name, relativeTo) | ||
: require.resolve(path.join(relativeTo || process.cwd(), name)); | ||
}; | ||
requireModule.probe = function (name) { | ||
requireModule.probe = function (name, relativeTo) { | ||
try { | ||
return requireModule.resolve(name); | ||
return requireModule.resolve(name, relativeTo); | ||
} | ||
@@ -16,0 +19,0 @@ catch (e) { |
{ | ||
"name": "spinjs", | ||
"version": "0.4.14", | ||
"version": "0.4.15", | ||
"scripts": { | ||
@@ -59,2 +59,3 @@ "clean": "rm -rf ./lib", | ||
"mkdirp": "^0.5.1", | ||
"require-relative": "^0.8.7", | ||
"source-list-map": "^2.0.0", | ||
@@ -61,0 +62,0 @@ "source-map-support": "^0.4.15", |
@@ -11,6 +11,2 @@ import { Builder } from '../Builder'; | ||
if (stack.hasAll(['react-native-web', 'server', 'webpack'])) { | ||
const nodeExternals = requireModule('webpack-node-externals'); | ||
const nodeExternalsFn = nodeExternals({ | ||
whitelist: [/(^webpack|^react-native)/] | ||
}); | ||
builder.config = spin.merge(builder.config, { | ||
@@ -23,10 +19,14 @@ resolve: { | ||
}); | ||
builder.config.externals = (context, request, callback) => { | ||
return nodeExternalsFn(context, request, (...args) => { | ||
if (request.indexOf('react-native') >= 0) { | ||
return callback(null, 'commonjs ' + request + '-web'); | ||
} else { | ||
return callback.apply(this, args); | ||
} | ||
}); | ||
if (request.indexOf('react-native') >= 0) { | ||
return callback(null, 'commonjs ' + request + '-web'); | ||
} else if ( | ||
request.indexOf('webpack') < 0 && | ||
!request.startsWith('.') && | ||
requireModule.probe(request, context) | ||
) { | ||
return callback(null, 'commonjs ' + request); | ||
} | ||
callback(); | ||
}; | ||
@@ -33,0 +33,0 @@ } |
@@ -188,7 +188,8 @@ import * as ip from 'ip'; | ||
}, | ||
externals: [ | ||
requireModule('webpack-node-externals')({ | ||
whitelist: [/(^webpack|^react-native)/] | ||
}) | ||
] | ||
externals: (context, request, callback) => { | ||
if (request.indexOf('webpack') < 0 && !request.startsWith('.') && requireModule.probe(request, context)) { | ||
return callback(null, 'commonjs ' + request); | ||
} | ||
callback(); | ||
} | ||
}; | ||
@@ -195,0 +196,0 @@ } else { |
import * as path from 'path'; | ||
import * as requireRelative from 'require-relative'; | ||
const requireModule: any = name => { | ||
const modulePath = path.join(process.cwd(), name.indexOf('.') !== 0 ? 'node_modules' : '', name); | ||
return require(modulePath); | ||
const requireModule: any = (name, relativeTo) => { | ||
return name.indexOf('.') !== 0 | ||
? requireRelative(name, relativeTo) | ||
: require(path.join(relativeTo || process.cwd(), name)); | ||
}; | ||
requireModule.resolve = name => { | ||
const modulePath = path.join(process.cwd(), name.indexOf('.') !== 0 ? 'node_modules' : '', name); | ||
return require.resolve(modulePath); | ||
requireModule.resolve = (name, relativeTo) => { | ||
return name.indexOf('.') !== 0 | ||
? requireRelative.resolve(name, relativeTo) | ||
: require.resolve(path.join(relativeTo || process.cwd(), name)); | ||
}; | ||
requireModule.probe = name => { | ||
requireModule.probe = (name, relativeTo) => { | ||
try { | ||
return requireModule.resolve(name); | ||
return requireModule.resolve(name, relativeTo); | ||
} catch (e) { | ||
@@ -17,0 +20,0 @@ return false; |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Dynamic require
Supply chain riskDynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Dynamic require
Supply chain riskDynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.
Found 1 instance in 1 package
291479
12
4888
+ Addedrequire-relative@^0.8.7
+ Addedrequire-relative@0.8.7(transitive)