Use new requirements config. Closes #122

hapijs · Nov 7, 2018 · 08e2a10 · 08e2a10
1 parent 7cc122b
commit 08e2a10
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 46 deletions.
diff --git a/lib/directory.js b/lib/directory.js
@@ -1,7 +1,5 @@
 'use strict';
 
-// Load modules
-
 const Path = require('path');
 
 const Boom = require('boom');
@@ -13,8 +11,6 @@ const File = require('./file');
 const Fs = require('./fs');
 
 
-// Declare internals
-
 const internals = {};
 
 

diff --git a/lib/etag.js b/lib/etag.js
@@ -1,16 +1,12 @@
 'use strict';
 
-// Load modules
-
 const Crypto = require('crypto');
 
 const Boom = require('boom');
 const Bounce = require('bounce');
 const LruCache = require('lru-cache');
 
 
-// Declare internals
-
 const internals = {
     pendings: Object.create(null)
 };

diff --git a/lib/file.js b/lib/file.js
@@ -1,7 +1,5 @@
 'use strict';
 
-// Load modules
-
 const Path = require('path');
 
 const Ammo = require('ammo');
@@ -14,8 +12,6 @@ const Etag = require('./etag');
 const Fs = require('./fs');
 
 
-// Declare internals
-
 const internals = {};
 
 

diff --git a/lib/fs.js b/lib/fs.js
@@ -1,7 +1,5 @@
 'use strict';
 
-// Load modules
-
 const Fs = require('fs');
 const Util = require('util');
 
@@ -10,8 +8,6 @@ const Bounce = require('bounce');
 const Hoek = require('hoek');
 
 
-// Declare internals
-
 const internals = {
     methods: {
         promised: ['open', 'close', 'fstat', 'readdir'],

diff --git a/lib/index.js b/lib/index.js
@@ -1,15 +1,12 @@
 'use strict';
 
-// Load modules
+const Hoek = require('hoek');
+const Joi = require('joi');
 
 const Directory = require('./directory');
 const Etag = require('./etag');
 const File = require('./file');
-const Hoek = require('hoek');
-const Joi = require('joi');
-
 
-// Declare internals
 
 const internals = {
     schema: Joi.object({
@@ -37,6 +34,9 @@ internals.fileMethod = function (path, responseOptions) {
 exports.plugin = {
     pkg: require('../package.json'),
     once: true,
+    requirements: {
+        hapi: '>=17.7.0'
+    },
 
     register(server, options) {
 

diff --git a/package.json b/package.json
@@ -11,12 +11,6 @@
     "hapi",
     "plugin"
   ],
-  "engines": {
-    "node": ">=8.9.0"
-  },
-  "peerDependencies": {
-    "hapi": ">=17.0.0"
-  },
   "dependencies": {
     "ammo": "3.x.x",
     "boom": "7.x.x",

diff --git a/test/directory.js b/test/directory.js
@@ -1,7 +1,5 @@
 'use strict';
 
-// Load modules
-
 const Fs = require('fs');
 const Os = require('os');
 const Path = require('path');
@@ -15,13 +13,9 @@ const InertFs = require('../lib/fs');
 const Lab = require('lab');
 
 
-// Declare internals
-
 const internals = {};
 
 
-// Test shortcuts
-
 const lab = exports.lab = Lab.script();
 const describe = lab.describe;
 const it = lab.it;

diff --git a/test/file.js b/test/file.js
@@ -1,7 +1,5 @@
 'use strict';
 
-// Load modules
-
 const ChildProcess = require('child_process');
 const Fs = require('fs');
 const Os = require('os');
@@ -16,13 +14,9 @@ const InertFs = require('../lib/fs');
 const Lab = require('lab');
 
 
-// Declare internals
-
 const internals = {};
 
 
-// Test shortcuts
-
 const lab = exports.lab = Lab.script();
 const { describe, it } = lab;
 const expect = Code.expect;
@@ -305,7 +299,7 @@ describe('file', () => {
 
             const res = await server.inject('/filefn/index.js');
             expect(res.statusCode).to.equal(200);
-            expect(res.payload).to.contain('// Load modules');
+            expect(res.payload).to.contain('Set correct confine value');
             expect(res.headers['content-type']).to.equal('application/javascript; charset=utf-8');
             expect(res.headers['content-length']).to.exist();
         });

diff --git a/test/security.js b/test/security.js
@@ -1,7 +1,5 @@
 'use strict';
 
-// Load modules
-
 const Path = require('path');
 
 const Code = require('code');
@@ -11,13 +9,9 @@ const Inert = require('..');
 const Lab = require('lab');
 
 
-// Declare internals
-
 const internals = {};
 
 
-// Test shortcuts
-
 const lab = exports.lab = Lab.script();
 const describe = lab.describe;
 const it = lab.it;