lucy-cli 0.7.7 → 0.7.9

package/dist/gulp/types.js

@@ -11,7 +11,7 @@ export function updateWixTypes(options) {
     return () => {
         const { publicSettings, backendSettings, masterSettings, pageSettings, replaceOptions } = options;
         let count = 0;
-        const modules = options.moduleSettings?.settings.modules;
+        const modules = Object.assign({}, options.projectSettings?.modules, options.projectSettings?.lucySettings?.modules);
         let localModules = undefined;
         if (options.projectSettings?.lucySettings) {
             localModules = options.projectSettings.lucySettings.modules;
@@ -19,6 +19,7 @@ export function updateWixTypes(options) {
         // Add module to publicSettings
         publicSettings.compilerOptions.paths.mocks = ["../../../typescript/__mocks__/*"];
         publicSettings.compilerOptions.paths['types/*'] = ["../../../typescript/types/*"];
+        publicSettings.compilerOptions.paths['public/*'] = ["../../../typescript/public/*.ts"];
         publicSettings.include = ["../../../typescript/public/**/*", "../../../typescript/__mocks__/**/*", "../../../typescript/backend/**/*"];
         // Add module to backendSettings
         backendSettings.compilerOptions.paths.mocks = ["../../../typescript/__mocks__/*"];
@@ -29,6 +30,7 @@ export function updateWixTypes(options) {
         masterSettings.include = ["../../../typescript/public/**/*", "index.d.ts", "../../../typescript/__mocks__/**/*", "../../../typescript/backend/**/*"];
         // Add module to pageSettings
         pageSettings.compilerOptions.paths['types/*'] = ["../../../typescript/types/*"];
+        pageSettings.compilerOptions.paths['backend/*'] = ["../../../typescript/backend/*.jsw.ts"];
         pageSettings.include = ["../../../typescript/public/**/*", "../../../typescript/__mocks__/**/*", "../../../typescript/backend/**/*"];
         if (modules) {
             for (const [name] of Object.entries(modules)) {
@@ -37,7 +39,6 @@ export function updateWixTypes(options) {
                 publicSettings.compilerOptions.paths['backend/*.web.js'] = [`../../../${name}/backend/*.web.ts`];
                 publicSettings.compilerOptions.paths['backend/*.web'] = [`../../../${name}/backend/*.web.ts`];
                 publicSettings.compilerOptions.paths['public/*'].push(`../../../${name}/public/*`);
-                publicSettings.compilerOptions.paths['backend/*'].push(`../../../${name}/backend/*`);
                 publicSettings.compilerOptions.paths.mocks.push(...[`../../../${name}/__mocks__/*`]);
                 publicSettings.compilerOptions.paths['types/*'].push(`../../../${name}/types/*`);
                 publicSettings.include.push(...[`../../../${name}/public/**/*`, `../../../${name}/backend/**/*.web.js`, `../../../${name}__mocks__/**/*`, `../../../${name}/backend/**/*`]);
@@ -58,12 +59,12 @@ export function updateWixTypes(options) {
                 pageSettings.compilerOptions.paths['backend/*.web.js'] = [`../../../${name}/backend/*.web.ts`];
                 pageSettings.compilerOptions.paths['backend/*.web'] = [`../../../${name}/backend/*.web.ts`];
                 pageSettings.compilerOptions.paths['public/*'].push(`../../../${name}/public/*`);
-                pageSettings.compilerOptions.paths['backend/*'].push(`../../../${name}/backend/*`);
+                pageSettings.compilerOptions.paths['backend/*'].push(`../../../${name}/backend/*.jsw.ts`);
                 pageSettings.compilerOptions.paths['types/*'].push(`../../../${name}/types/*`);
                 pageSettings.include.push(...[`../../../${name}/public/**/*`, `../../../${name}/backend/**/*.web.js`, `../../../${name}__mocks__/**/*`, `../../../${name}/backend/**/*`]);
             }
         }
-        return gulp.src(['./.wix/types/*/*.json', '!./.wix/types/wix-code-types/*.json'])
+        return gulp.src(['./.wix/types/**/*.json', '!./.wix/types/wix-code-types/*.json'])
             .pipe(flatmap(function (stream, file) {
             count++;
             if (file.dirname.endsWith('public'))

package/files/typescript/backend/permissions.json

@@ -0,0 +1,17 @@
+{
+  "web-methods": {
+    "*": {
+      "*": {
+        "siteOwner": {
+          "invoke": true
+        },
+        "siteMember": {
+          "invoke": true
+        },
+        "anonymous": {
+          "invoke": true
+        }
+      }
+    }
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "lucy-cli",
-  "version": "0.7.7",
+  "version": "0.7.9",
   "description": "Lucy Framework for WIX Studio Editor",
   "main": ".dist/index.js",
   "scripts": {
@@ -16,7 +16,8 @@
   "keywords": [
     "Framework",
     "WIX",
-    "Studio"
+    "Studio",
+    "Velo"
   ],
   "author": "Gradlon von Känel",
   "license": "MIT",

package/settings/page-settings.json

@@ -7,7 +7,7 @@
     "jsx": "react-jsx",
     "noEmit": false,
     "noUncheckedIndexedAccess": true,
-    "lib": ["DOM"],
+    "lib": ["DOM", "es2015"],
     "paths": {
       "backend/*.web.js": [],
       "backend/*.web": [],

package/settings/public-settings.json

@@ -11,7 +11,6 @@
       "backend/*.web.js": [],
       "backend/*.web": [],
       "mocks": [],
-      "backend/*": [],
       "public/*": [],
       "types/*": [],
       "wix-types/*": ["../wix-code-types/dist/types/*"]

package/src/gulp/types.ts

@@ -15,7 +15,8 @@ export function updateWixTypes(options: TaskOptions) {
 		const { publicSettings, backendSettings, masterSettings, pageSettings, replaceOptions } = options;
 		let count = 0;
 		
-		const modules = options.moduleSettings?.settings.modules;
+		const modules: Record<string, string>  = Object.assign({}, options.projectSettings?.modules, options.projectSettings?.lucySettings?.modules);
+
 		let localModules: Record<string, string> | undefined = undefined;
 		if(options.projectSettings?.lucySettings) {
 			localModules = options.projectSettings.lucySettings.modules as unknown as Record<string, string>;
@@ -23,6 +24,7 @@ export function updateWixTypes(options: TaskOptions) {
 		// Add module to publicSettings
 		publicSettings.compilerOptions.paths.mocks = [ "../../../typescript/__mocks__/*" ] as never;
 		publicSettings.compilerOptions.paths['types/*'] = [ "../../../typescript/types/*" ] as never;
+		publicSettings.compilerOptions.paths['public/*'] = [ "../../../typescript/public/*.ts" ] as never;
 		publicSettings.include = [ "../../../typescript/public/**/*", "../../../typescript/__mocks__/**/*", "../../../typescript/backend/**/*" ] as never;
 		// Add module to backendSettings
 		backendSettings.compilerOptions.paths.mocks = [ "../../../typescript/__mocks__/*" ] as never;
@@ -33,6 +35,7 @@ export function updateWixTypes(options: TaskOptions) {
 		masterSettings.include = [ "../../../typescript/public/**/*", "index.d.ts", "../../../typescript/__mocks__/**/*", "../../../typescript/backend/**/*" ] as never;
 		// Add module to pageSettings
 		pageSettings.compilerOptions.paths['types/*'] = [ "../../../typescript/types/*" ] as never;
+		pageSettings.compilerOptions.paths['backend/*'] = [ "../../../typescript/backend/*.jsw.ts" ] as never;
 		pageSettings.include = [ "../../../typescript/public/**/*", "../../../typescript/__mocks__/**/*", "../../../typescript/backend/**/*" ] as never;
 
 		if (modules) {
@@ -42,7 +45,6 @@ export function updateWixTypes(options: TaskOptions) {
 				publicSettings.compilerOptions.paths['backend/*.web.js'] = [`../../../${name}/backend/*.web.ts`] as never;
 				publicSettings.compilerOptions.paths['backend/*.web'] = [`../../../${name}/backend/*.web.ts`] as never;
 				publicSettings.compilerOptions.paths['public/*'].push(`../../../${name}/public/*` as never);
-				publicSettings.compilerOptions.paths['backend/*'].push(`../../../${name}/backend/*` as never);
 				publicSettings.compilerOptions.paths.mocks.push(...[ `../../../${name}/__mocks__/*` as never ]);
 				publicSettings.compilerOptions.paths['types/*'].push(`../../../${name}/types/*` as never);
 				publicSettings.include.push(...[`../../../${name}/public/**/*`, `../../../${name}/backend/**/*.web.js`, `../../../${name}__mocks__/**/*`, `../../../${name}/backend/**/*` ] as never[]);
@@ -63,13 +65,13 @@ export function updateWixTypes(options: TaskOptions) {
 				pageSettings.compilerOptions.paths['backend/*.web.js'] = [`../../../${name}/backend/*.web.ts`] as never;
 				pageSettings.compilerOptions.paths['backend/*.web'] = [`../../../${name}/backend/*.web.ts`] as never;
 				pageSettings.compilerOptions.paths['public/*'].push(`../../../${name}/public/*` as never);
-				pageSettings.compilerOptions.paths['backend/*'].push(`../../../${name}/backend/*` as never);
+				pageSettings.compilerOptions.paths['backend/*'].push(`../../../${name}/backend/*.jsw.ts` as never);
 				pageSettings.compilerOptions.paths['types/*'].push(`../../../${name}/types/*` as never);
 				pageSettings.include.push(...[`../../../${name}/public/**/*`, `../../../${name}/backend/**/*.web.js`, `../../../${name}__mocks__/**/*`, `../../../${name}/backend/**/*` ] as never[]);
 			}
 		}
 
-		return gulp.src(['./.wix/types/*/*.json', '!./.wix/types/wix-code-types/*.json'])
+		return gulp.src(['./.wix/types/**/*.json', '!./.wix/types/wix-code-types/*.json'])
 		.pipe(flatmap(function(stream: NodeJS.ReadableStream, file: File) {
 			count ++;
 			if (file.dirname.endsWith('public')) return stream.pipe(jeditor(publicSettings)).pipe(jeditor((json: any) => processJson(json)));