update for new changes

gulpjs · Mar 16, 2024 · ead49a9 · ead49a9
1 parent eec0520
commit ead49a9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 32 deletions.
diff --git a/index.js b/index.js
@@ -164,8 +164,7 @@ Liftoff.prototype.buildEnvironment = function (opts) {
     }
   });
 
-  var additionPreloads = arrayFind(Object.keys(config), function (key) {
-    var cfg = config[key];
+  var additionPreloads = arrayFind(config, function (cfg) {
     if (Object.prototype.hasOwnProperty.call(cfg, 'preload')) {
       if (Array.isArray(cfg.preload)) {
         if (cfg.preload.every(isString)) {

diff --git a/test/index.js b/test/index.js
@@ -607,11 +607,9 @@ describe('Liftoff', function () {
     it('adds array of preloads specified in config', function (done) {
       var app = new Liftoff({
         name: 'myapp',
-        configFiles: {
-          'preload-array': [
-            { path: 'test/fixtures/configfiles', extensions: ['.js'] }
-          ],
-        },
+        configFiles: [
+          { name: 'preload-array', path: 'test/fixtures/configfiles', extensions: ['.js'] }
+        ],
       });
       app.prepare({}, function (env) {
         expect(env.preload).toEqual(['abc', 'xyz']);
@@ -622,11 +620,9 @@ describe('Liftoff', function () {
     it('combines array of preloads specified in config', function (done) {
       var app = new Liftoff({
         name: 'myapp',
-        configFiles: {
-          'preload-array': [
-            { path: 'test/fixtures/configfiles', extensions: ['.js'] }
-          ],
-        },
+        configFiles: [
+          { name: 'preload-array', path: 'test/fixtures/configfiles', extensions: ['.js'] }
+        ],
       });
       app.prepare({
         preload: ['123']
@@ -639,11 +635,9 @@ describe('Liftoff', function () {
     it('adds string preload specified in config', function (done) {
       var app = new Liftoff({
         name: 'myapp',
-        configFiles: {
-          'preload-string': [
-            { path: 'test/fixtures/configfiles', extensions: ['.js'] }
-          ],
-        },
+        configFiles: [
+          { name: 'preload-string', path: 'test/fixtures/configfiles', extensions: ['.js'] }
+        ],
       });
       app.prepare({}, function (env) {
         expect(env.preload).toEqual(['abc']);
@@ -654,11 +648,9 @@ describe('Liftoff', function () {
     it('combines string preload specified in config', function (done) {
       var app = new Liftoff({
         name: 'myapp',
-        configFiles: {
-          'preload-string': [
-            { path: 'test/fixtures/configfiles', extensions: ['.js'] }
-          ],
-        },
+        configFiles: [
+          { name: 'preload-string', path: 'test/fixtures/configfiles', extensions: ['.js'] }
+        ],
       });
       app.prepare({
         preload: ['xyz']
@@ -671,11 +663,9 @@ describe('Liftoff', function () {
     it('ignores non-string/non-array preload specified in config', function (done) {
       var app = new Liftoff({
         name: 'myapp',
-        configFiles: {
-          'preload-invalid': [
-            { path: 'test/fixtures/configfiles', extensions: ['.js'] }
-          ],
-        },
+        configFiles: [
+          { name: 'preload-invalid', path: 'test/fixtures/configfiles', extensions: ['.js'] }
+        ],
       });
       app.prepare({}, function (env) {
         expect(env.preload).toEqual([]);
@@ -686,11 +676,9 @@ describe('Liftoff', function () {
     it('ignores array with any non-strings preload specified in config', function (done) {
       var app = new Liftoff({
         name: 'myapp',
-        configFiles: {
-          'preload-invalid-array': [
-            { path: 'test/fixtures/configfiles', extensions: ['.js'] }
-          ],
-        },
+        configFiles: [
+          { name: 'preload-invalid-array', path: 'test/fixtures/configfiles', extensions: ['.js'] }
+        ],
       });
       app.prepare({}, function (env) {
         expect(env.preload).toEqual([]);