@inseefr/lunatic 2.7.1 → 2.7.3

package/lib/utils/suggester-workers/create-worker.js

@@ -7,6 +7,7 @@ exports.createWorker = void 0;
 var _logger = require("../logger");
 // Enable cross domain workers
 
+var logStyle = 'color: #915211; font-size: 20px;';
 var testSameOrigin = function testSameOrigin(url) {
   var loc = window.location;
   var a = document.createElement('a');
@@ -30,8 +31,13 @@ var createWorkerFallback = function createWorkerFallback(workerUrl) {
     var url = window.URL || window.webkitURL;
     var blobUrl = url.createObjectURL(blob);
     worker = new Worker(blobUrl);
+    worker.onerror = function (event) {
+      event.preventDefault();
+      console.error("Failed to register Lunatic-Worker at : \"".concat(workerUrl, "\"."));
+      console.error("%cAre you sure that the worker is available at \"".concat(workerUrl, "\" ? \n Did you run \"npx @inseefr/lunatic workers\" to add Lunatic workers to your project ?"), logStyle);
+    };
   } catch (e1) {
-    console.error("Lunatic-worker : Failed to load web worker : ".concat(workerUrl));
+    console.error("Lunatic-worker : Failed to load web worker at : \"".concat(workerUrl, "\""));
   }
   return worker;
 };

package/lib/utils/suggester-workers/worker-path.js

@@ -0,0 +1,29 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.WorkerEnum = void 0;
+exports.getWorkerPath = getWorkerPath;
+var _package = _interopRequireDefault(require("../../../package.json"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var WorkerEnum = exports.WorkerEnum = /*#__PURE__*/function (WorkerEnum) {
+  WorkerEnum["APPEND"] = "APPEND";
+  WorkerEnum["SEARCH"] = "SEARCH";
+  WorkerEnum["LABEL"] = "LABEL";
+  return WorkerEnum;
+}({});
+var version = _package["default"].workersVersion;
+var DEFAULT_BASE_PATH = 'workers';
+var WORKER_PATH = {
+  APPEND: "lunatic-append-worker-".concat(version, ".js"),
+  SEARCH: "lunatic-search-worker-".concat(version, ".js"),
+  LABEL: "lunatic-label-worker-".concat(version, ".js")
+};
+function getWorkerPath(workerType, workersBasePath) {
+  if (workersBasePath) {
+    return "".concat(workersBasePath, "/").concat(WORKER_PATH[workerType]);
+  } else {
+    return "".concat(DEFAULT_BASE_PATH, "/").concat(WORKER_PATH[workerType]);
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.7.1",
-	"workersVersion": "0.2.5-experimental",
+	"version": "2.7.3",
+	"workersVersion": "0.3.0",
 	"description": "Library of questionnaire components",
 	"repository": {
 		"type": "git",
@@ -9,9 +9,17 @@
 	},
 	"author": "INSEE (http://www.insee.fr)",
 	"contributor": [
+		{
+			"name": "Jonathan Boyer",
+			"email": "contact@grafikart.fr"
+		},
 		{
 			"name": "Laurent Caouissin",
-			"email": "laurent.caouissin@agriculture.gouv.fr"
+			"email": "laurent.caouissin@insee.fr"
+		},
+		{
+			"name": "Dylan Decrulle",
+			"email": "dylan.decrulle@insee.fr"
 		},
 		{
 			"name": "Renaud Genevois",
@@ -26,7 +34,10 @@
 	"main": "lib/index.js",
 	"types": "lib/src/index.d.ts",
 	"files": [
-		"lib"
+		"lib",
+		"workers-release",
+		"scripts/build/workers-paths.js",
+		"scripts/build/add-workers-to-public.js"
 	],
 	"scripts": {
 		"test": "vitest run",
@@ -42,13 +53,15 @@
 		"format": "npm run _format -- --write",
 		"format:check": "npm run _format -- --list-different",
 		"test-coverage": "vitest run --coverage",
-		"build": "babel src --out-dir lib --extensions \".ts,.js,.tsx,.jsx\" --copy-files && tsc --project tsconfig.prod.json",
-		"build-append-worker": "webpack --config ./webpack-append-worker.config.js",
-		"build-searching-worker": "webpack --config ./webpack-searching-worker.config.js",
-		"build-label-worker": "webpack --config ./webpack-label-worker.config.js",
-		"build-workers": "yarn build-append-worker && yarn build-searching-worker && yarn build-label-worker",
-		"storybook": "storybook dev -p 9999 --no-open",
-		"build-storybook": "storybook build"
+		"build-workers": "node ./scripts/build/build-workers.js",
+		"prepare-workers": "npm run build-workers && node ./scripts/build/add-workers-to-public.js",
+		"postinstall": "node ./scripts/build/add-workers-to-public.js",
+		"build": "babel src --out-dir lib --extensions \".ts,.js,.tsx,.jsx\" --copy-files && tsc --project tsconfig.prod.json && npm run build-workers",
+		"storybook": "npm run prepare-workers && storybook dev -p 9999 --no-open",
+		"build-storybook": "npm run prepare-workers && storybook build"
+	},
+	"bin": {
+		"workers": "./scripts/build/add-workers-to-public.js"
 	},
 	"keywords": [
 		"react",

package/scripts/build/add-workers-to-public.js

@@ -0,0 +1,44 @@
+#!/usr/bin/env node
+const fs = require('fs');
+const path = require('path');
+const { currentPublicFolder, workersPath } = require('./workers-paths');
+
+const currentPackageJson = require(path.resolve(
+	`${process.cwd()}/package.json`
+));
+const lunaticPackageJson = require('../../package.json');
+
+/**
+ * Copy worker only if not exists
+ */
+const copyWorkerToPublicFolder = () => {
+	console.log('Running add-workers-to-public....');
+
+	if (!fs.existsSync(currentPublicFolder)) {
+		fs.mkdirSync(currentPublicFolder, { recursive: true });
+	}
+
+	Object.keys(workersPath).forEach((worker) => {
+		const { name, source, dest } = workersPath[worker];
+		const isWorkerExists = fs.existsSync(dest);
+
+		if (!isWorkerExists) {
+			console.log(`Copy : ${name} to ${currentPublicFolder}`);
+			fs.copyFileSync(source, dest);
+		} else {
+			console.log(`${name} is already in ${currentPublicFolder} -> Skipped`);
+		}
+	});
+};
+
+const isLunaticPostInstall = () => {
+	const lunaticName = lunaticPackageJson.name;
+	const currentName = currentPackageJson.name;
+
+	const currentNpmLiveCycle = process.env.npm_lifecycle_event;
+	return lunaticName === currentName && currentNpmLiveCycle === 'postinstall';
+};
+
+if (isLunaticPostInstall()) {
+	console.log('PostInstall skipped !');
+} else copyWorkerToPublicFolder();

package/scripts/build/workers-paths.js

@@ -0,0 +1,45 @@
+const lunaticPackageJson = require('../../package.json');
+const path = require('path');
+
+const version = lunaticPackageJson.workersVersion;
+
+const currentPublicFolder = path.resolve(`${process.cwd()}/public/workers`);
+const workersReleaseFolder = path.resolve(__dirname, '../../workers-release');
+
+const workersPath = {
+	append: {
+		name: 'Append worker',
+		source: `${workersReleaseFolder}/lunatic-append-worker-${version}.js`,
+		dest: `${currentPublicFolder}/lunatic-append-worker-${version}.js`,
+		webpack: {
+			entry: './src/utils/suggester-workers/append-to-index/append.worker.js',
+			filename: `lunatic-append-worker-${version}.js`,
+		},
+	},
+	// Label worker is not currently used
+	label: {
+		name: 'Label worker',
+		source: `${workersReleaseFolder}/lunatic-label-worker-${version}.js`,
+		dest: `${currentPublicFolder}/lunatic-label-worker-${version}.js`,
+		webpack: {
+			entry:
+				'./src/utils/suggester-workers/find-best-label/find-best-label.worker.js',
+			filename: `lunatic-label-worker-${version}.js`,
+		},
+	},
+	searching: {
+		name: 'Searching worker',
+		source: `${workersReleaseFolder}/lunatic-search-worker-${version}.js`,
+		dest: `${currentPublicFolder}/lunatic-search-worker-${version}.js`,
+		webpack: {
+			entry: './src/utils/suggester-workers/searching/searching.worker.js',
+			filename: `lunatic-search-worker-${version}.js`,
+		},
+	},
+};
+
+module.exports = {
+	currentPublicFolder: currentPublicFolder,
+	workersReleaseFolder: workersReleaseFolder,
+	workersPath: workersPath,
+};