From d49fee2a2980d5c5d4de34a7e2eaf330590b8d38 Mon Sep 17 00:00:00 2001 From: vitorsemeano Date: Sun, 24 Feb 2019 11:46:22 +0000 Subject: [PATCH] single module resolution for apiclient --- .../apiclientex.js => apiclient/apiclient.js} | 7 ++++++- .../apiclient.js => apiclient/apiclientcore.js} | 0 .../{emby-apiclient => apiclient}/appstorage-cache.js | 0 .../appstorage-localstorage.js | 0 .../{emby-apiclient => apiclient}/appstorage-memory.js | 0 .../{emby-apiclient => apiclient}/connectionmanager.js | 0 .../{emby-apiclient => apiclient}/credentials.js | 0 .../{emby-apiclient => apiclient}/events.js | 0 .../{emby-apiclient => apiclient}/localassetmanager.js | 0 src/bower_components/apiclient/package.json | 3 +++ .../{emby-apiclient => apiclient}/sync/filerepository.js | 0 .../{emby-apiclient => apiclient}/sync/itemrepository.js | 0 .../{emby-apiclient => apiclient}/sync/localsync.js | 0 .../{emby-apiclient => apiclient}/sync/mediasync.js | 0 .../{emby-apiclient => apiclient}/sync/multiserversync.js | 0 .../{emby-apiclient => apiclient}/sync/serversync.js | 0 .../{emby-apiclient => apiclient}/sync/transfermanager.js | 0 .../sync/useractionrepository.js | 0 18 files changed, 9 insertions(+), 1 deletion(-) rename src/bower_components/{emby-apiclient/apiclientex.js => apiclient/apiclient.js} (98%) rename src/bower_components/{emby-apiclient/apiclient.js => apiclient/apiclientcore.js} (100%) rename src/bower_components/{emby-apiclient => apiclient}/appstorage-cache.js (100%) rename src/bower_components/{emby-apiclient => apiclient}/appstorage-localstorage.js (100%) rename src/bower_components/{emby-apiclient => apiclient}/appstorage-memory.js (100%) rename src/bower_components/{emby-apiclient => apiclient}/connectionmanager.js (100%) rename src/bower_components/{emby-apiclient => apiclient}/credentials.js (100%) rename src/bower_components/{emby-apiclient => apiclient}/events.js (100%) rename src/bower_components/{emby-apiclient => apiclient}/localassetmanager.js (100%) create mode 100644 src/bower_components/apiclient/package.json rename src/bower_components/{emby-apiclient => apiclient}/sync/filerepository.js (100%) rename src/bower_components/{emby-apiclient => apiclient}/sync/itemrepository.js (100%) rename src/bower_components/{emby-apiclient => apiclient}/sync/localsync.js (100%) rename src/bower_components/{emby-apiclient => apiclient}/sync/mediasync.js (100%) rename src/bower_components/{emby-apiclient => apiclient}/sync/multiserversync.js (100%) rename src/bower_components/{emby-apiclient => apiclient}/sync/serversync.js (100%) rename src/bower_components/{emby-apiclient => apiclient}/sync/transfermanager.js (100%) rename src/bower_components/{emby-apiclient => apiclient}/sync/useractionrepository.js (100%) diff --git a/src/bower_components/emby-apiclient/apiclientex.js b/src/bower_components/apiclient/apiclient.js similarity index 98% rename from src/bower_components/emby-apiclient/apiclientex.js rename to src/bower_components/apiclient/apiclient.js index b6a0c1bb14..98aaed75e3 100644 --- a/src/bower_components/emby-apiclient/apiclientex.js +++ b/src/bower_components/apiclient/apiclient.js @@ -1,6 +1,11 @@ -define(["apiclientcore", "localassetmanager"], function(ApiClient, localassetmanager) { +//TODO: (vitorsemeano) modify this lines for webpack +define(["bower_components/apiclient/apiclientcore", "localassetmanager"], function(ApiClient, localassetmanager) { "use strict"; + if ("cordova" !== window.appMode && "android" !== window.appMode) { + return ApiClient; + } + function isLocalId(str) { return startsWith(str, localPrefix) } diff --git a/src/bower_components/emby-apiclient/apiclient.js b/src/bower_components/apiclient/apiclientcore.js similarity index 100% rename from src/bower_components/emby-apiclient/apiclient.js rename to src/bower_components/apiclient/apiclientcore.js diff --git a/src/bower_components/emby-apiclient/appstorage-cache.js b/src/bower_components/apiclient/appstorage-cache.js similarity index 100% rename from src/bower_components/emby-apiclient/appstorage-cache.js rename to src/bower_components/apiclient/appstorage-cache.js diff --git a/src/bower_components/emby-apiclient/appstorage-localstorage.js b/src/bower_components/apiclient/appstorage-localstorage.js similarity index 100% rename from src/bower_components/emby-apiclient/appstorage-localstorage.js rename to src/bower_components/apiclient/appstorage-localstorage.js diff --git a/src/bower_components/emby-apiclient/appstorage-memory.js b/src/bower_components/apiclient/appstorage-memory.js similarity index 100% rename from src/bower_components/emby-apiclient/appstorage-memory.js rename to src/bower_components/apiclient/appstorage-memory.js diff --git a/src/bower_components/emby-apiclient/connectionmanager.js b/src/bower_components/apiclient/connectionmanager.js similarity index 100% rename from src/bower_components/emby-apiclient/connectionmanager.js rename to src/bower_components/apiclient/connectionmanager.js diff --git a/src/bower_components/emby-apiclient/credentials.js b/src/bower_components/apiclient/credentials.js similarity index 100% rename from src/bower_components/emby-apiclient/credentials.js rename to src/bower_components/apiclient/credentials.js diff --git a/src/bower_components/emby-apiclient/events.js b/src/bower_components/apiclient/events.js similarity index 100% rename from src/bower_components/emby-apiclient/events.js rename to src/bower_components/apiclient/events.js diff --git a/src/bower_components/emby-apiclient/localassetmanager.js b/src/bower_components/apiclient/localassetmanager.js similarity index 100% rename from src/bower_components/emby-apiclient/localassetmanager.js rename to src/bower_components/apiclient/localassetmanager.js diff --git a/src/bower_components/apiclient/package.json b/src/bower_components/apiclient/package.json new file mode 100644 index 0000000000..0069cfc6bf --- /dev/null +++ b/src/bower_components/apiclient/package.json @@ -0,0 +1,3 @@ +{ + "main": "apiclient.js" +} \ No newline at end of file diff --git a/src/bower_components/emby-apiclient/sync/filerepository.js b/src/bower_components/apiclient/sync/filerepository.js similarity index 100% rename from src/bower_components/emby-apiclient/sync/filerepository.js rename to src/bower_components/apiclient/sync/filerepository.js diff --git a/src/bower_components/emby-apiclient/sync/itemrepository.js b/src/bower_components/apiclient/sync/itemrepository.js similarity index 100% rename from src/bower_components/emby-apiclient/sync/itemrepository.js rename to src/bower_components/apiclient/sync/itemrepository.js diff --git a/src/bower_components/emby-apiclient/sync/localsync.js b/src/bower_components/apiclient/sync/localsync.js similarity index 100% rename from src/bower_components/emby-apiclient/sync/localsync.js rename to src/bower_components/apiclient/sync/localsync.js diff --git a/src/bower_components/emby-apiclient/sync/mediasync.js b/src/bower_components/apiclient/sync/mediasync.js similarity index 100% rename from src/bower_components/emby-apiclient/sync/mediasync.js rename to src/bower_components/apiclient/sync/mediasync.js diff --git a/src/bower_components/emby-apiclient/sync/multiserversync.js b/src/bower_components/apiclient/sync/multiserversync.js similarity index 100% rename from src/bower_components/emby-apiclient/sync/multiserversync.js rename to src/bower_components/apiclient/sync/multiserversync.js diff --git a/src/bower_components/emby-apiclient/sync/serversync.js b/src/bower_components/apiclient/sync/serversync.js similarity index 100% rename from src/bower_components/emby-apiclient/sync/serversync.js rename to src/bower_components/apiclient/sync/serversync.js diff --git a/src/bower_components/emby-apiclient/sync/transfermanager.js b/src/bower_components/apiclient/sync/transfermanager.js similarity index 100% rename from src/bower_components/emby-apiclient/sync/transfermanager.js rename to src/bower_components/apiclient/sync/transfermanager.js diff --git a/src/bower_components/emby-apiclient/sync/useractionrepository.js b/src/bower_components/apiclient/sync/useractionrepository.js similarity index 100% rename from src/bower_components/emby-apiclient/sync/useractionrepository.js rename to src/bower_components/apiclient/sync/useractionrepository.js