@inseefr/lunatic 2.7.0-rc.3 → 2.7.0-rc.5

package/lib/src/utils/suggester-workers/worker-path.d.ts

@@ -1,8 +1,3 @@
-declare global {
-    interface Window {
-        _env_: Record<string, string>;
-    }
-}
 export declare enum WorkerEnum {
     LOADER = "LOADER",
     SEARCH = "SEARCH",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.7.0-rc.3",
+	"version": "2.7.0-rc.5",
 	"workersVersion": "0.3.0-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {
@@ -31,11 +31,11 @@
 		"scripts/build/workers-paths.js"
 	],
 	"scripts": {
-		"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": "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-watch": "vitest",
 		"check": "tsc",
 		"lint": "eslint ./src",
@@ -45,14 +45,13 @@
 		"format:check": "npm run _format -- --list-different",
 		"test-coverage": "vitest run --coverage",
 		"build-workers": "node ./scripts/build/build-workers.js",
-		"build": "babel src --out-dir lib --extensions \".ts,.js,.tsx,.jsx\" --copy-files && tsc --project tsconfig.prod.json",
-		"postbuild": "yarn build-workers",
-		"postinstall": "yarn build-workers && node ./scripts/build/add-workers-to-public.js",
-		"storybook": "storybook dev -p 9999 --no-open",
-		"build-storybook": "storybook build"
+		"prepare-workers": "npm run build-workers && 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-workers": "./scripts/build/add-workers-to-public.js"
+		"add-lunatic-workes": "./scripts/build/add-workers-to-public.js"
 	},
 	"keywords": [
 		"react",

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

@@ -1,26 +1,43 @@
 #!/usr/bin/env node
 const fs = require('fs');
-const { currentPublicWorkersFolder, workersPath } = require('./workers-paths');
+const { currentPublicFolder, workersPath } = require('./workers-paths');
 
 /**
  * Copy worker only if not exists
  */
 const copyWorkerToPublicFolder = () => {
-	if (!fs.existsSync(currentPublicWorkersFolder)) {
-		fs.mkdirSync(currentPublicWorkersFolder, { recursive: true });
+	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`
+		);
 	}
 };
 

package/scripts/build/workers-paths.js

@@ -4,27 +4,24 @@ const path = require('path');
 var version = PACKAGE.workersVersion;
 
 const currentPublicFolder = path.resolve(`${process.cwd()}/public/workers`);
-const currentPublicWorkersFolder = path.resolve(
-	__dirname,
-	'../../workers-release'
-);
+const workersReleaseFolder = path.resolve(__dirname, '../../workers-release');
 
 const workersPath = {
 	append: {
 		name: 'Append worker',
-		source: `${currentPublicWorkersFolder}/lunatic-append-worker-${version}.js`,
+		source: `${workersReleaseFolder}/lunatic-append-worker-${version}.js`,
 		dest: `${currentPublicFolder}/lunatic-append-worker-${version}.js`,
 		webpack: `${path.resolve(__dirname)}/webpack-append-worker.config.js`,
 	},
 	label: {
 		name: 'Label worker',
-		source: `${currentPublicWorkersFolder}/lunatic-label-worker-${version}.js`,
+		source: `${workersReleaseFolder}/lunatic-label-worker-${version}.js`,
 		dest: `${currentPublicFolder}/lunatic-label-worker-${version}.js`,
 		webpack: `${path.resolve(__dirname)}/webpack-label-worker.config.js`,
 	},
 	searching: {
 		name: 'Searching worker',
-		source: `${currentPublicWorkersFolder}/lunatic-searching-worker-${version}.js`,
+		source: `${workersReleaseFolder}/lunatic-searching-worker-${version}.js`,
 		dest: `${currentPublicFolder}/lunatic-searching-worker-${version}.js`,
 		webpack: `${path.resolve(__dirname)}/webpack-searching-worker.config.js`,
 	},
@@ -32,6 +29,6 @@ const workersPath = {
 
 module.exports = {
 	currentPublicFolder: currentPublicFolder,
-	currentPublicWorkersFolder: currentPublicWorkersFolder,
+	workersReleaseFolder: workersReleaseFolder,
 	workersPath: workersPath,
 };