@inseefr/lunatic 2.7.0-rc.5 → 2.7.2

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.7.0-rc.5",
-	"workersVersion": "0.3.0-experimental",
+	"version": "2.7.2",
+	"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",
@@ -28,14 +36,15 @@
 	"files": [
 		"lib",
 		"workers-release",
-		"scripts/build/workers-paths.js"
+		"scripts/build/workers-paths.js",
+		"scripts/build/add-workers-to-public.js"
 	],
 	"scripts": {
-		"test": "npm run prepare-workers && vitest run",
-		"test:e2e": "npm run prepare-workers && playwright test",
-		"test:e2e:visual": "npm run prepare-workers && playwright test --headed --debug e2e/pairwise.spec.ts",
-		"test:e2e:codegen": "npm run prepare-workers && playwright codegen http://localhost:9999/iframe.html?viewMode=story&id=",
-		"test:storybook": "npm run prepare-workers && test-storybook --url http://localhost:9999 --maxWorkers=4 --no-cache",
+		"test": "vitest run",
+		"test:e2e": "playwright test",
+		"test:e2e:visual": "playwright test --headed --debug e2e/pairwise.spec.ts",
+		"test:e2e:codegen": "playwright codegen http://localhost:9999/iframe.html?viewMode=story&id=",
+		"test:storybook": "test-storybook --url http://localhost:9999 --maxWorkers=4 --no-cache",
 		"test-watch": "vitest",
 		"check": "tsc",
 		"lint": "eslint ./src",
@@ -46,12 +55,13 @@
 		"test-coverage": "vitest run --coverage",
 		"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": {
-		"add-lunatic-workes": "./scripts/build/add-workers-to-public.js"
+		"workers": "./scripts/build/add-workers-to-public.js"
 	},
 	"keywords": [
 		"react",

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

@@ -1,44 +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 });
 	}
-	const isAppendWorkerExists = fs.existsSync(workersPath.append.dest);
-	const isLabelWorkerExists = fs.existsSync(workersPath.label.dest);
-	const isSearchingWorkerExists = fs.existsSync(workersPath.searching.dest);
-
-	if (!isAppendWorkerExists) {
-		console.log(`Copy : ${workersPath.append.name} to ${currentPublicFolder}`);
-		fs.copyFileSync(workersPath.append.source, workersPath.append.dest);
-	} else {
-		console.log(
-			`${workersPath.append.name} is already in ${currentPublicFolder} -> Skipped`
-		);
-	}
-	if (!isLabelWorkerExists) {
-		console.log(`Copy : ${workersPath.label.name} to ${currentPublicFolder}`);
-		fs.copyFileSync(workersPath.label.source, workersPath.label.dest);
-	} else {
-		console.log(
-			`${workersPath.label.name} is already in ${currentPublicFolder} -> Skipped`
-		);
-	}
-	if (!isSearchingWorkerExists) {
-		console.log(
-			`Copy : ${workersPath.searching.name} to ${currentPublicFolder}`
-		);
-		fs.copyFileSync(workersPath.searching.source, workersPath.searching.dest);
-	} else {
-		console.log(
-			`${workersPath.searching.name} is already in ${currentPublicFolder} -> Skipped`
-		);
-	}
+
+	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';
 };
 
-copyWorkerToPublicFolder();
+if (isLunaticPostInstall()) {
+	console.log('PostInstall skipped !');
+} else copyWorkerToPublicFolder();

package/scripts/build/workers-paths.js

@@ -1,7 +1,7 @@
-var PACKAGE = require('../../package.json');
+const lunaticPackageJson = require('../../package.json');
 const path = require('path');
 
-var version = PACKAGE.workersVersion;
+const version = lunaticPackageJson.workersVersion;
 
 const currentPublicFolder = path.resolve(`${process.cwd()}/public/workers`);
 const workersReleaseFolder = path.resolve(__dirname, '../../workers-release');
@@ -11,19 +11,30 @@ const workersPath = {
 		name: 'Append worker',
 		source: `${workersReleaseFolder}/lunatic-append-worker-${version}.js`,
 		dest: `${currentPublicFolder}/lunatic-append-worker-${version}.js`,
-		webpack: `${path.resolve(__dirname)}/webpack-append-worker.config.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: `${path.resolve(__dirname)}/webpack-label-worker.config.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-searching-worker-${version}.js`,
-		dest: `${currentPublicFolder}/lunatic-searching-worker-${version}.js`,
-		webpack: `${path.resolve(__dirname)}/webpack-searching-worker.config.js`,
+		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`,
+		},
 	},
 };