@forge/bundler 7.2.3-next.16-experimental-554d417 → 7.2.3-next.17

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 (7) hide show
  1. package/CHANGELOG.md +5 -22
  2. package/out/runtime.d.ts.map +1 -1
  3. package/out/runtime.js +3 -10
  4. package/out/wrapper-provider.d.ts +6 -8
  5. package/out/wrapper-provider.d.ts.map +1 -1
  6. package/out/wrapper-provider.js +4 -8
  7. package/package.json +4 -4
package/CHANGELOG.md CHANGED
@@ -1,30 +1,13 @@
1
1
  # @forge/bundler
2
2
 
3
- ## 7.2.3-next.16-experimental-554d417
3
+ ## 7.2.3-next.17
4
4
 
5
5
  ### Patch Changes
6
6
 
7
- - Updated dependencies [2a491b9]
8
- - Updated dependencies [82730f2]
9
- - Updated dependencies [dc2caec]
10
- - Updated dependencies [b090628]
11
- - Updated dependencies [385ac1a]
12
- - Updated dependencies [9f27f8a]
13
- - Updated dependencies [cf81630]
14
- - Updated dependencies [a384019]
15
- - Updated dependencies [56fd47c]
16
- - Updated dependencies [9d391ab]
17
- - Updated dependencies [988dff5]
18
- - Updated dependencies [93f4631]
19
- - Updated dependencies [b77e195]
20
- - Updated dependencies [ea3b2ba]
21
- - Updated dependencies [4740d03]
22
- - Updated dependencies [3012e11]
23
- - Updated dependencies [2d36913]
24
- - Updated dependencies [ce74751]
25
- - @forge/cli-shared@9.7.0-next.15-experimental-554d417
26
- - @forge/manifest@13.6.0-next.2-experimental-554d417
27
- - @forge/lint@6.2.3-next.16-experimental-554d417
7
+ - 78af9a2: Always bundle the Node runtime loader, removing the forge-cli-bundle-runtime-loader feature gate
8
+ - Updated dependencies [78af9a2]
9
+ - @forge/cli-shared@9.7.0-next.16
10
+ - @forge/lint@6.2.3-next.17
28
11
 
29
12
  ## 7.2.3-next.16
30
13
 
package/out/runtime.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAiC,cAAc,EAAa,MAAM,mBAAmB,CAAC;AAEnH,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAKjD,OAAO,EAEL,OAAO,EAOR,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAiB,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEpE,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAK3E,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AAkOtD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,GAC7B,OAAO,CAET"}
1
+ {"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAiC,cAAc,EAAa,MAAM,mBAAmB,CAAC;AAEnH,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAKjD,OAAO,EAEL,OAAO,EAOR,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAK3E,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AA4NtD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,GAC7B,OAAO,CAET"}
package/out/runtime.js CHANGED
@@ -22,19 +22,12 @@ async function getRuntimeArtifacts(provider, args) {
22
22
  const result = new Map();
23
23
  const wrapper = await provider.getNodeRuntimeWrapper();
24
24
  const loader = await provider.getNodeRuntimeLoader();
25
- let entrypointScript;
26
- if (loader) {
27
- entrypointScript = loader;
28
- result.set(NODE_RUNTIME_BACKUP_WRAPPER_FILE, Buffer.from(wrapper.script));
29
- }
30
- else {
31
- entrypointScript = wrapper;
32
- }
33
- result.set(exports.NODE_RUNTIME_CODE_FILE, Buffer.from(entrypointScript.script));
25
+ result.set(exports.NODE_RUNTIME_CODE_FILE, Buffer.from(loader.script));
26
+ result.set(NODE_RUNTIME_BACKUP_WRAPPER_FILE, Buffer.from(wrapper.script));
34
27
  if (process.env.FORGE_RUNTIME_PATH) {
35
28
  result.set(NODE_RUNTIME_USE_LOCAL_WRAPPER_FILE, Buffer.from('Local wrapper used'));
36
29
  }
37
- result.set(NODE_RUNTIME_VERSION_FILE, Buffer.from(JSON.stringify({ version: entrypointScript.version }, null, 2)));
30
+ result.set(NODE_RUNTIME_VERSION_FILE, Buffer.from(JSON.stringify({ version: loader.version }, null, 2)));
38
31
  if (args.i18nResourceBundle) {
39
32
  for (const [fileName, filePath] of (0, cli_shared_1.listFilesInI18nResourceBundle)(args.i18nResourceBundle)) {
40
33
  result.set(path_1.default.join(i18n_1.I18N_BUNDLE_FOLDER_NAME, fileName), filePath);
package/out/wrapper-provider.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { BaseError, FileSystemReader, UserError, StatsigService } from '@forge/cli-shared';
1
+ import { BaseError, FileSystemReader, UserError } from '@forge/cli-shared';
2
2
  export declare class LocalWrapperNotFoundError extends UserError {
3
3
  constructor();
4
4
  }
@@ -15,7 +15,7 @@ export type RuntimeScript = {
15
15
  };
16
16
  export interface WrapperProvider {
17
17
  getNodeRuntimeWrapper(): Promise<RuntimeScript>;
18
- getNodeRuntimeLoader(): Promise<RuntimeScript | undefined>;
18
+ getNodeRuntimeLoader(): Promise<RuntimeScript>;
19
19
  }
20
20
  export declare class LocalWrapperProvider implements WrapperProvider {
21
21
  private readonly filesystemReader;
@@ -23,21 +23,19 @@ export declare class LocalWrapperProvider implements WrapperProvider {
23
23
  constructor(filesystemReader: FileSystemReader, runtimePath: string);
24
24
  private getLocalScript;
25
25
  getNodeRuntimeWrapper(): Promise<RuntimeScript>;
26
- getNodeRuntimeLoader(): Promise<RuntimeScript | undefined>;
26
+ getNodeRuntimeLoader(): Promise<RuntimeScript>;
27
27
  }
28
28
  export declare class NetworkWrapperProvider implements WrapperProvider {
29
- protected readonly statsigService: StatsigService;
30
29
  private wrapper;
31
30
  private loader;
32
31
  protected cdnUrl: string;
33
- constructor(statsigService: StatsigService);
32
+ constructor();
34
33
  private getScriptPathFromIndex;
35
34
  private getFileFromCDN;
36
35
  getNodeRuntimeWrapper(): Promise<RuntimeScript>;
37
- getNodeRuntimeLoader(): Promise<RuntimeScript | undefined>;
36
+ getNodeRuntimeLoader(): Promise<RuntimeScript>;
38
37
  }
39
- export declare const getWrapperProvider: ({ fileSystemReader, statsigService }: {
38
+ export declare const getWrapperProvider: ({ fileSystemReader }: {
40
39
  fileSystemReader: FileSystemReader;
41
- statsigService: StatsigService;
42
40
  }) => LocalWrapperProvider | NetworkWrapperProvider;
43
41
  //# sourceMappingURL=wrapper-provider.d.ts.map
package/out/wrapper-provider.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"wrapper-provider.d.ts","sourceRoot":"","sources":["../src/wrapper-provider.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,SAAS,EACT,gBAAgB,EAChB,SAAS,EAGT,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAW3B,qBAAa,yBAA0B,SAAQ,SAAS;;CAIvD;AAED,qBAAa,mBAAoB,SAAQ,SAAS;gBACpC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;CAGhD;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS;CAG3D;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IAChD,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC;CAC5D;AAOD,qBAAa,oBAAqB,YAAW,eAAe;IAExD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW;gBADX,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,MAAM;YAExB,cAAc;IAatB,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC;IAI/C,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAGjE;AAED,qBAAa,sBAAuB,YAAW,eAAe;IAKhD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc;IAJ7D,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,MAAM,CAA4B;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEM,cAAc,EAAE,cAAc;YAI/C,sBAAsB;IAgBpC,OAAO,CAAC,cAAc,CA6CpB;IAEI,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC;IAO/C,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAQjE;AAED,eAAO,MAAM,kBAAkB,GAAI,sCAGhC;IACD,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,cAAc,EAAE,cAAc,CAAC;CAChC,kDAQA,CAAC"}
1
+ {"version":3,"file":"wrapper-provider.d.ts","sourceRoot":"","sources":["../src/wrapper-provider.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,SAAS,EACT,gBAAgB,EAChB,SAAS,EAIV,MAAM,mBAAmB,CAAC;AAW3B,qBAAa,yBAA0B,SAAQ,SAAS;;CAIvD;AAED,qBAAa,mBAAoB,SAAQ,SAAS;gBACpC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;CAGhD;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS;CAG3D;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IAChD,oBAAoB,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;CAChD;AAOD,qBAAa,oBAAqB,YAAW,eAAe;IAExD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW;gBADX,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,MAAM;YAExB,cAAc;IAatB,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC;IAI/C,oBAAoB,IAAI,OAAO,CAAC,aAAa,CAAC;CAGrD;AAED,qBAAa,sBAAuB,YAAW,eAAe;IAC5D,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,MAAM,CAA4B;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;;YAMX,sBAAsB;IAgBpC,OAAO,CAAC,cAAc,CA6CpB;IAEI,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC;IAO/C,oBAAoB,IAAI,OAAO,CAAC,aAAa,CAAC;CAMrD;AAED,eAAO,MAAM,kBAAkB,GAAI,sBAAsB;IAAE,gBAAgB,EAAE,gBAAgB,CAAA;CAAE,kDAQ9F,CAAC"}
package/out/wrapper-provider.js CHANGED
@@ -65,12 +65,10 @@ class LocalWrapperProvider {
65
65
  }
66
66
  exports.LocalWrapperProvider = LocalWrapperProvider;
67
67
  class NetworkWrapperProvider {
68
- statsigService;
69
68
  wrapper;
70
69
  loader;
71
70
  cdnUrl;
72
- constructor(statsigService) {
73
- this.statsigService = statsigService;
71
+ constructor() {
74
72
  this.cdnUrl = (0, cli_shared_1.getEnvironmentConfig)(RuntimeCDN);
75
73
  }
76
74
  async getScriptPathFromIndex(htmlContent, requestId, scriptType) {
@@ -125,18 +123,16 @@ class NetworkWrapperProvider {
125
123
  }
126
124
  async getNodeRuntimeLoader() {
127
125
  if (!this.loader) {
128
- if (await this.statsigService.testForgeCliBundleRuntimeLoaderGate()) {
129
- this.loader = await this.getFileFromCDN(ScriptType.LOADER);
130
- }
126
+ this.loader = await this.getFileFromCDN(ScriptType.LOADER);
131
127
  }
132
128
  return this.loader;
133
129
  }
134
130
  }
135
131
  exports.NetworkWrapperProvider = NetworkWrapperProvider;
136
- const getWrapperProvider = ({ fileSystemReader, statsigService }) => {
132
+ const getWrapperProvider = ({ fileSystemReader }) => {
137
133
  if (process.env.FORGE_RUNTIME_PATH) {
138
134
  return new LocalWrapperProvider(fileSystemReader, process.env.FORGE_RUNTIME_PATH);
139
135
  }
140
- return new NetworkWrapperProvider(statsigService);
136
+ return new NetworkWrapperProvider();
141
137
  };
142
138
  exports.getWrapperProvider = getWrapperProvider;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/bundler",
3
- "version": "7.2.3-next.16-experimental-554d417",
3
+ "version": "7.2.3-next.17",
4
4
  "description": "Default bundler for Forge apps",
5
5
  "license": "SEE LICENSE IN LICENSE.txt",
6
6
  "author": "Atlassian",
@@ -21,10 +21,10 @@
21
21
  "@babel/plugin-transform-react-jsx": "^7.23.4",
22
22
  "@babel/traverse": "^7.24.0",
23
23
  "@babel/types": "^7.24.0",
24
- "@forge/cli-shared": "9.7.0-next.15-experimental-554d417",
24
+ "@forge/cli-shared": "9.7.0-next.16",
25
25
  "@forge/i18n": "1.0.0",
26
- "@forge/lint": "6.2.3-next.16-experimental-554d417",
27
- "@forge/manifest": "13.6.0-next.2-experimental-554d417",
26
+ "@forge/lint": "6.2.3-next.17",
27
+ "@forge/manifest": "13.6.0-next.2",
28
28
  "babel-loader": "^8.3.0",
29
29
  "cheerio": "^1.2.0",
30
30
  "chokidar": "^4.0.3",