diff --git a/package.json b/package.json index eef36bb..73f0d6b 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,6 @@ "chalk": "^2.4.2", "cookie": "^0.4.0", "debug": "^4.1.1", - "najax": "^1.0.4", "resolve": "^1.12.0", "simple-dom": "^1.4.0", "source-map-support": "^0.5.13" diff --git a/src/ember-app.js b/src/ember-app.js index 2e578c2..54cacbe 100644 --- a/src/ember-app.js +++ b/src/ember-app.js @@ -5,7 +5,6 @@ const vm = require('vm'); const path = require('path'); const chalk = require('chalk'); -const najax = require('najax'); const SimpleDOM = require('simple-dom'); const resolve = require('resolve'); const debug = require('debug')('fastboot:ember-app'); @@ -95,7 +94,6 @@ class EmberApp { // add any additional user provided variables or override the default globals in the sandbox let globals = Object.assign( { - najax, FastBoot: { require: sandboxRequire, config: fastbootConfig, diff --git a/test/fastboot-test.js b/test/fastboot-test.js index 41dcdcd..5f8cf06 100644 --- a/test/fastboot-test.js +++ b/test/fastboot-test.js @@ -174,7 +174,6 @@ describe('FastBoot', function() { distPath: fixture('custom-sandbox'), sandboxGlobals: { foo: 5, - najax: 'undefined', myVar: 'undefined', }, }); @@ -184,7 +183,6 @@ describe('FastBoot', function() { .then(r => r.html()) .then(html => { expect(html).to.match(/foo from sandbox: 5/); - expect(html).to.match(/najax in sandbox: undefined/); }); }); @@ -261,7 +259,6 @@ describe('FastBoot', function() { distPath: fixture('basic-app'), sandboxGlobals: { foo: 5, - najax: 'undefined', myVar: 'undefined', }, }); @@ -275,7 +272,6 @@ describe('FastBoot', function() { .then(r => r.html()) .then(html => { expect(html).to.match(/foo from sandbox: 5/); - expect(html).to.match(/najax in sandbox: undefined/); }); function hotReloadApp() { diff --git a/test/fixtures/custom-sandbox/assets/fastboot-trial.js b/test/fixtures/custom-sandbox/assets/fastboot-trial.js index dfa6f77..0ac945d 100644 --- a/test/fixtures/custom-sandbox/assets/fastboot-trial.js +++ b/test/fixtures/custom-sandbox/assets/fastboot-trial.js @@ -341,7 +341,6 @@ define('fastboot-trial/routes/foo', ['exports', 'ember'], function (exports, _em if (this.get('fastboot.isFastBoot')) { return { foo: foo, - najax: najax, myVar: myVar }; } diff --git a/yarn.lock b/yarn.lock index f4e59b3..8f4c7d0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3119,11 +3119,6 @@ istextorbinary@2.1.0: editions "^1.1.1" textextensions "1 || 2" -jquery-deferred@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/jquery-deferred/-/jquery-deferred-0.3.1.tgz#596eca1caaff54f61b110962b23cafea74c35355" - integrity sha1-WW7KHKr/VPYbEQlisjyv6nTDU1U= - jquery@^3.3.1: version "3.4.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" @@ -3287,11 +3282,6 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" -lodash.defaultsdeep@^4.6.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6" - integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA== - lodash.find@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1" @@ -3610,15 +3600,6 @@ mz@^2.4.0: object-assign "^4.0.1" thenify-all "^1.0.0" -najax@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/najax/-/najax-1.0.4.tgz#63fd8dbf15d18f24dc895b3a16fec66c136b8084" - integrity sha512-wsSacA+RkgY1wxRxXCT3tdqzmamEv9PLeoV/ub9SlLf2RngbPMSqc3A7H35XJDfURC0twMmZsnPdsYPkuuFSVg== - dependencies: - jquery-deferred "^0.3.0" - lodash.defaultsdeep "^4.6.0" - qs "^6.2.0" - natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -4145,11 +4126,6 @@ qs@6.7.0: resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== -qs@^6.2.0: - version "6.9.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.0.tgz#d1297e2a049c53119cb49cca366adbbacc80b409" - integrity sha512-27RP4UotQORTpmNQDX8BHPukOnBP3p1uUJY5UnDhaJB+rMt9iMsok724XL+UHU23bEFOHRMQ2ZhI99qOWUMGFA== - quick-temp@^0.1.3, quick-temp@^0.1.5: version "0.1.8" resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.8.tgz#bab02a242ab8fb0dd758a3c9776b32f9a5d94408"