@atlaspack/runtime-js 2.16.1 → 2.18.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @atlaspack/runtime-js
 
+## 2.18.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
+
+- Updated dependencies [[`73dd7ba`](https://github.com/atlassian-labs/atlaspack/commit/73dd7baab69456ef2f6e4a0cc7dbb04f407eb148)]:
+  - @atlaspack/feature-flags@2.22.0
+  - @atlaspack/utils@2.18.1
+  - @atlaspack/plugin@2.14.24
+
+## 2.17.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/plugin@2.14.23
+
 ## 2.16.1
 
 ### Patch Changes

package/lib/JSRuntime.js

@@ -77,7 +77,7 @@ const LOADERS = {
 };
 function getLoaders(ctx) {
   // @ts-expect-error TS2322
-  if (ctx.isWorker()) return LOADERS.worker;
+  if (ctx.isWorker() || ctx.isTesseract()) return LOADERS.worker;
   if (ctx.isBrowser()) return LOADERS.browser;
   // @ts-expect-error TS2322
   if (ctx.isNode()) return LOADERS.node;
@@ -179,7 +179,7 @@ var _default = exports.default = new (_plugin().Runtime)({
         // Resolve the dependency to a bundle. If inline, export the dependency id,
         // which will be replaced with the contents of that bundle later.
         let referencedBundle = bundleGraph.getReferencedBundle(dependency, bundle);
-        if ((referencedBundle === null || referencedBundle === void 0 ? void 0 : referencedBundle.bundleBehavior) === 'inline') {
+        if ((referencedBundle === null || referencedBundle === void 0 ? void 0 : referencedBundle.bundleBehavior) === 'inline' || (referencedBundle === null || referencedBundle === void 0 ? void 0 : referencedBundle.bundleBehavior) === 'inlineIsolated') {
           assets.push({
             filePath: _path().default.join(__dirname, `/bundles/${referencedBundle.id}.js`),
             code: `module.exports = Promise.resolve(${JSON.stringify(dependency.id)});`,
@@ -240,7 +240,7 @@ var _default = exports.default = new (_plugin().Runtime)({
       // Resolve the dependency to a bundle. If inline, export the dependency id,
       // which will be replaced with the contents of that bundle later.
       let referencedBundle = bundleGraph.getReferencedBundle(dependency, bundle);
-      if ((referencedBundle === null || referencedBundle === void 0 ? void 0 : referencedBundle.bundleBehavior) === 'inline') {
+      if ((referencedBundle === null || referencedBundle === void 0 ? void 0 : referencedBundle.bundleBehavior) === 'inline' || (referencedBundle === null || referencedBundle === void 0 ? void 0 : referencedBundle.bundleBehavior) === 'inlineIsolated') {
         assets.push({
           filePath: _path().default.join(__dirname, `/bundles/${referencedBundle.id}.js`),
           code: `module.exports = ${JSON.stringify(dependency.id)};`,
@@ -279,7 +279,7 @@ var _default = exports.default = new (_plugin().Runtime)({
 
       // Skip URL runtimes for library builds. This is handled in packaging so that
       // the url is inlined and statically analyzable.
-      if (bundle.env.isLibrary && mainBundle.bundleBehavior !== 'isolated') {
+      if (bundle.env.isLibrary && mainBundle.bundleBehavior !== 'isolated' && mainBundle.bundleBehavior !== 'inlineIsolated') {
         continue;
       }
 
@@ -313,7 +313,7 @@ var _default = exports.default = new (_plugin().Runtime)({
         });
       }
     }
-    if (shouldUseRuntimeManifest(bundle, options) && bundleGraph.getChildBundles(bundle).some(b => b.bundleBehavior !== 'inline') && isNewContext(bundle, bundleGraph)) {
+    if (shouldUseRuntimeManifest(bundle, options) && bundleGraph.getChildBundles(bundle).some(b => b.bundleBehavior !== 'inline' && b.bundleBehavior !== 'inlineIsolated') && isNewContext(bundle, bundleGraph)) {
       assets.push({
         filePath: __filename,
         code: getRegisterCode(bundle, bundleGraph),
@@ -634,7 +634,7 @@ function getRegisterCode(entryBundle, bundleGraph) {
   // @ts-expect-error TS2304
   let mappings = [];
   bundleGraph.traverseBundles((bundle, _, actions) => {
-    if (bundle.bundleBehavior === 'inline') {
+    if (bundle.bundleBehavior === 'inline' || bundle.bundleBehavior === 'inlineIsolated') {
       return;
     }
 
@@ -687,7 +687,7 @@ function getAbsoluteUrlExpr(relativePathExpr, fromBundle, shardingConfig) {
 }
 function shouldUseRuntimeManifest(bundle, options) {
   let env = bundle.env;
-  return !env.isLibrary && bundle.bundleBehavior !== 'inline' && env.isBrowser() && options.mode === 'production';
+  return !env.isLibrary && bundle.bundleBehavior !== 'inline' && bundle.bundleBehavior !== 'inlineIsolated' && env.isBrowser() && options.mode === 'production';
 }
 function getManifestBundlePriority(bundleGraph, bundle, threshold) {
   let bundleSize = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/runtime-js",
-  "version": "2.16.1",
+  "version": "2.18.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -11,20 +11,21 @@
   },
   "main": "./lib/JSRuntime.js",
   "source": "./src/JSRuntime.ts",
-  "types": "./lib/JSRuntime.d.ts",
+  "types": "./lib/types/JSRuntime.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
     "@atlaspack/diagnostic": "2.14.2",
     "@atlaspack/domain-sharding": "2.14.2",
-    "@atlaspack/feature-flags": "2.20.1",
-    "@atlaspack/plugin": "2.14.22",
-    "@atlaspack/utils": "2.17.4",
+    "@atlaspack/feature-flags": "2.22.0",
+    "@atlaspack/plugin": "2.14.24",
+    "@atlaspack/utils": "2.18.1",
     "nullthrows": "^1.1.1"
   },
   "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/JSRuntime.ts

@@ -59,7 +59,7 @@ function getLoaders(ctx: Environment):
   | null
   | undefined {
   // @ts-expect-error TS2322
-  if (ctx.isWorker()) return LOADERS.worker;
+  if (ctx.isWorker() || ctx.isTesseract()) return LOADERS.worker;
   if (ctx.isBrowser()) return LOADERS.browser;
   // @ts-expect-error TS2322
   if (ctx.isNode()) return LOADERS.node;
@@ -183,7 +183,10 @@ export default new Runtime({
           dependency,
           bundle,
         );
-        if (referencedBundle?.bundleBehavior === 'inline') {
+        if (
+          referencedBundle?.bundleBehavior === 'inline' ||
+          referencedBundle?.bundleBehavior === 'inlineIsolated'
+        ) {
           assets.push({
             filePath: path.join(
               __dirname,
@@ -286,7 +289,10 @@ export default new Runtime({
         dependency,
         bundle,
       );
-      if (referencedBundle?.bundleBehavior === 'inline') {
+      if (
+        referencedBundle?.bundleBehavior === 'inline' ||
+        referencedBundle?.bundleBehavior === 'inlineIsolated'
+      ) {
         assets.push({
           filePath: path.join(__dirname, `/bundles/${referencedBundle.id}.js`),
           code: `module.exports = ${JSON.stringify(dependency.id)};`,
@@ -325,7 +331,11 @@ export default new Runtime({
 
       // Skip URL runtimes for library builds. This is handled in packaging so that
       // the url is inlined and statically analyzable.
-      if (bundle.env.isLibrary && mainBundle.bundleBehavior !== 'isolated') {
+      if (
+        bundle.env.isLibrary &&
+        mainBundle.bundleBehavior !== 'isolated' &&
+        mainBundle.bundleBehavior !== 'inlineIsolated'
+      ) {
         continue;
       }
 
@@ -382,7 +392,11 @@ export default new Runtime({
       shouldUseRuntimeManifest(bundle, options) &&
       bundleGraph
         .getChildBundles(bundle)
-        .some((b) => b.bundleBehavior !== 'inline') &&
+        .some(
+          (b) =>
+            b.bundleBehavior !== 'inline' &&
+            b.bundleBehavior !== 'inlineIsolated',
+        ) &&
       isNewContext(bundle, bundleGraph)
     ) {
       assets.push({
@@ -891,7 +905,10 @@ function getRegisterCode(
   // @ts-expect-error TS2304
   let mappings: Array<FilePath | string> = [];
   bundleGraph.traverseBundles((bundle, _, actions) => {
-    if (bundle.bundleBehavior === 'inline') {
+    if (
+      bundle.bundleBehavior === 'inline' ||
+      bundle.bundleBehavior === 'inlineIsolated'
+    ) {
       return;
     }
 
@@ -982,6 +999,7 @@ function shouldUseRuntimeManifest(
   return (
     !env.isLibrary &&
     bundle.bundleBehavior !== 'inline' &&
+    bundle.bundleBehavior !== 'inlineIsolated' &&
     env.isBrowser() &&
     options.mode === 'production'
   );