@atlaspack/packager-js 2.19.1 → 2.21.0

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @atlaspack/packager-js
 
+## 2.21.0
+
+### Minor Changes
+
+- [#732](https://github.com/atlassian-labs/atlaspack/pull/732) [`7f5841c`](https://github.com/atlassian-labs/atlaspack/commit/7f5841c39df049f9546cccbeea2a7337e0337b45) Thanks [@vykimnguyen](https://github.com/vykimnguyen)! - add tesseract context
+
+### Patch Changes
+
+- [#744](https://github.com/atlassian-labs/atlaspack/pull/744) [`3718bff`](https://github.com/atlassian-labs/atlaspack/commit/3718bff20484138e405e321472336ac058432e10) Thanks [@benjervis](https://github.com/benjervis)! - Fix the scope hoisting improvements feature by making all entry assets of a bundle
+  wrapped, which means there is no top level scope.
+- Updated dependencies [[`ad26146`](https://github.com/atlassian-labs/atlaspack/commit/ad26146f13b4c1cc65d4a0f9c67060b90ef14ff3), [`f1b48e7`](https://github.com/atlassian-labs/atlaspack/commit/f1b48e7a04e005cef0f36a3e692087a9ecdb6f7a), [`7f5841c`](https://github.com/atlassian-labs/atlaspack/commit/7f5841c39df049f9546cccbeea2a7337e0337b45), [`73dd7ba`](https://github.com/atlassian-labs/atlaspack/commit/73dd7baab69456ef2f6e4a0cc7dbb04f407eb148)]:
+  - @atlaspack/rust@3.6.0
+  - @atlaspack/feature-flags@2.22.0
+  - @atlaspack/utils@2.18.1
+  - @atlaspack/plugin@2.14.24
+  - @atlaspack/types@2.15.14
+
+## 2.20.0
+
+### Minor Changes
+
+- [#731](https://github.com/atlassian-labs/atlaspack/pull/731) [`23d561e`](https://github.com/atlassian-labs/atlaspack/commit/23d561e51e68b0c38fd1ff4e4fb173e5e7b01cf2) Thanks [@marcins](https://github.com/marcins)! - Implement "inline isolated" scripts
+
+### Patch Changes
+
+- Updated dependencies [[`23d561e`](https://github.com/atlassian-labs/atlaspack/commit/23d561e51e68b0c38fd1ff4e4fb173e5e7b01cf2)]:
+  - @atlaspack/feature-flags@2.21.0
+  - @atlaspack/utils@2.18.0
+  - @atlaspack/rust@3.5.0
+  - @atlaspack/types@2.15.13
+  - @atlaspack/plugin@2.14.23
+
 ## 2.19.1
 
 ### Patch Changes

package/lib/DevPackager.js

@@ -200,7 +200,7 @@ class DevPackager {
       interpreter = _interpreter;
     }
     let importScripts = '';
-    if (this.bundle.env.isWorker()) {
+    if (this.bundle.env.isWorker() || this.bundle.env.isTesseract()) {
       let bundles = this.bundleGraph.getReferencedBundles(this.bundle);
       for (let b of bundles) {
         importScripts += `importScripts("${(0, _utils().relativeBundlePath)(this.bundle, b)}");\n`;
@@ -212,7 +212,7 @@ class DevPackager {
     );
   }
   isEntry() {
-    return !this.bundleGraph.hasParentBundleOfType(this.bundle, 'js') || this.bundle.env.isIsolated() || this.bundle.bundleBehavior === 'isolated';
+    return !this.bundleGraph.hasParentBundleOfType(this.bundle, 'js') || this.bundle.env.isIsolated() || this.bundle.bundleBehavior === 'isolated' || this.bundle.bundleBehavior === 'inlineIsolated';
   }
 }
 exports.DevPackager = DevPackager;

package/lib/ScopeHoistingPackager.js

@@ -86,6 +86,7 @@ const GLOBALS_BY_CONTEXT = {
   'web-worker': new Set([...BUILTINS, ...Object.keys(_globals().default.worker)]),
   'service-worker': new Set([...BUILTINS, ...Object.keys(_globals().default.serviceworker)]),
   worklet: new Set([...BUILTINS]),
+  tesseract: new Set([...BUILTINS, ...Object.keys(_globals().default.worker)]),
   node: new Set([...BUILTINS, ...Object.keys(_globals().default.node)]),
   'electron-main': new Set([...BUILTINS, ...Object.keys(_globals().default.node)]),
   'electron-renderer': new Set([...BUILTINS, ...Object.keys(_globals().default.node), ...Object.keys(_globals().default.browser)])
@@ -116,7 +117,7 @@ class ScopeHoistingPackager {
     this.logger = logger;
     let OutputFormat = OUTPUT_FORMATS[this.bundle.env.outputFormat];
     this.outputFormat = new OutputFormat(this);
-    this.isAsyncBundle = this.bundleGraph.hasParentBundleOfType(this.bundle, 'js') && !this.bundle.env.isIsolated() && this.bundle.bundleBehavior !== 'isolated';
+    this.isAsyncBundle = this.bundleGraph.hasParentBundleOfType(this.bundle, 'js') && !this.bundle.env.isIsolated() && this.bundle.bundleBehavior !== 'isolated' && this.bundle.bundleBehavior !== 'inlineIsolated';
     this.globalNames = GLOBALS_BY_CONTEXT[bundle.env.context];
   }
   async package() {
@@ -267,7 +268,7 @@ class ScopeHoistingPackager {
       // If the bundle is a conditional bundle
       isConditionalBundle = this.hasConditionalDependency();
     }
-    return this.useAsyncBundleRuntime && bundle.type === 'js' && bundle.bundleBehavior !== 'inline' && bundle.env.outputFormat === 'esmodule' && !bundle.env.isIsolated() && bundle.bundleBehavior !== 'isolated' && (hasHtmlReference || hasConditionalReference || isConditionalBundle);
+    return this.useAsyncBundleRuntime && bundle.type === 'js' && bundle.bundleBehavior !== 'inline' && bundle.bundleBehavior !== 'inlineIsolated' && bundle.env.outputFormat === 'esmodule' && !bundle.env.isIsolated() && bundle.bundleBehavior !== 'isolated' && (hasHtmlReference || hasConditionalReference || isConditionalBundle);
   }
   runWhenReady(bundle, codeToRun) {
     let deps = this.bundleGraph.getReferencedBundles(bundle).filter(b => this.shouldBundleQueue(b)).map(b => b.publicId);
@@ -315,6 +316,14 @@ class ScopeHoistingPackager {
       }
     });
     if ((0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovement')) {
+      // Make all entry assets wrapped, to avoid any top level hoisting
+      for (let entryAsset of this.bundle.getEntryAssets()) {
+        if (!this.wrappedAssets.has(entryAsset.id)) {
+          this.wrappedAssets.add(entryAsset.id);
+          wrapped.push(entryAsset);
+        }
+      }
+
       // Tracks which assets have been assigned to a wrap group
       let assignedAssets = new Set();
       for (let wrappedAsset of wrapped) {
@@ -1225,7 +1234,7 @@ ${code}
       // Add the prelude if this is potentially the first JS bundle to load in a
       // particular context (e.g. entry scripts in HTML, workers, etc.).
       let parentBundles = this.bundleGraph.getParentBundles(this.bundle);
-      let mightBeFirstJS = parentBundles.length === 0 || parentBundles.some(b => b.type !== 'js') || this.bundleGraph.getBundleGroupsContainingBundle(this.bundle).some(g => this.bundleGraph.isEntryBundleGroup(g)) || this.bundle.env.isIsolated() || this.bundle.bundleBehavior === 'isolated' ||
+      let mightBeFirstJS = parentBundles.length === 0 || parentBundles.some(b => b.type !== 'js') || this.bundleGraph.getBundleGroupsContainingBundle(this.bundle).some(g => this.bundleGraph.isEntryBundleGroup(g)) || this.bundle.env.isIsolated() || this.bundle.bundleBehavior === 'isolated' || this.bundle.bundleBehavior === 'inlineIsolated' ||
       // Conditional deps may be loaded before entrypoints on the server
       this.hasConditionalDependency();
       if (mightBeFirstJS) {
@@ -1252,7 +1261,7 @@ ${code}
     }
 
     // Add importScripts for sibling bundles in workers.
-    if (this.bundle.env.isWorker() || this.bundle.env.isWorklet()) {
+    if (this.bundle.env.isWorker() || this.bundle.env.isTesseract() || this.bundle.env.isWorklet()) {
       let importScripts = '';
       let bundles = this.bundleGraph.getReferencedBundles(this.bundle);
       for (let b of bundles) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-js",
-  "version": "2.19.1",
+  "version": "2.21.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -11,24 +11,25 @@
   },
   "main": "./lib/index.js",
   "source": "./src/index.ts",
-  "types": "./lib/index.d.ts",
+  "types": "./lib/types/index.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
     "@atlaspack/diagnostic": "2.14.2",
-    "@atlaspack/feature-flags": "2.20.1",
-    "@atlaspack/plugin": "2.14.22",
-    "@atlaspack/rust": "3.4.2",
+    "@atlaspack/feature-flags": "2.22.0",
+    "@atlaspack/plugin": "2.14.24",
+    "@atlaspack/rust": "3.6.0",
     "@parcel/source-map": "^2.1.1",
-    "@atlaspack/types": "2.15.12",
-    "@atlaspack/utils": "2.17.4",
+    "@atlaspack/types": "2.15.14",
+    "@atlaspack/utils": "2.18.1",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1",
     "outdent": "^0.8.0"
   },
   "type": "commonjs",
   "scripts": {
-    "check-ts": "tsc --emitDeclarationOnly --rootDir src"
+    "check-ts": "tsc --emitDeclarationOnly --rootDir src",
+    "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   }
-}
+}

package/src/DevPackager.ts

@@ -250,7 +250,7 @@ export class DevPackager {
     }
 
     let importScripts = '';
-    if (this.bundle.env.isWorker()) {
+    if (this.bundle.env.isWorker() || this.bundle.env.isTesseract()) {
       let bundles = this.bundleGraph.getReferencedBundles(this.bundle);
       for (let b of bundles) {
         importScripts += `importScripts("${relativeBundlePath(
@@ -272,7 +272,8 @@ export class DevPackager {
     return (
       !this.bundleGraph.hasParentBundleOfType(this.bundle, 'js') ||
       this.bundle.env.isIsolated() ||
-      this.bundle.bundleBehavior === 'isolated'
+      this.bundle.bundleBehavior === 'isolated' ||
+      this.bundle.bundleBehavior === 'inlineIsolated'
     );
   }
 }

package/src/ScopeHoistingPackager.ts

@@ -54,6 +54,7 @@ const GLOBALS_BY_CONTEXT = {
     ...Object.keys(globals.serviceworker),
   ]),
   worklet: new Set([...BUILTINS]),
+  tesseract: new Set([...BUILTINS, ...Object.keys(globals.worker)]),
   node: new Set([...BUILTINS, ...Object.keys(globals.node)]),
   'electron-main': new Set([...BUILTINS, ...Object.keys(globals.node)]),
   'electron-renderer': new Set([
@@ -131,7 +132,8 @@ export class ScopeHoistingPackager {
     this.isAsyncBundle =
       this.bundleGraph.hasParentBundleOfType(this.bundle, 'js') &&
       !this.bundle.env.isIsolated() &&
-      this.bundle.bundleBehavior !== 'isolated';
+      this.bundle.bundleBehavior !== 'isolated' &&
+      this.bundle.bundleBehavior !== 'inlineIsolated';
 
     this.globalNames = GLOBALS_BY_CONTEXT[bundle.env.context];
   }
@@ -323,6 +325,7 @@ export class ScopeHoistingPackager {
       this.useAsyncBundleRuntime &&
       bundle.type === 'js' &&
       bundle.bundleBehavior !== 'inline' &&
+      bundle.bundleBehavior !== 'inlineIsolated' &&
       bundle.env.outputFormat === 'esmodule' &&
       !bundle.env.isIsolated() &&
       bundle.bundleBehavior !== 'isolated' &&
@@ -385,6 +388,7 @@ export class ScopeHoistingPackager {
     let queue = new PromiseQueue({maxConcurrent: 32});
     let wrapped: Array<Asset> = [];
     let constant: Array<Asset> = [];
+
     this.bundle.traverseAssets((asset) => {
       queue.add(async () => {
         let [code, map] = await Promise.all([
@@ -423,6 +427,14 @@ export class ScopeHoistingPackager {
     });
 
     if (getFeatureFlag('applyScopeHoistingImprovement')) {
+      // Make all entry assets wrapped, to avoid any top level hoisting
+      for (let entryAsset of this.bundle.getEntryAssets()) {
+        if (!this.wrappedAssets.has(entryAsset.id)) {
+          this.wrappedAssets.add(entryAsset.id);
+          wrapped.push(entryAsset);
+        }
+      }
+
       // Tracks which assets have been assigned to a wrap group
       let assignedAssets = new Set<Asset>();
 
@@ -1651,6 +1663,7 @@ ${code}
           .some((g) => this.bundleGraph.isEntryBundleGroup(g)) ||
         this.bundle.env.isIsolated() ||
         this.bundle.bundleBehavior === 'isolated' ||
+        this.bundle.bundleBehavior === 'inlineIsolated' ||
         // Conditional deps may be loaded before entrypoints on the server
         this.hasConditionalDependency();
 
@@ -1679,7 +1692,11 @@ ${code}
     }
 
     // Add importScripts for sibling bundles in workers.
-    if (this.bundle.env.isWorker() || this.bundle.env.isWorklet()) {
+    if (
+      this.bundle.env.isWorker() ||
+      this.bundle.env.isTesseract() ||
+      this.bundle.env.isWorklet()
+    ) {
       let importScripts = '';
       let bundles = this.bundleGraph.getReferencedBundles(this.bundle);
       for (let b of bundles) {