projen 0.51.9 → 0.51.13

package/node_modules/resolve/test/resolver_sync.js

@@ -5,6 +5,9 @@ var test = require('tape');
 var resolve = require('../');
 var sync = require('../sync');
 
+var requireResolveSupportsPaths = require.resolve.length > 1
+    && (/^12\.[012]\./).test(process.version); // broken in v12.0-12.2, see https://github.com/nodejs/node/issues/27794
+
 test('`./sync` entry point', function (t) {
     t.equal(resolve.sync, sync, '`./sync` entry point is the same as `.sync` on `main`');
     t.end();
@@ -15,13 +18,29 @@ test('foo', function (t) {
 
     t.equal(
         resolve.sync('./foo', { basedir: dir }),
-        path.join(dir, 'foo.js')
-    );
+        path.join(dir, 'foo.js'),
+        './foo'
+    );
+    if (requireResolveSupportsPaths) {
+        t.equal(
+            resolve.sync('./foo', { basedir: dir }),
+            require.resolve('./foo', { paths: [dir] }),
+            './foo: resolve.sync === require.resolve'
+        );
+    }
 
     t.equal(
         resolve.sync('./foo.js', { basedir: dir }),
-        path.join(dir, 'foo.js')
-    );
+        path.join(dir, 'foo.js'),
+        './foo.js'
+    );
+    if (requireResolveSupportsPaths) {
+        t.equal(
+            resolve.sync('./foo.js', { basedir: dir }),
+            require.resolve('./foo.js', { paths: [dir] }),
+            './foo.js: resolve.sync === require.resolve'
+        );
+    }
 
     t.equal(
         resolve.sync('./foo.js', { basedir: dir, filename: path.join(dir, 'bar.js') }),
@@ -49,10 +68,21 @@ test('foo', function (t) {
 test('bar', function (t) {
     var dir = path.join(__dirname, 'resolver');
 
+    var basedir = path.join(dir, 'bar');
+
     t.equal(
-        resolve.sync('foo', { basedir: path.join(dir, 'bar') }),
-        path.join(dir, 'bar/node_modules/foo/index.js')
-    );
+        resolve.sync('foo', { basedir: basedir }),
+        path.join(dir, 'bar/node_modules/foo/index.js'),
+        'foo in bar'
+    );
+    if (requireResolveSupportsPaths) {
+        t.equal(
+            resolve.sync('foo', { basedir: basedir }),
+            require.resolve('foo', { paths: [basedir] }),
+            'foo in bar: resolve.sync === require.resolve'
+        );
+    }
+
     t.end();
 });
 
@@ -61,52 +91,98 @@ test('baz', function (t) {
 
     t.equal(
         resolve.sync('./baz', { basedir: dir }),
-        path.join(dir, 'baz/quux.js')
-    );
+        path.join(dir, 'baz/quux.js'),
+        './baz'
+    );
+    if (requireResolveSupportsPaths) {
+        t.equal(
+            resolve.sync('./baz', { basedir: dir }),
+            require.resolve('./baz', { paths: [dir] }),
+            './baz: resolve.sync === require.resolve'
+        );
+    }
+
     t.end();
 });
 
 test('biz', function (t) {
     var dir = path.join(__dirname, 'resolver/biz/node_modules');
+
     t.equal(
         resolve.sync('./grux', { basedir: dir }),
         path.join(dir, 'grux/index.js')
     );
+    if (requireResolveSupportsPaths) {
+        t.equal(
+            resolve.sync('./grux', { basedir: dir }),
+            require.resolve('./grux', { paths: [dir] }),
+            './grux: resolve.sync === require.resolve'
+        );
+    }
 
+    var tivDir = path.join(dir, 'grux');
     t.equal(
-        resolve.sync('tiv', { basedir: path.join(dir, 'grux') }),
+        resolve.sync('tiv', { basedir: tivDir }),
         path.join(dir, 'tiv/index.js')
     );
+    if (requireResolveSupportsPaths) {
+        t.equal(
+            resolve.sync('tiv', { basedir: tivDir }),
+            require.resolve('tiv', { paths: [tivDir] }),
+            'tiv: resolve.sync === require.resolve'
+        );
+    }
 
+    var gruxDir = path.join(dir, 'tiv');
     t.equal(
-        resolve.sync('grux', { basedir: path.join(dir, 'tiv') }),
+        resolve.sync('grux', { basedir: gruxDir }),
         path.join(dir, 'grux/index.js')
     );
+    if (requireResolveSupportsPaths) {
+        t.equal(
+            resolve.sync('grux', { basedir: gruxDir }),
+            require.resolve('grux', { paths: [gruxDir] }),
+            'grux: resolve.sync === require.resolve'
+        );
+    }
+
     t.end();
 });
 
 test('normalize', function (t) {
     var dir = path.join(__dirname, 'resolver/biz/node_modules/grux');
+
     t.equal(
         resolve.sync('../grux', { basedir: dir }),
         path.join(dir, 'index.js')
     );
+    if (requireResolveSupportsPaths) {
+        t.equal(
+            resolve.sync('../grux', { basedir: dir }),
+            require.resolve('../grux', { paths: [dir] }),
+            '../grux: resolve.sync === require.resolve'
+        );
+    }
+
     t.end();
 });
 
 test('cup', function (t) {
     var dir = path.join(__dirname, 'resolver');
+
     t.equal(
         resolve.sync('./cup', {
             basedir: dir,
             extensions: ['.js', '.coffee']
         }),
-        path.join(dir, 'cup.coffee')
+        path.join(dir, 'cup.coffee'),
+        './cup -> ./cup.coffee'
     );
 
     t.equal(
         resolve.sync('./cup.coffee', { basedir: dir }),
-        path.join(dir, 'cup.coffee')
+        path.join(dir, 'cup.coffee'),
+        './cup.coffee'
     );
 
     t.throws(function () {
@@ -116,22 +192,40 @@ test('cup', function (t) {
         });
     });
 
+    if (requireResolveSupportsPaths) {
+        t.equal(
+            resolve.sync('./cup.coffee', { basedir: dir, extensions: ['.js', '.coffee'] }),
+            require.resolve('./cup.coffee', { paths: [dir] }),
+            './cup.coffee: resolve.sync === require.resolve'
+        );
+    }
+
     t.end();
 });
 
 test('mug', function (t) {
     var dir = path.join(__dirname, 'resolver');
+
     t.equal(
         resolve.sync('./mug', { basedir: dir }),
-        path.join(dir, 'mug.js')
-    );
+        path.join(dir, 'mug.js'),
+        './mug -> ./mug.js'
+    );
+    if (requireResolveSupportsPaths) {
+        t.equal(
+            resolve.sync('./mug', { basedir: dir }),
+            require.resolve('./mug', { paths: [dir] }),
+            './mug: resolve.sync === require.resolve'
+        );
+    }
 
     t.equal(
         resolve.sync('./mug', {
             basedir: dir,
             extensions: ['.coffee', '.js']
         }),
-        path.join(dir, 'mug.coffee')
+        path.join(dir, 'mug.coffee'),
+        './mug -> ./mug.coffee'
     );
 
     t.equal(
@@ -139,7 +233,8 @@ test('mug', function (t) {
             basedir: dir,
             extensions: ['.js', '.coffee']
         }),
-        path.join(dir, 'mug.js')
+        path.join(dir, 'mug.js'),
+        './mug -> ./mug.js'
     );
 
     t.end();
@@ -203,6 +298,13 @@ test('incorrect main', function (t) {
         resolve.sync('./incorrect_main', { basedir: resolverDir }),
         path.join(dir, 'index.js')
     );
+    if (requireResolveSupportsPaths) {
+        t.equal(
+            resolve.sync('./incorrect_main', { basedir: resolverDir }),
+            require.resolve('./incorrect_main', { paths: [resolverDir] }),
+            './incorrect_main: resolve.sync === require.resolve'
+        );
+    }
 
     t.end();
 });
@@ -233,29 +335,66 @@ test('#79 - re-throw non ENOENT errors from stat', function (t) {
 
 test('#52 - incorrectly resolves module-paths like "./someFolder/" when there is a file of the same name', function (t) {
     var dir = path.join(__dirname, 'resolver');
+    var basedir = path.join(dir, 'same_names');
 
     t.equal(
-        resolve.sync('./foo', { basedir: path.join(dir, 'same_names') }),
+        resolve.sync('./foo', { basedir: basedir }),
         path.join(dir, 'same_names/foo.js')
     );
+    if (requireResolveSupportsPaths) {
+        t.equal(
+            resolve.sync('./foo', { basedir: basedir }),
+            require.resolve('./foo', { paths: [basedir] }),
+            './foo: resolve.sync === require.resolve'
+        );
+    }
+
     t.equal(
-        resolve.sync('./foo/', { basedir: path.join(dir, 'same_names') }),
+        resolve.sync('./foo/', { basedir: basedir }),
         path.join(dir, 'same_names/foo/index.js')
     );
+    if (requireResolveSupportsPaths) {
+        t.equal(
+            resolve.sync('./foo/', { basedir: basedir }),
+            require.resolve('./foo/', { paths: [basedir] }),
+            './foo/: resolve.sync === require.resolve'
+        );
+    }
+
     t.end();
 });
 
 test('#211 - incorrectly resolves module-paths like "." when from inside a folder with a sibling file of the same name', function (t) {
     var dir = path.join(__dirname, 'resolver');
+    var basedir = path.join(dir, 'same_names/foo');
 
     t.equal(
-        resolve.sync('./', { basedir: path.join(dir, 'same_names/foo') }),
-        path.join(dir, 'same_names/foo/index.js')
-    );
+        resolve.sync('./', { basedir: basedir }),
+        path.join(dir, 'same_names/foo/index.js'),
+        './'
+    );
+    if (requireResolveSupportsPaths) {
+        t.equal(
+            resolve.sync('./', { basedir: basedir }),
+            require.resolve('./', { paths: [basedir] }),
+            './: resolve.sync === require.resolve'
+        );
+    }
+
     t.equal(
-        resolve.sync('.', { basedir: path.join(dir, 'same_names/foo') }),
-        path.join(dir, 'same_names/foo/index.js')
-    );
+        resolve.sync('.', { basedir: basedir }),
+        path.join(dir, 'same_names/foo/index.js'),
+        '.'
+    );
+    if (requireResolveSupportsPaths) {
+        t.equal(
+            resolve.sync('.', { basedir: basedir }),
+            require.resolve('.', { paths: [basedir] }),
+            '.: resolve.sync === require.resolve',
+            { todo: true }
+        );
+    }
+
     t.end();
 });
 
@@ -268,6 +407,12 @@ test('sync: #121 - treating an existing file as a dir when no basedir', function
             __filename,
             'sanity check'
         );
+        st.equal(
+            resolve.sync('./' + testFile),
+            require.resolve('./' + testFile),
+            'sanity check: resolve.sync === require.resolve'
+        );
+
         st.end();
     });
 
@@ -295,15 +440,38 @@ test('sync: #121 - treating an existing file as a dir when no basedir', function
 
 test('sync dot main', function (t) {
     var start = new Date();
-    t.equal(resolve.sync('./resolver/dot_main'), path.join(__dirname, 'resolver/dot_main/index.js'));
+
+    t.equal(
+        resolve.sync('./resolver/dot_main'),
+        path.join(__dirname, 'resolver/dot_main/index.js'),
+        './resolver/dot_main'
+    );
+    t.equal(
+        resolve.sync('./resolver/dot_main'),
+        require.resolve('./resolver/dot_main'),
+        './resolver/dot_main: resolve.sync === require.resolve'
+    );
+
     t.ok(new Date() - start < 50, 'resolve.sync timedout');
+
     t.end();
 });
 
 test('sync dot slash main', function (t) {
     var start = new Date();
-    t.equal(resolve.sync('./resolver/dot_slash_main'), path.join(__dirname, 'resolver/dot_slash_main/index.js'));
+
+    t.equal(
+        resolve.sync('./resolver/dot_slash_main'),
+        path.join(__dirname, 'resolver/dot_slash_main/index.js')
+    );
+    t.equal(
+        resolve.sync('./resolver/dot_slash_main'),
+        require.resolve('./resolver/dot_slash_main'),
+        './resolver/dot_slash_main: resolve.sync === require.resolve'
+    );
+
     t.ok(new Date() - start < 50, 'resolve.sync timedout');
+
     t.end();
 });
 
@@ -372,27 +540,54 @@ test('absolute paths', function (t) {
         __filename,
         'absolute path to this file resolves'
     );
+    t.equal(
+        resolve.sync(__filename),
+        require.resolve(__filename),
+        'absolute path to this file: resolve.sync === require.resolve'
+    );
+
     t.equal(
         resolve.sync(extensionless),
         __filename,
         'extensionless absolute path to this file resolves'
     );
+    t.equal(
+        resolve.sync(__filename),
+        require.resolve(__filename),
+        'absolute path to this file: resolve.sync === require.resolve'
+    );
+
     t.equal(
         resolve.sync(__filename, { basedir: process.cwd() }),
         __filename,
         'absolute path to this file with a basedir resolves'
     );
+    if (requireResolveSupportsPaths) {
+        t.equal(
+            resolve.sync(__filename, { basedir: process.cwd() }),
+            require.resolve(__filename, { paths: [process.cwd()] }),
+            'absolute path to this file + basedir: resolve.sync === require.resolve'
+        );
+    }
+
     t.equal(
         resolve.sync(extensionless, { basedir: process.cwd() }),
         __filename,
         'extensionless absolute path to this file with a basedir resolves'
     );
+    if (requireResolveSupportsPaths) {
+        t.equal(
+            resolve.sync(extensionless, { basedir: process.cwd() }),
+            require.resolve(extensionless, { paths: [process.cwd()] }),
+            'extensionless absolute path to this file + basedir: resolve.sync === require.resolve'
+        );
+    }
 
     t.end();
 });
 
 test('malformed package.json', function (t) {
-    t.plan(5);
+    t.plan(5 + (requireResolveSupportsPaths ? 1 : 0));
 
     var basedir = path.join(__dirname, 'resolver/malformed_package_json');
     var expected = path.join(basedir, 'index.js');
@@ -402,6 +597,13 @@ test('malformed package.json', function (t) {
         expected,
         'malformed package.json is silently ignored'
     );
+    if (requireResolveSupportsPaths) {
+        t.equal(
+            resolve.sync('./index.js', { basedir: basedir }),
+            require.resolve('./index.js', { paths: [basedir] }),
+            'malformed package.json: resolve.sync === require.resolve'
+        );
+    }
 
     var res1 = resolve.sync(
         './index.js',

package/package.json

@@ -69,7 +69,7 @@
     "jsii-diff": "^1.52.1",
     "jsii-docgen": "^1.8.110",
     "json-schema": "^0.4.0",
-    "markmac": "^0.1.144",
+    "markmac": "^0.1.146",
     "npm-check-updates": "^12",
     "prettier": "^2.5.1",
     "standard-version": "^9",
@@ -117,7 +117,7 @@
   },
   "main": "lib/index.js",
   "license": "Apache-2.0",
-  "version": "0.51.9",
+  "version": "0.51.13",
   "jest": {
     "testMatch": [
       "<rootDir>/src/**/__tests__/**/*.ts?(x)",

package/releasetag.txt

@@ -1 +1 @@
-v0.51.9
+v0.51.13

package/version.txt

@@ -1 +1 @@
-0.51.9
+0.51.13