@atlaspack/transformer-image 3.1.5-dev.1c70d50f9.99 → 3.1.5-dev.69

package/CHANGELOG.md

@@ -1,41 +1,5 @@
 # @atlaspack/transformer-image
 
-## 3.1.14
-
-### Patch Changes
-
-- Updated dependencies []:
-  - @atlaspack/utils@2.15.2
-  - @atlaspack/workers@2.14.14
-  - @atlaspack/plugin@2.14.14
-
-## 3.1.13
-
-### Patch Changes
-
-- Updated dependencies [[`ef3d622`](https://github.com/atlassian-labs/atlaspack/commit/ef3d6228f4e006702198a19c61e051d194d325cb)]:
-  - @atlaspack/workers@2.14.13
-  - @atlaspack/utils@2.15.1
-  - @atlaspack/plugin@2.14.13
-
-## 3.1.12
-
-### Patch Changes
-
-- Updated dependencies [[`e39c6cf`](https://github.com/atlassian-labs/atlaspack/commit/e39c6cf05f7e95ce5420dbcea66f401b1cbd397c)]:
-  - @atlaspack/utils@2.15.0
-  - @atlaspack/workers@2.14.12
-  - @atlaspack/plugin@2.14.12
-
-## 3.1.11
-
-### Patch Changes
-
-- Updated dependencies []:
-  - @atlaspack/utils@2.14.11
-  - @atlaspack/workers@2.14.11
-  - @atlaspack/plugin@2.14.11
-
 ## 3.1.10
 
 ### Patch Changes

package/lib/ImageTransformer.js

@@ -19,18 +19,10 @@ function _nullthrows() {
   };
   return data;
 }
-function _workers() {
-  const data = _interopRequireDefault(require("@atlaspack/workers"));
-  _workers = function () {
-    return data;
-  };
-  return data;
-}
 var _loadSharp = _interopRequireDefault(require("./loadSharp"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // from https://github.com/lovell/sharp/blob/df7b8ba73808fc494be413e88cfb621b6279218c/lib/output.js#L6-L17
 const FORMATS = new Map([['jpeg', 'jpeg'], ['jpg', 'jpeg'], ['png', 'png'], ['webp', 'webp'], ['gif', 'gif'], ['tiff', 'tiff'], ['avif', 'avif'], ['heic', 'heif'], ['heif', 'heif']]);
-let isSharpLoadedOnMainThread = false;
 var _default = exports.default = new (_plugin().Transformer)({
   async loadConfig({
     config
@@ -68,16 +60,6 @@ var _default = exports.default = new (_plugin().Transformer)({
     const format = (0, _nullthrows().default)(FORMATS.get(targetFormat || originalFormat));
     const outputOptions = config[format];
     if (width || height || quality || targetFormat || outputOptions) {
-      // Sharp must be required from the main thread as well to prevent errors when workers exit
-      // See https://sharp.pixelplumbing.com/install#worker-threads and https://github.com/lovell/sharp/issues/2263
-      if (_workers().default.isWorker() && !isSharpLoadedOnMainThread) {
-        let api = _workers().default.getWorkerApi();
-        await api.callMaster({
-          location: __dirname + '/loadSharp.js',
-          args: [options.packageManager, asset.filePath, options.shouldAutoInstall]
-        });
-        isSharpLoadedOnMainThread = true;
-      }
       let inputBuffer = await asset.getBuffer();
       let sharp = await (0, _loadSharp.default)(options.packageManager, asset.filePath, options.shouldAutoInstall, true);
       let imagePipeline = sharp(inputBuffer, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/transformer-image",
-  "version": "3.1.5-dev.1c70d50f9.99+1c70d50f9",
+  "version": "3.1.5-dev.69+67cb517ae",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -15,9 +15,9 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/plugin": "2.14.5-dev.1c70d50f9.99+1c70d50f9",
-    "@atlaspack/utils": "2.14.5-dev.1c70d50f9.99+1c70d50f9",
-    "@atlaspack/workers": "2.14.5-dev.1c70d50f9.99+1c70d50f9",
+    "@atlaspack/plugin": "2.14.5-dev.69+67cb517ae",
+    "@atlaspack/utils": "2.14.5-dev.69+67cb517ae",
+    "@atlaspack/workers": "2.14.5-dev.69+67cb517ae",
     "nullthrows": "^1.1.1"
   },
   "devDependencies": {
@@ -27,5 +27,5 @@
     "@atlaspack/core": "^2.13.1"
   },
   "type": "commonjs",
-  "gitHead": "1c70d50f914cb662515b0b61053e51a06f3af234"
+  "gitHead": "67cb517ae793046fb5a0d2ef02ba74510fefccf3"
 }

package/src/ImageTransformer.js

@@ -2,7 +2,6 @@
 import {validateConfig} from './validateConfig';
 import {Transformer} from '@atlaspack/plugin';
 import nullthrows from 'nullthrows';
-import WorkerFarm from '@atlaspack/workers';
 import loadSharp from './loadSharp';
 
 // from https://github.com/lovell/sharp/blob/df7b8ba73808fc494be413e88cfb621b6279218c/lib/output.js#L6-L17
@@ -18,8 +17,6 @@ const FORMATS = new Map([
   ['heif', 'heif'],
 ]);
 
-let isSharpLoadedOnMainThread = false;
-
 export default (new Transformer({
   async loadConfig({config}) {
     let configFile: any = await config.getConfig(
@@ -65,22 +62,6 @@ export default (new Transformer({
     const outputOptions = config[format];
 
     if (width || height || quality || targetFormat || outputOptions) {
-      // Sharp must be required from the main thread as well to prevent errors when workers exit
-      // See https://sharp.pixelplumbing.com/install#worker-threads and https://github.com/lovell/sharp/issues/2263
-      if (WorkerFarm.isWorker() && !isSharpLoadedOnMainThread) {
-        let api = WorkerFarm.getWorkerApi();
-        await api.callMaster({
-          location: __dirname + '/loadSharp.js',
-          args: [
-            options.packageManager,
-            asset.filePath,
-            options.shouldAutoInstall,
-          ],
-        });
-
-        isSharpLoadedOnMainThread = true;
-      }
-
       let inputBuffer = await asset.getBuffer();
       let sharp = await loadSharp(
         options.packageManager,