Merge branch 'browserify:master' into v18-dev

changelog.markdown

@@ -1,3 +1,8 @@
+# 17.0.1
+* Use `hasown` instead of `has`. ([4b1a5dc](https://github.com/browserify/browserify/commit/4b1a5dc0db56263b38dc98e155fb1908e810c1a9))
+* Use `String.prototype.slice` instead of `String.prototype.substr`. ([#2036](https://github.com/browserify/browserify/pull/2036))
+* Support relative paths in the `noParse` option. ([#2080](https://github.com/browserify/browserify/pull/2080))
+
 # 17.0.0
 * Upgrade events to v3.x. EventEmitter instances now have an `off()` method. `require('events').once` can be used to react to an event being emitted with `async`/`await` syntax. ([#1839](https://github.com/browserify/browserify/pull/1839))
 * Upgrade path-browserify to v1.x. ([#1838](https://github.com/browserify/browserify/pull/1838))

index.js

@@ -16,7 +16,7 @@ var EventEmitter = require('events').EventEmitter;
 var xtend = require('xtend');
 var isArray = Array.isArray;
 var defined = require('defined');
-var has = require('has');
+var hasOwn = require('hasown');
 var sanitize = require('htmlescape').sanitize;
 var shasum = require('shasum-object');
 
@@ -554,7 +554,7 @@ Browserify.prototype._createDeps = function (opts) {
     else mopts.modules = xtend(builtins);
 
     Object.keys(builtins).forEach(function (key) {
-        if (!has(mopts.modules, key)) self._exclude.push(key);
+        if (!hasOwn(mopts.modules, key)) self._exclude.push(key);
     });
 
     mopts.globalTransform = [];
@@ -574,6 +574,7 @@ Browserify.prototype._createDeps = function (opts) {
     }).map(function (x) {
         return path.resolve(basedir, x);
     });
+    mopts.noParse = absno;
 
     function globalTr (file) {
         if (opts.detectGlobals === false) return through();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserify",
-  "version": "17.0.0",
+  "version": "17.0.1",
   "description": "browser-side require() the node way",
   "main": "index.js",
   "bin": {
@@ -23,7 +23,6 @@
     "javascript"
   ],
   "dependencies": {
-    "JSONStream": "^1.0.3",
     "assert": "^1.4.0",
     "browser-pack": "^6.0.1",
     "browser-resolve": "^2.0.0",
@@ -40,11 +39,12 @@
     "duplexer2": "~0.1.2",
     "events": "^3.0.0",
     "glob": "^7.1.0",
-    "has": "^1.0.0",
+    "hasown": "^2.0.0",
     "htmlescape": "^1.1.0",
     "https-browserify": "^1.0.0",
     "inherits": "~2.0.1",
     "insert-module-globals": "^7.2.1",
+    "JSONStream": "^1.0.3",
     "labeled-stream-splicer": "^2.0.0",
     "mkdirp-classic": "^0.5.2",
     "module-deps": "^6.2.3",

readme.markdown

@@ -482,6 +482,14 @@ $ npm install derequire
 $ browserify main.js --standalone Foo | derequire > bundle.js
 ```
 
+```html
+<script src="bundle.js"></script>
+<script type="text/javascript">
+	// Now you can address `Foo` by name in your HTML document
+	Foo.bar();
+</script>
+```
+
 `opts.insertGlobalVars` will be passed to
 [insert-module-globals](https://www.npmjs.com/package/insert-module-globals)
 as the `opts.vars` parameter.

test/noparse.js

@@ -29,3 +29,31 @@ test('noParse array', function (t) {
         t.deepEqual(actual, expected);
     });
 });
+
+test('noParse array with relative paths', function (t) {
+    process.chdir(__dirname);
+
+    t.plan(2);
+
+    var actual = [];
+    var expected = [
+        'noparse/a.js',
+        'noparse/b.js',
+        'noparse/dir1/1.js',
+        'noparse/node_modules/robot/main.js'
+    ].map(function (x) { return path.resolve(x); }).sort();
+
+    var b = browserify({
+        entries: [__dirname + '/noparse/a.js'],
+        noParse: [
+            path.join('noparse/dir1/1.js'),
+            path.join('noparse/node_modules/robot/main.js')
+        ]
+    });
+    b.on('dep', function (dep) { actual.push(dep.file); });
+    b.bundle(function (err, src) {
+        actual.sort();
+        t.ifError(err);
+        t.deepEqual(actual, expected);
+    });
+});