snack-sdk 3.6.0 → 3.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (71) hide show
  1. package/CHANGELOG.md +27 -0
  2. package/build/DependencyResolver.d.ts +2 -1
  3. package/build/DependencyResolver.js +6 -5
  4. package/build/DependencyResolver.js.map +1 -1
  5. package/build/FileUploader.d.ts +2 -1
  6. package/build/FileUploader.js.map +1 -1
  7. package/build/Session.d.ts +6 -1
  8. package/build/Session.js +16 -7
  9. package/build/Session.js.map +1 -1
  10. package/build/State.js +2 -2
  11. package/build/State.js.map +1 -1
  12. package/build/WantedVersions.d.ts +30 -6
  13. package/build/WantedVersions.js +86 -26
  14. package/build/WantedVersions.js.map +1 -1
  15. package/build/defaultConfig.d.ts +2 -3
  16. package/build/defaultConfig.js +4 -4
  17. package/build/defaultConfig.js.map +1 -1
  18. package/build/index.d.ts +2 -2
  19. package/build/index.js +8 -8
  20. package/build/index.js.map +1 -1
  21. package/build/transports/CodeMessageBuilder.d.ts +1 -1
  22. package/build/transports/CodeMessageBuilder.js +2 -2
  23. package/build/transports/CodeMessageBuilder.js.map +1 -1
  24. package/build/transports/Protocol.d.ts +1 -1
  25. package/build/transports/Protocol.js.map +1 -1
  26. package/build/transports/Transport.d.ts +1 -0
  27. package/build/transports/Transport.js +6 -1
  28. package/build/transports/Transport.js.map +1 -1
  29. package/build/transports/types.d.ts +1 -1
  30. package/build/transports/types.js.map +1 -1
  31. package/build/transports/webPlayer.d.ts +2 -1
  32. package/build/transports/webPlayer.js.map +1 -1
  33. package/build/types.d.ts +10 -75
  34. package/build/types.js.map +1 -1
  35. package/build/utils.d.ts +2 -1
  36. package/build/utils.js.map +1 -1
  37. package/package.json +12 -4
  38. package/build/sdk.d.ts +0 -34
  39. package/build/sdk.js +0 -139
  40. package/build/sdk.js.map +0 -1
  41. package/build/sdks/features.d.ts +0 -9
  42. package/build/sdks/features.js +0 -13
  43. package/build/sdks/features.js.map +0 -1
  44. package/build/sdks/index.d.ts +0 -5
  45. package/build/sdks/index.js +0 -124
  46. package/build/sdks/index.js.map +0 -1
  47. package/build/sdks/types.d.ts +0 -21
  48. package/build/sdks/types.js +0 -3
  49. package/build/sdks/types.js.map +0 -1
  50. package/src/DependencyResolver.ts +0 -214
  51. package/src/DevSession.ts +0 -159
  52. package/src/FileUploader.ts +0 -133
  53. package/src/Logger.ts +0 -33
  54. package/src/Session.ts +0 -1280
  55. package/src/State.ts +0 -98
  56. package/src/WantedVersions.ts +0 -56
  57. package/src/defaultConfig.ts +0 -33
  58. package/src/index.ts +0 -31
  59. package/src/sdk.ts +0 -135
  60. package/src/sdks/features.ts +0 -11
  61. package/src/sdks/index.ts +0 -159
  62. package/src/sdks/types.ts +0 -49
  63. package/src/transports/CodeMessageBuilder.ts +0 -221
  64. package/src/transports/Protocol.ts +0 -78
  65. package/src/transports/Transport.ts +0 -270
  66. package/src/transports/index.ts +0 -8
  67. package/src/transports/types.ts +0 -88
  68. package/src/transports/webPlayer.ts +0 -91
  69. package/src/types.ts +0 -287
  70. package/src/utils.ts +0 -70
  71. package/tsconfig.json +0 -28
package/CHANGELOG.md CHANGED
@@ -4,10 +4,37 @@
4
4
 
5
5
  ### 🛠 Breaking changes
6
6
 
7
+ ### 🎉 New features
8
+
9
+ ### 🐛 Bug fixes
10
+
11
+ ## 3.9.0 - 2022-08-03
12
+
13
+ ### 🎉 New features
14
+
15
+ - Upgrade to Expo SDK 46 stable ([#337](https://github.com/expo/snack/pull/337)) by [@bycedric](https://github.com/byCedric))
16
+ - Add versioned endpoints for modules ([#334](https://github.com/expo/snack/pull/334)) by [@bycedric](https://github.com/byCedric))
17
+ - Upgrade pubnub to 7.2.0 ([#332](https://github.com/expo/snack/pull/332)) by [@bycedric](https://github.com/byCedric))
18
+ - Upgrade Snack to Expo SDK 45 ([#290](https://github.com/expo/snack/pull/290)) by [@danstepanov](https://github.com/danstepanov))
19
+
20
+ ## 3.8.0 - 2022-04-20
21
+
22
+ ### 🛠 Breaking changes
23
+
24
+ - ES2018 is required
25
+
26
+ ### 🎉 New features
27
+
28
+ - Prepare snack-sdk and snack-content for SDK 44 ([#277](https://github.com/expo/snack/pull/277)) by [@bycedric](https://github.com/byCedric))
29
+ - Split out code related to Snack project definitions into `snack-content` ([#251](https://github.com/expo/snack/pull/251)) by [@ide](https://github.com/ide))
30
+ - Upgrade Snack to Expo SDK 44 ([#243](https://github.com/expo/snack/pull/243)) by [@bycedric](https://github.com/byCedric))
7
31
 
32
+ ## 3.7.0 — 2021-12-17
8
33
 
9
34
  ### 🎉 New features
10
35
 
36
+ - `SnackState` & `SnackOptions` include `snackId` and `accountSnackId` for tracking snacks, rather than only full name (id).
37
+ - `saveAsync` additionally returns `snackId` and `accountSnackId`.
11
38
 
12
39
  ## 3.6.0 — 2021-10-29
13
40
 
@@ -1,5 +1,6 @@
1
+ import { SDKVersion, SnackDependencies, SnackMissingDependencies, SnackDependencyVersions } from 'snack-content';
1
2
  import { Logger } from './Logger';
2
- import { SDKVersion, SnackDependencies, SnackMissingDependencies, SnackDependencyVersions, SnackError } from './types';
3
+ import { SnackError } from './types';
3
4
  export declare type DependencyResolverCallback = (request: {
4
5
  name: string;
5
6
  version: string;
@@ -48,8 +48,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
48
48
  Object.defineProperty(exports, "__esModule", { value: true });
49
49
  exports.getPackageName = exports.verifyDependency = exports.getMissingDependencies = void 0;
50
50
  var semver_1 = __importDefault(require("semver"));
51
+ var snack_content_1 = require("snack-content");
51
52
  var validate_npm_package_name_1 = __importDefault(require("validate-npm-package-name"));
52
- var sdk_1 = require("./sdk");
53
53
  var utils_1 = require("./utils");
54
54
  function getKey(name, version) {
55
55
  return version ? name + "@" + version : name;
@@ -92,7 +92,7 @@ var DependencyResolver = /** @class */ (function () {
92
92
  DependencyResolver.prototype.resolve = function (key, name, version, sdkVersion) {
93
93
  var _a, _b, _c, _d;
94
94
  return __awaiter(this, void 0, void 0, function () {
95
- var versionSnackager, url, i, res, data, error, e_1, error;
95
+ var versionSnackager, url, i, res, data, error, e_1, error, promiseExists;
96
96
  return __generator(this, function (_e) {
97
97
  switch (_e.label) {
98
98
  case 0:
@@ -156,7 +156,8 @@ var DependencyResolver = /** @class */ (function () {
156
156
  fileName: key,
157
157
  });
158
158
  (_d = this.logger) === null || _d === void 0 ? void 0 : _d.error(error);
159
- if (this.status[key]) {
159
+ promiseExists = !!this.status[key];
160
+ if (promiseExists) {
160
161
  delete this.status[key];
161
162
  this.callback({
162
163
  name: name,
@@ -180,7 +181,7 @@ function getMissingDependencies(dependencies, sdkVersion, wantedDependencyVersio
180
181
  var dep = dependencies[name_1];
181
182
  if (dep.peerDependencies) {
182
183
  for (var peerName in dep.peerDependencies) {
183
- if (!sdk_1.isModulePreloaded(peerName, sdkVersion, true) && !dependencies[peerName]) {
184
+ if (!snack_content_1.isModulePreloaded(peerName, sdkVersion, true) && !dependencies[peerName]) {
184
185
  if (!result[peerName]) {
185
186
  result[peerName] = {
186
187
  dependents: [name_1],
@@ -236,7 +237,7 @@ function verifyDependency(name, version) {
236
237
  });
237
238
  }
238
239
  }
239
- if (!sdk_1.isValidSemver(version)) {
240
+ if (!snack_content_1.isValidSemver(version)) {
240
241
  return utils_1.createError({
241
242
  message: "Invalid dependency '" + name + "' (version '" + version + "' is not a valid semver)",
242
243
  fileName: name,
@@ -1 +1 @@
1
- {"version":3,"file":"DependencyResolver.js","sourceRoot":"","sources":["../src/DependencyResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA4B;AAC5B,wFAAiD;AAGjD,6BAAyD;AAQzD,iCAA6C;AAY7C,SAAS,MAAM,CAAC,IAAY,EAAE,OAAe;IAC3C,OAAO,OAAO,CAAC,CAAC,CAAI,IAAI,SAAI,OAAS,CAAC,CAAC,CAAC,IAAI,CAAC;AAC/C,CAAC;AAED;IAME,4BAAY,OAIX;QAPO,WAAM,GAAoC,EAAE,CAAC;QAQnD,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IACnC,CAAC;IAED,gCAAG,GAAH,UAAI,IAAY,EAAE,OAAe,EAAE,UAAsB;QACvD,IAAM,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;QACpF,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,mCAAM,GAAN,UAAO,IAAY,EAAE,OAAe,EAAE,WAAmB;QACvD,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5C,CAAC;IAEK,8CAAiB,GAAvB;;;;;;wBACM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;;;6BACnC,QAAQ,CAAC,MAAM;wBACpB,qBAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAA;;wBAA3B,SAA2B,CAAC;wBAC5B,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;;;;;;KAEzC;IAEa,oCAAO,GAArB,UACE,GAAW,EACX,IAAY,EACZ,OAAe,EACf,UAAsB;;;;;;;wBAEhB,gBAAgB,GAAG,UAAU,IAAI,QAAQ,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,CAAC;wBAC3E,GAAG,GAAM,IAAI,CAAC,YAAY,gBAAW,GAAG,SAAI,gBAAgB,8BAA2B,CAAC;wBAC9F,MAAA,IAAI,CAAC,MAAM,0CAAE,MAAM,CAAC,sBAAsB,EAAE,GAAG,EAAE,KAAK,EAAE;;;;wBAE7C,CAAC,GAAG,CAAC;;;6BAAE,CAAA,CAAC,GAAG,EAAE,CAAA;wBACR,qBAAM,aAAK,CAAC,GAAG,CAAC,EAAA;;wBAAtB,GAAG,GAAG,SAAgB;wBAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;4BACrB,sBAAO;yBACR;6BACG,CAAA,GAAG,CAAC,MAAM,KAAK,GAAG,CAAA,EAAlB,wBAAkB;wBACP,qBAAM,GAAG,CAAC,IAAI,EAAE,EAAA;;wBAAvB,IAAI,GAAG,SAAgB;6BACzB,IAAI,CAAC,OAAO,EAAZ,wBAAY;wBACd,MAAA,IAAI,CAAC,MAAM,0CAAE,MAAM,CAAC,mCAAmC,EAAE,GAAG,EAAE,sBAAsB,EAAE;wBACtF,qBAAM,IAAI,OAAO,CAAC,UAAC,OAAO,IAAK,OAAA,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,EAAzB,CAAyB,CAAC,EAAA;;wBAAzD,SAAyD,CAAC;wBAC1D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;4BACrB,sBAAO;yBACR;;;wBAED,MAAA,IAAI,CAAC,MAAM,0CAAE,MAAM,CAAC,qBAAqB,EAAE,GAAG,EAAE,IAAI,EAAE;wBACtD,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;wBACxB,IAAI;4BACF,IAAI,CAAC,QAAQ,CACX;gCACE,IAAI,MAAA;gCACJ,OAAO,SAAA;gCACP,UAAU,YAAA;6BACX,EACD,IAAI,CACL,CAAC;4BACF,sBAAO;yBACR;wBAAC,OAAO,CAAC,EAAE;4BACV,sBAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAC;yBAC1B;;;4BAGW,qBAAM,GAAG,CAAC,IAAI,EAAE,EAAA;;wBAAxB,KAAK,GAAG,SAAgB;wBAC9B,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;;wBAhCH,CAAC,EAAE,CAAA;;;;;wBAoCrB,KAAK,GAAG,mBAAW,CAAC;4BACxB,OAAO,EAAE,mCAAiC,GAAG,WAAM,GAAC,CAAC,OAAO,MAAG;4BAC/D,QAAQ,EAAE,GAAG;yBACd,CAAC,CAAC;wBACH,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,KAAK,EAAE;wBAC1B,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;4BACpB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;4BACxB,IAAI,CAAC,QAAQ,CACX;gCACE,IAAI,MAAA;gCACJ,OAAO,SAAA;gCACP,UAAU,YAAA;6BACX,EACD,SAAS,EACT,KAAK,CACN,CAAC;yBACH;;;;;;KAEJ;IACH,yBAAC;AAAD,CAAC,AAnGD,IAmGC;;AAED,SAAgB,sBAAsB,CACpC,YAA+B,EAC/B,UAAsB,EACtB,wBAAkD;;IAElD,IAAM,MAAM,GAA6B,EAAE,CAAC;IAC5C,KAAK,IAAM,MAAI,IAAI,YAAY,EAAE;QAC/B,IAAM,GAAG,GAAG,YAAY,CAAC,MAAI,CAAC,CAAC;QAC/B,IAAI,GAAG,CAAC,gBAAgB,EAAE;YACxB,KAAK,IAAM,QAAQ,IAAI,GAAG,CAAC,gBAAgB,EAAE;gBAC3C,IAAI,CAAC,uBAAiB,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;oBAC7E,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;wBACrB,MAAM,CAAC,QAAQ,CAAC,GAAG;4BACjB,UAAU,EAAE,CAAC,MAAI,CAAC;4BAClB,aAAa,cACX,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAG,QAAQ,oCAAK,GAAG,CAAC,gBAAgB,CAAC,QAAQ,CAAC,mCAAI,GAAG;yBAChF,CAAC;qBACH;yBAAM;wBACL,IAAI,aAAa,GAAuB,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAG,QAAQ,CAAC,CAAC;wBAC7E,IAAI,CAAC,aAAa,EAAE;4BAClB,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC;4BAC/C,IAAM,OAAO,GAAG,GAAG,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC;4BACtD,2CAA2C;4BAC3C,IACE,aAAa,KAAK,GAAG;gCACrB,CAAC,OAAO,KAAK,QAAQ,IAAI,aAAa,KAAK,QAAQ,CAAC;gCACpD,CAAC,OAAO,KAAK,GAAG;oCACd,OAAO,KAAK,QAAQ;oCACpB,CAAC,aAAa,KAAK,QAAQ;wCACzB,gBAAM,CAAC,EAAE,CAAC,gBAAM,CAAC,MAAM,CAAC,OAAO,CAAE,EAAE,gBAAM,CAAC,MAAM,CAAC,aAAc,CAAE,CAAC,CAAC,CAAC,EACxE;gCACA,aAAa,GAAG,OAAO,CAAC;6BACzB;yBACF;wBACD,MAAM,CAAC,QAAQ,CAAC,GAAG;4BACjB,UAAU,iBAAM,MAAM,CAAC,QAAQ,CAAC,CAAC,UAAU,GAAE,MAAI,EAAC;4BAClD,aAAa,eAAA;yBACd,CAAC;qBACH;iBACF;aACF;SACF;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AA5CD,wDA4CC;AAED,SAAgB,gBAAgB,CAAC,IAAY,EAAE,OAAe;IACxD,IAAA,KAAkC,mCAAQ,CAAC,IAAI,CAAC,EAA9C,mBAAmB,yBAAA,EAAE,MAAM,YAAmB,CAAC;IACrD,IAAI,CAAC,mBAAmB,EAAE;QACxB,wFAAwF;QACxF,IAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YAC9C,IAAM,MAAM,GAAG,mCAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAClC,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAC;YACjD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;SACxB;aAAM,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YACpD,IAAM,MAAM,GAAG,mCAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACnD,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAC;YACjD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;SACxB;QAED,IAAI,CAAC,mBAAmB,EAAE;YACxB,OAAO,mBAAW,CAAC;gBACjB,OAAO,EAAE,yBAAuB,IAAI,WAAK,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAC,CAAC,CAAC,MAAI,MAAM,CAAC,CAAC,CAAC,MAAG,CAAC,CAAC,CAAC,EAAE,CAAE;gBACjF,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;SACJ;KACF;IACD,IAAI,CAAC,mBAAa,CAAC,OAAO,CAAC,EAAE;QAC3B,OAAO,mBAAW,CAAC;YACjB,OAAO,EAAE,yBAAuB,IAAI,oBAAe,OAAO,6BAA0B;YACpF,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;KACJ;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AA7BD,4CA6BC;AAED,SAAgB,cAAc,CAAC,IAAY;IACzC,IAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9B,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE;QACjD,OAAU,KAAK,CAAC,CAAC,CAAC,SAAI,KAAK,CAAC,CAAC,CAAG,CAAC;KAClC;SAAM;QACL,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC;AAPD,wCAOC","sourcesContent":["import semver from 'semver';\nimport validate from 'validate-npm-package-name';\n\nimport { Logger } from './Logger';\nimport { isModulePreloaded, isValidSemver } from './sdk';\nimport {\n SDKVersion,\n SnackDependencies,\n SnackMissingDependencies,\n SnackDependencyVersions,\n SnackError,\n} from './types';\nimport { fetch, createError } from './utils';\n\nexport type DependencyResolverCallback = (\n request: {\n name: string;\n version: string;\n sdkVersion: SDKVersion;\n },\n result?: any,\n error?: SnackError\n) => any;\n\nfunction getKey(name: string, version: string) {\n return version ? `${name}@${version}` : name;\n}\n\nexport default class DependencyResolver {\n private snackagerURL: string;\n private logger?: Logger;\n private status: { [key: string]: Promise<any> } = {};\n private callback: DependencyResolverCallback;\n\n constructor(options: {\n snackagerURL: string;\n logger?: Logger;\n callback: DependencyResolverCallback;\n }) {\n this.snackagerURL = options.snackagerURL;\n this.logger = options.logger;\n this.callback = options.callback;\n }\n\n add(name: string, version: string, sdkVersion: SDKVersion) {\n const key = getKey(name, version);\n this.status[key] = this.status[key] || this.resolve(key, name, version, sdkVersion);\n return this.status[key];\n }\n\n remove(name: string, version: string, _sdkVersion: string) {\n delete this.status[getKey(name, version)];\n }\n\n async waitForCompletion() {\n let promises = Object.values(this.status);\n while (promises.length) {\n await Promise.all(promises);\n promises = Object.values(this.status);\n }\n }\n\n private async resolve(\n key: string,\n name: string,\n version: string,\n sdkVersion: SDKVersion\n ): Promise<any> {\n const versionSnackager = sdkVersion >= '37.0.0' ? 'version_snackager=true&' : '';\n const url = `${this.snackagerURL}/bundle/${key}?${versionSnackager}platforms=ios,android,web`;\n this.logger?.module('Resolving dependency', key, '...');\n try {\n for (let i = 0; i < 30; i++) {\n const res = await fetch(url);\n if (!this.status[key]) {\n return;\n }\n if (res.status === 200) {\n const data = await res.json();\n if (data.pending) {\n this.logger?.module('Dependency is still being bundled', key, 'trying again shortly');\n await new Promise((resolve) => setTimeout(resolve, 5000));\n if (!this.status[key]) {\n return;\n }\n } else {\n this.logger?.module('Resolved dependency', key, data);\n delete this.status[key];\n try {\n this.callback(\n {\n name,\n version,\n sdkVersion,\n },\n data\n );\n return;\n } catch (e) {\n return Promise.reject(e);\n }\n }\n } else {\n const error = await res.text();\n throw new Error(error);\n }\n }\n } catch (e) {\n const error = createError({\n message: `Failed to resolve dependency '${key}' (${e.message})`,\n fileName: key,\n });\n this.logger?.error(error);\n if (this.status[key]) {\n delete this.status[key];\n this.callback(\n {\n name,\n version,\n sdkVersion,\n },\n undefined,\n error\n );\n }\n }\n }\n}\n\nexport function getMissingDependencies(\n dependencies: SnackDependencies,\n sdkVersion: SDKVersion,\n wantedDependencyVersions?: SnackDependencyVersions\n): SnackMissingDependencies {\n const result: SnackMissingDependencies = {};\n for (const name in dependencies) {\n const dep = dependencies[name];\n if (dep.peerDependencies) {\n for (const peerName in dep.peerDependencies) {\n if (!isModulePreloaded(peerName, sdkVersion, true) && !dependencies[peerName]) {\n if (!result[peerName]) {\n result[peerName] = {\n dependents: [name],\n wantedVersion:\n wantedDependencyVersions?.[peerName] ?? dep.peerDependencies[peerName] ?? '*',\n };\n } else {\n let wantedVersion: string | undefined = wantedDependencyVersions?.[peerName];\n if (!wantedVersion) {\n wantedVersion = result[peerName].wantedVersion;\n const version = dep.peerDependencies[peerName] || '*';\n // Select the highest most specific version\n if (\n wantedVersion === '*' ||\n (version === 'latest' && wantedVersion === 'latest') ||\n (version !== '*' &&\n version !== 'latest' &&\n (wantedVersion === 'latest' ||\n semver.gt(semver.coerce(version)!, semver.coerce(wantedVersion!)!)))\n ) {\n wantedVersion = version;\n }\n }\n result[peerName] = {\n dependents: [...result[peerName].dependents, name],\n wantedVersion,\n };\n }\n }\n }\n }\n }\n return result;\n}\n\nexport function verifyDependency(name: string, version: string): SnackError | undefined {\n let { validForOldPackages, errors } = validate(name);\n if (!validForOldPackages) {\n // Also support code inside packages such as \"react-native-gesture-handler/DrawerLayout\"\n const names = name.split('/');\n if (names.length >= 2 && !name.startsWith('@')) {\n const result = validate(names[0]);\n validForOldPackages = result.validForNewPackages;\n errors = result.errors;\n } else if (names.length >= 2 && name.startsWith('@')) {\n const result = validate(names[0] + '/' + names[1]);\n validForOldPackages = result.validForNewPackages;\n errors = result.errors;\n }\n\n if (!validForOldPackages) {\n return createError({\n message: `Invalid dependency '${name}' ${errors?.length ? `(${errors[0]})` : ''}`,\n fileName: name,\n });\n }\n }\n if (!isValidSemver(version)) {\n return createError({\n message: `Invalid dependency '${name}' (version '${version}' is not a valid semver)`,\n fileName: name,\n });\n }\n return undefined;\n}\n\nexport function getPackageName(name: string): string {\n const names = name.split('/');\n if (names[0].startsWith('@') && names.length >= 2) {\n return `${names[0]}/${names[1]}`;\n } else {\n return names[0];\n }\n}\n"]}
1
+ {"version":3,"file":"DependencyResolver.js","sourceRoot":"","sources":["../src/DependencyResolver.ts"],"names":[],"mappings":"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","sourcesContent":["import semver from 'semver';\nimport {\n SDKVersion,\n SnackDependencies,\n SnackMissingDependencies,\n SnackDependencyVersions,\n isModulePreloaded,\n isValidSemver,\n} from 'snack-content';\nimport validate from 'validate-npm-package-name';\n\nimport { Logger } from './Logger';\nimport { SnackError } from './types';\nimport { fetch, createError } from './utils';\n\nexport type DependencyResolverCallback = (\n request: {\n name: string;\n version: string;\n sdkVersion: SDKVersion;\n },\n result?: any,\n error?: SnackError\n) => any;\n\nfunction getKey(name: string, version: string) {\n return version ? `${name}@${version}` : name;\n}\n\nexport default class DependencyResolver {\n private snackagerURL: string;\n private logger?: Logger;\n private status: { [key: string]: Promise<any> } = {};\n private callback: DependencyResolverCallback;\n\n constructor(options: {\n snackagerURL: string;\n logger?: Logger;\n callback: DependencyResolverCallback;\n }) {\n this.snackagerURL = options.snackagerURL;\n this.logger = options.logger;\n this.callback = options.callback;\n }\n\n add(name: string, version: string, sdkVersion: SDKVersion) {\n const key = getKey(name, version);\n this.status[key] = this.status[key] || this.resolve(key, name, version, sdkVersion);\n return this.status[key];\n }\n\n remove(name: string, version: string, _sdkVersion: string) {\n delete this.status[getKey(name, version)];\n }\n\n async waitForCompletion() {\n let promises = Object.values(this.status);\n while (promises.length) {\n await Promise.all(promises);\n promises = Object.values(this.status);\n }\n }\n\n private async resolve(\n key: string,\n name: string,\n version: string,\n sdkVersion: SDKVersion\n ): Promise<any> {\n const versionSnackager = sdkVersion >= '37.0.0' ? 'version_snackager=true&' : '';\n const url = `${this.snackagerURL}/bundle/${key}?${versionSnackager}platforms=ios,android,web`;\n this.logger?.module('Resolving dependency', key, '...');\n try {\n for (let i = 0; i < 30; i++) {\n const res = await fetch(url);\n if (!this.status[key]) {\n return;\n }\n if (res.status === 200) {\n const data = await res.json();\n if (data.pending) {\n this.logger?.module('Dependency is still being bundled', key, 'trying again shortly');\n await new Promise((resolve) => setTimeout(resolve, 5000));\n if (!this.status[key]) {\n return;\n }\n } else {\n this.logger?.module('Resolved dependency', key, data);\n delete this.status[key];\n try {\n this.callback(\n {\n name,\n version,\n sdkVersion,\n },\n data\n );\n return;\n } catch (e) {\n return Promise.reject(e);\n }\n }\n } else {\n const error = await res.text();\n throw new Error(error);\n }\n }\n } catch (e) {\n const error = createError({\n message: `Failed to resolve dependency '${key}' (${e.message})`,\n fileName: key,\n });\n this.logger?.error(error);\n // TypeScript thinks we need to await this promise, but we are actually checking if there is a promise or not. TS2801\n // ESLint doesn't like when we cast to a boolean inside of an if statement. no-extra-boolean-cast\n const promiseExists = !!this.status[key];\n if (promiseExists) {\n delete this.status[key];\n this.callback(\n {\n name,\n version,\n sdkVersion,\n },\n undefined,\n error\n );\n }\n }\n }\n}\n\nexport function getMissingDependencies(\n dependencies: SnackDependencies,\n sdkVersion: SDKVersion,\n wantedDependencyVersions?: SnackDependencyVersions\n): SnackMissingDependencies {\n const result: SnackMissingDependencies = {};\n for (const name in dependencies) {\n const dep = dependencies[name];\n if (dep.peerDependencies) {\n for (const peerName in dep.peerDependencies) {\n if (!isModulePreloaded(peerName, sdkVersion, true) && !dependencies[peerName]) {\n if (!result[peerName]) {\n result[peerName] = {\n dependents: [name],\n wantedVersion:\n wantedDependencyVersions?.[peerName] ?? dep.peerDependencies[peerName] ?? '*',\n };\n } else {\n let wantedVersion: string | undefined = wantedDependencyVersions?.[peerName];\n if (!wantedVersion) {\n wantedVersion = result[peerName].wantedVersion;\n const version = dep.peerDependencies[peerName] || '*';\n // Select the highest most specific version\n if (\n wantedVersion === '*' ||\n (version === 'latest' && wantedVersion === 'latest') ||\n (version !== '*' &&\n version !== 'latest' &&\n (wantedVersion === 'latest' ||\n semver.gt(semver.coerce(version)!, semver.coerce(wantedVersion!)!)))\n ) {\n wantedVersion = version;\n }\n }\n result[peerName] = {\n dependents: [...result[peerName].dependents, name],\n wantedVersion,\n };\n }\n }\n }\n }\n }\n return result;\n}\n\nexport function verifyDependency(name: string, version: string): SnackError | undefined {\n let { validForOldPackages, errors } = validate(name);\n if (!validForOldPackages) {\n // Also support code inside packages such as \"react-native-gesture-handler/DrawerLayout\"\n const names = name.split('/');\n if (names.length >= 2 && !name.startsWith('@')) {\n const result = validate(names[0]);\n validForOldPackages = result.validForNewPackages;\n errors = result.errors;\n } else if (names.length >= 2 && name.startsWith('@')) {\n const result = validate(names[0] + '/' + names[1]);\n validForOldPackages = result.validForNewPackages;\n errors = result.errors;\n }\n\n if (!validForOldPackages) {\n return createError({\n message: `Invalid dependency '${name}' ${errors?.length ? `(${errors[0]})` : ''}`,\n fileName: name,\n });\n }\n }\n if (!isValidSemver(version)) {\n return createError({\n message: `Invalid dependency '${name}' (version '${version}' is not a valid semver)`,\n fileName: name,\n });\n }\n return undefined;\n}\n\nexport function getPackageName(name: string): string {\n const names = name.split('/');\n if (names[0].startsWith('@') && names.length >= 2) {\n return `${names[0]}/${names[1]}`;\n } else {\n return names[0];\n }\n}\n"]}
@@ -1,5 +1,6 @@
1
+ import { SnackFile } from 'snack-content';
1
2
  import { Logger } from './Logger';
2
- import { SnackFile, SnackError } from './types';
3
+ import { SnackError } from './types';
3
4
  export declare type FileUploaderRequest = {
4
5
  path: string;
5
6
  file: SnackFile;
@@ -1 +1 @@
1
- {"version":3,"file":"FileUploader.js","sourceRoot":"","sources":["../src/FileUploader.ts"],"names":[],"mappings":"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","sourcesContent":["import { Logger } from './Logger';\nimport { SnackFile, SnackError } from './types';\nimport { fetch, createError } from './utils';\n\nexport type FileUploaderRequest = {\n path: string;\n file: SnackFile;\n};\n\nexport type FileUploaderCallback = (\n request: FileUploaderRequest,\n resultURL?: string,\n error?: SnackError\n) => any;\n\nexport default class FileUploader {\n private apiURL: string;\n private logger?: Logger;\n private status: {\n [path: string]: {\n file: SnackFile;\n promise: Promise<any>;\n };\n } = {};\n private callback: FileUploaderCallback;\n\n constructor(options: { apiURL: string; callback: FileUploaderCallback; logger?: Logger }) {\n this.apiURL = options.apiURL;\n this.callback = options.callback;\n this.logger = options.logger;\n }\n\n add(path: string, file: SnackFile) {\n const status = this.status[path];\n if (status && status.file === file) {\n return status.promise;\n }\n this.status[path] = {\n file,\n promise: this.upload(path, file),\n };\n return this.status[path].promise;\n }\n\n remove(path: string, file?: SnackFile) {\n if (!file || this.status[path]?.file === file) {\n delete this.status[path];\n }\n }\n\n async waitForCompletion() {\n let promises = Object.values(this.status).map((status) => status.promise);\n while (promises.length) {\n await Promise.all(promises);\n promises = Object.values(this.status).map((status) => status.promise);\n }\n }\n\n private async upload(path: string, file: SnackFile): Promise<any> {\n try {\n this.logger?.module('Uploading file', path, '...');\n let url: string;\n let input;\n switch (file.type) {\n case 'CODE':\n url = `${this.apiURL}/--/api/v2/snack/uploadCode`;\n input = {\n method: 'POST',\n body: JSON.stringify({ code: file.contents }),\n headers: { 'Content-Type': 'application/json' },\n };\n break;\n case 'ASSET':\n url = `${this.apiURL}/--/api/v2/snack/uploadAsset`;\n if (\n (typeof FormData !== 'undefined' && file.contents instanceof FormData) ||\n (typeof file.contents === 'object' && file.contents.constructor?.name === 'FormData')\n ) {\n input = {\n method: 'POST',\n body: file.contents,\n };\n } else if (typeof FormData !== 'undefined') {\n const formData = new FormData();\n // @ts-expect-error: file.contents can be both File or Blob\n formData.append('asset', file.contents, file.contents?.name || path);\n input = {\n method: 'POST',\n body: formData,\n };\n } else {\n // TODO: Add support for uploading files using ArrayBuffer in body to the /snack/uploadAsset end-point\n // That way it's no longer neccessary to polyfill FormData is environments such as node.\n throw new Error(\n 'Uploading assets is not supported in this environment. Make sure FormData is polyfilled or provide the data as a FormData object'\n );\n }\n break;\n default:\n // @ts-ignore: Property 'type' does not exist on type 'never'\n throw new Error(`Invalid file type ${file.type}`);\n }\n\n const response = await fetch(url, input);\n if (!response.ok) {\n const text = await response.text();\n throw new Error(text);\n }\n const result = await response.json();\n const resultURL = result.url;\n\n if (this.status[path]?.file === file) {\n this.logger?.module('Uploaded file', path, resultURL);\n delete this.status[path];\n try {\n this.callback({ path, file }, resultURL);\n } catch (e) {\n return Promise.reject(e);\n }\n }\n } catch (e) {\n const error = createError({\n message: `Failed to upload file ${path} (${e.message})`,\n fileName: path,\n });\n this.logger?.error(error);\n if (this.status[path]?.file === file) {\n delete this.status[path];\n this.callback({ path, file }, undefined, error);\n }\n }\n }\n}\n"]}
1
+ {"version":3,"file":"FileUploader.js","sourceRoot":"","sources":["../src/FileUploader.ts"],"names":[],"mappings":"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","sourcesContent":["import { SnackFile } from 'snack-content';\n\nimport { Logger } from './Logger';\nimport { SnackError } from './types';\nimport { fetch, createError } from './utils';\n\nexport type FileUploaderRequest = {\n path: string;\n file: SnackFile;\n};\n\nexport type FileUploaderCallback = (\n request: FileUploaderRequest,\n resultURL?: string,\n error?: SnackError\n) => any;\n\nexport default class FileUploader {\n private apiURL: string;\n private logger?: Logger;\n private status: {\n [path: string]: {\n file: SnackFile;\n promise: Promise<any>;\n };\n } = {};\n private callback: FileUploaderCallback;\n\n constructor(options: { apiURL: string; callback: FileUploaderCallback; logger?: Logger }) {\n this.apiURL = options.apiURL;\n this.callback = options.callback;\n this.logger = options.logger;\n }\n\n add(path: string, file: SnackFile) {\n const status = this.status[path];\n if (status && status.file === file) {\n return status.promise;\n }\n this.status[path] = {\n file,\n promise: this.upload(path, file),\n };\n return this.status[path].promise;\n }\n\n remove(path: string, file?: SnackFile) {\n if (!file || this.status[path]?.file === file) {\n delete this.status[path];\n }\n }\n\n async waitForCompletion() {\n let promises = Object.values(this.status).map((status) => status.promise);\n while (promises.length) {\n await Promise.all(promises);\n promises = Object.values(this.status).map((status) => status.promise);\n }\n }\n\n private async upload(path: string, file: SnackFile): Promise<any> {\n try {\n this.logger?.module('Uploading file', path, '...');\n let url: string;\n let input;\n switch (file.type) {\n case 'CODE':\n url = `${this.apiURL}/--/api/v2/snack/uploadCode`;\n input = {\n method: 'POST',\n body: JSON.stringify({ code: file.contents }),\n headers: { 'Content-Type': 'application/json' },\n };\n break;\n case 'ASSET':\n url = `${this.apiURL}/--/api/v2/snack/uploadAsset`;\n if (\n (typeof FormData !== 'undefined' && file.contents instanceof FormData) ||\n (typeof file.contents === 'object' && file.contents.constructor?.name === 'FormData')\n ) {\n input = {\n method: 'POST',\n body: file.contents,\n };\n } else if (typeof FormData !== 'undefined') {\n const formData = new FormData();\n // @ts-expect-error: file.contents can be both File or Blob\n formData.append('asset', file.contents, file.contents?.name || path);\n input = {\n method: 'POST',\n body: formData,\n };\n } else {\n // TODO: Add support for uploading files using ArrayBuffer in body to the /snack/uploadAsset end-point\n // That way it's no longer neccessary to polyfill FormData is environments such as node.\n throw new Error(\n 'Uploading assets is not supported in this environment. Make sure FormData is polyfilled or provide the data as a FormData object'\n );\n }\n break;\n default:\n // @ts-ignore: Property 'type' does not exist on type 'never'\n throw new Error(`Invalid file type ${file.type}`);\n }\n\n const response = await fetch(url, input);\n if (!response.ok) {\n const text = await response.text();\n throw new Error(text);\n }\n const result = await response.json();\n const resultURL = result.url;\n\n if (this.status[path]?.file === file) {\n this.logger?.module('Uploaded file', path, resultURL);\n delete this.status[path];\n try {\n this.callback({ path, file }, resultURL);\n } catch (e) {\n return Promise.reject(e);\n }\n }\n } catch (e) {\n const error = createError({\n message: `Failed to upload file ${path} (${e.message})`,\n fileName: path,\n });\n this.logger?.error(error);\n if (this.status[path]?.file === file) {\n delete this.status[path];\n this.callback({ path, file }, undefined, error);\n }\n }\n }\n}\n"]}
@@ -1,5 +1,6 @@
1
+ import { SDKVersion, SnackDependencies, SnackDependency, SnackFile, SnackFiles } from 'snack-content';
1
2
  import { SnackTransport, SnackTransportOptions } from './transports';
2
- import { SDKVersion, SnackDependencies, SnackFiles, SnackFile, SnackState, SnackUser, SnackLogEvent, SnackListenerSubscription, SnackDependency, SnackConnectedClients, SnackWindowRef } from './types';
3
+ import { SnackState, SnackUser, SnackLogEvent, SnackListenerSubscription, SnackConnectedClients, SnackWindowRef } from './types';
3
4
  export declare type SnackOptions = {
4
5
  sdkVersion?: SDKVersion;
5
6
  name?: string;
@@ -23,6 +24,8 @@ export declare type SnackOptions = {
23
24
  previewTimeout?: number;
24
25
  user?: SnackUser;
25
26
  id?: string;
27
+ snackId?: string;
28
+ accountSnackId?: string;
26
29
  webPlayerURL?: string;
27
30
  webPreviewRef?: SnackWindowRef;
28
31
  };
@@ -114,6 +117,8 @@ export default class Snack {
114
117
  id: string;
115
118
  url: string;
116
119
  hashId: string | undefined;
120
+ accountSnackId: string | undefined;
121
+ snackId: string | undefined;
117
122
  }>;
118
123
  /**
119
124
  * Gets the URL at which the Snack can be downloaded as a zip file. Will automatically
package/build/Session.js CHANGED
@@ -71,6 +71,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
71
71
  Object.defineProperty(exports, "__esModule", { value: true });
72
72
  var mapValues_1 = __importDefault(require("lodash/mapValues"));
73
73
  var nullthrows_1 = __importDefault(require("nullthrows"));
74
+ var snack_content_1 = require("snack-content");
74
75
  var DependencyResolver_1 = __importStar(require("./DependencyResolver"));
75
76
  var DevSession_1 = __importDefault(require("./DevSession"));
76
77
  var FileUploader_1 = __importDefault(require("./FileUploader"));
@@ -78,7 +79,6 @@ var Logger_1 = require("./Logger");
78
79
  var State = __importStar(require("./State"));
79
80
  var WantedVersions_1 = require("./WantedVersions");
80
81
  var defaultConfig_1 = __importStar(require("./defaultConfig"));
81
- var sdk_1 = require("./sdk");
82
82
  var transports_1 = require("./transports");
83
83
  var webPlayer_1 = require("./transports/webPlayer");
84
84
  var utils_1 = require("./utils");
@@ -190,7 +190,7 @@ var Snack = /** @class */ (function () {
190
190
  }
191
191
  };
192
192
  var channel = utils_1.createChannel(options.channel);
193
- var sdkVersion = sdk_1.validateSDKVersion((_a = options.sdkVersion) !== null && _a !== void 0 ? _a : defaultConfig_1.default.sdkVersion);
193
+ var sdkVersion = snack_content_1.validateSDKVersion((_a = options.sdkVersion) !== null && _a !== void 0 ? _a : defaultConfig_1.default.sdkVersion);
194
194
  var dependencies = options.dependencies ? __assign({}, options.dependencies) : {};
195
195
  this.apiURL = (_b = options.apiURL) !== null && _b !== void 0 ? _b : defaultConfig_1.default.apiURL;
196
196
  this.host = (_c = options.host) !== null && _c !== void 0 ? _c : new URL(this.apiURL).host;
@@ -237,9 +237,12 @@ var Snack = /** @class */ (function () {
237
237
  url: utils_1.createURL(this.host, sdkVersion, channel, options.id),
238
238
  channel: channel,
239
239
  deviceId: options.deviceId,
240
+ snackId: options.snackId,
241
+ accountSnackId: options.accountSnackId,
240
242
  }, defaultConfig_1.SnackIdentityState);
241
243
  this.state.unsaved = false;
242
244
  this.wantedDependencyVersions = new WantedVersions_1.WantedDependencyVersions({
245
+ apiUrl: this.apiURL,
243
246
  logger: this.logger,
244
247
  callback: this.onWantedDependencyVersions,
245
248
  });
@@ -269,7 +272,7 @@ var Snack = /** @class */ (function () {
269
272
  * @param sdkVersion Valid SDK version (e.g. "38.0.0")
270
273
  */
271
274
  Snack.prototype.setSDKVersion = function (sdkVersion) {
272
- sdk_1.validateSDKVersion(sdkVersion);
275
+ snack_content_1.validateSDKVersion(sdkVersion);
273
276
  return this.setState(function (state) {
274
277
  return state.sdkVersion !== sdkVersion
275
278
  ? {
@@ -382,7 +385,7 @@ var Snack = /** @class */ (function () {
382
385
  Snack.prototype.saveAsync = function (options) {
383
386
  var _a, _b, _c, _d, _e, _f;
384
387
  return __awaiter(this, void 0, void 0, function () {
385
- var prevState, _g, name, description, sdkVersion, files, dependencies, user, payload, previewPromise, url, response, data, id_1, saveURL_1, hashId, e_1;
388
+ var prevState, _g, name, description, sdkVersion, files, dependencies, user, payload, previewPromise, url, response, data, id_1, saveURL_1, hashId, accountSnackId_1, snackId_1, e_1;
386
389
  var _this = this;
387
390
  return __generator(this, function (_h) {
388
391
  switch (_h.label) {
@@ -436,11 +439,15 @@ var Snack = /** @class */ (function () {
436
439
  id_1 = data.id;
437
440
  saveURL_1 = utils_1.createURL(this.host, sdkVersion, undefined, id_1);
438
441
  hashId = data.hashId;
442
+ accountSnackId_1 = data.accountSnackId;
443
+ snackId_1 = data.snackId;
439
444
  this.setState(function (state) { return ({
440
445
  id: id_1,
441
446
  saveURL: saveURL_1,
442
447
  unsaved: State.isUnsaved(state, prevState),
443
448
  savedSDKVersion: (options === null || options === void 0 ? void 0 : options.isDraft) && state.savedSDKVersion ? state.savedSDKVersion : sdkVersion,
449
+ accountSnackId: accountSnackId_1,
450
+ snackId: snackId_1,
444
451
  }); });
445
452
  previewPromise.then(function (connectedClients) {
446
453
  var conns = Object.values(connectedClients)
@@ -454,6 +461,8 @@ var Snack = /** @class */ (function () {
454
461
  id: id_1,
455
462
  url: saveURL_1,
456
463
  hashId: hashId,
464
+ accountSnackId: accountSnackId_1,
465
+ snackId: snackId_1,
457
466
  }];
458
467
  case 5:
459
468
  e_1 = _h.sent();
@@ -784,8 +793,8 @@ var Snack = /** @class */ (function () {
784
793
  if (!dependencies[name_3] ||
785
794
  dependencies[name_3].version !== prevDependencies[name_3].version ||
786
795
  state.disabled ||
787
- (sdk_1.isModulePreloaded(name_3, state.sdkVersion) &&
788
- !sdk_1.isModulePreloaded(name_3, prevState.sdkVersion))) {
796
+ (snack_content_1.isModulePreloaded(name_3, state.sdkVersion) &&
797
+ !snack_content_1.isModulePreloaded(name_3, prevState.sdkVersion))) {
789
798
  this.dependencyResolver.remove(name_3, prevDependencies[name_3].version, prevState.sdkVersion);
790
799
  }
791
800
  }
@@ -800,7 +809,7 @@ var Snack = /** @class */ (function () {
800
809
  var dependency = dependencies[name_4];
801
810
  if (!dependency.handle &&
802
811
  !dependency.error &&
803
- !sdk_1.isModulePreloaded(name_4, state.sdkVersion) &&
812
+ !snack_content_1.isModulePreloaded(name_4, state.sdkVersion) &&
804
813
  !(dependency.version === '*' && !state.wantedDependencyVersions) &&
805
814
  (((_a = prevDependencies[name_4]) === null || _a === void 0 ? void 0 : _a.version) !== dependency.version ||
806
815
  (dependency.version === '*' && !prevState.wantedDependencyVersions) || ((_b = prevDependencies[name_4]) === null || _b === void 0 ? void 0 : _b.handle) || ((_c = prevDependencies[name_4]) === null || _c === void 0 ? void 0 : _c.error) ||