Move to new ld client package, import package via ember-auto import (#…

…133) * Move to new ld client package, import package via ember-auto import * bump yarn version Co-authored-by: Jared Galanis <[email protected]> * Update addon/services/launch-darkly-client-remote.js Co-authored-by: Chris Manson <[email protected]> * update client to use new import style - removes dead code path for LDClient on window - uses imported initialize directly rather than calling it on the client * remove .yarnrc.yml * update to latest LD JS sdk * bump auto import version to latest release * remove unnecessary change to .gitignore Co-authored-by: Jared Galanis <[email protected]> Co-authored-by: Chris Manson <[email protected]> Co-authored-by: Jared Galanis <[email protected]>
adopted-ember-addons · Sep 5, 2020 · 8f5563b · 8f5563b
1 parent 2b17cb6
commit 8f5563b
Show file tree

Hide file tree

Showing 4 changed files with 2,814 additions and 53 deletions.
diff --git a/addon/services/launch-darkly-client-remote.js b/addon/services/launch-darkly-client-remote.js
@@ -3,6 +3,7 @@ import { getOwner } from '@ember/application';
 import { assert, warn } from '@ember/debug';
 import { run } from '@ember/runloop';
 import Evented from '@ember/object/evented';
+import { initialize } from 'launchdarkly-js-client-sdk';
 
 import RSVP from 'rsvp';
 
@@ -38,14 +39,6 @@ export default Service.extend(Evented, {
       return RSVP.resolve();
     }
 
-    if (!window.LDClient) {
-      warn('Launch Darkly JS client not found. Defaulting all feature flags to "false"', false, { id: 'ember-launch-darkly.client-not-found' });
-
-      this.set('_client', NullClient);
-
-      return RSVP.resolve();
-    }
-
     return this._initialize(clientSideId, user, streaming);
   },
 
@@ -69,7 +62,7 @@ export default Service.extend(Evented, {
 
   _initialize(id, user, streamingOptions) {
     return new RSVP.Promise((resolve, reject) => {
-      let client = window.LDClient.initialize(id, user);
+      let client = initialize(id, user);
 
       client.on('ready', () => {
         this.set('_client', client);

diff --git a/index.js b/index.js
@@ -25,8 +25,6 @@ module.exports = {
   included() {
     this._super.included.apply(this, arguments);
 
-    this.import('vendor/ldclient.js');
-
     if (this._shouldIncludePolyfill()) {
       this.import('vendor/eventsource.js');
     }
@@ -35,21 +33,13 @@ module.exports = {
   treeForVendor(vendorTree) {
     let trees = vendorTree ? [vendorTree] : [];
 
-    trees.push(this._launchDarklyTree());
-
     if (this._shouldIncludePolyfill()) {
       trees.push(this._eventSourceTree());
     }
 
     return new MergeTrees(trees);
   },
 
-  _launchDarklyTree() {
-    return new Funnel(path.dirname(require.resolve('ldclient-js/dist/ldclient.js')), {
-      files: ['ldclient.js'],
-    });
-  },
-
   _eventSourceTree() {
     return new Funnel(path.dirname(require.resolve('event-source-polyfill/eventsource.js')), {
       files: ['eventsource.js'],

diff --git a/package.json b/package.json
@@ -24,10 +24,11 @@
     "test-node": "./node_modules/mocha/bin/mocha nodetests/**/*-test.js"
   },
   "dependencies": {
+    "ember-auto-import": "^1.6.0",
     "ember-cli-babel": "^7.7.3",
     "ember-test-waiters": "^1.1.1",
     "event-source-polyfill": "^0.0.9",
-    "ldclient-js": "1.7.4"
+    "launchdarkly-js-client-sdk": "^2.18.0"
   },
   "devDependencies": {
     "@ember/optional-features": "^0.7.0",