Feat - Unified schema

.github/workflows/e2e-harness-android.yml

@@ -15,6 +15,7 @@ on:
             - '**/lerna.json'
             - '**/metadata.json'
             - '**/renative.json'
+            - '**/rnv.json'
             - '**/package.json'
     pull_request:
         types: [labeled]

.github/workflows/e2e-harness-androidtv.yml

@@ -15,6 +15,7 @@ on:
             - '**/lerna.json'
             - '**/metadata.json'
             - '**/renative.json'
+            - '**/rnv.json'
             - '**/package.json'
     pull_request:
         types: [labeled]

.github/workflows/e2e-harness-ios.yml

@@ -15,6 +15,7 @@ on:
             - '**/lerna.json'
             - '**/metadata.json'
             - '**/renative.json'
+            - '**/rnv.json'
             - '**/package.json'
     pull_request:
         types: [labeled]

.github/workflows/e2e-harness-macos.yml

@@ -15,6 +15,7 @@ on:
     #         - '**/lerna.json'
     #         - '**/metadata.json'
     #         - '**/renative.json'
+    #         - '**/rnv.json'
     #         - '**/package.json'
     # pull_request:
     #     types: [labeled]

.github/workflows/e2e-harness-tvos.yml

@@ -15,6 +15,7 @@ on:
             - '**/lerna.json'
             - '**/metadata.json'
             - '**/renative.json'
+            - '**/rnv.json'
             - '**/package.json'
     pull_request:
         types: [labeled]

.github/workflows/e2e-harness-web.yml

@@ -15,6 +15,7 @@ on:
             - '**/lerna.json'
             - '**/metadata.json'
             - '**/renative.json'
+            - '**/rnv.json'
             - '**/package.json'
     pull_request:
         types: [labeled]

.github/workflows/e2e-template-android.yml

@@ -15,6 +15,7 @@ on:
             - '**/lerna.json'
             - '**/metadata.json'
             - '**/renative.json'
+            - '**/rnv.json'
             - '**/package.json'
     pull_request:
         types: [labeled]

.github/workflows/e2e-template-androidtv.yml

@@ -15,6 +15,7 @@ on:
             - '**/lerna.json'
             - '**/metadata.json'
             - '**/renative.json'
+            - '**/rnv.json'
             - '**/package.json'
     pull_request:
         types: [labeled]

.github/workflows/e2e-template-ios.yml

@@ -15,6 +15,7 @@ on:
             - '**/lerna.json'
             - '**/metadata.json'
             - '**/renative.json'
+            - '**/rnv.json'
             - '**/package.json'
     pull_request:
         types: [labeled]

.github/workflows/e2e-template-macos.yml

@@ -15,6 +15,7 @@ on:
     #         - '**/lerna.json'
     #         - '**/metadata.json'
     #         - '**/renative.json'
+    #         - '**/rnv.json'
     #         - '**/package.json'
     # pull_request:
     #     types: [labeled]

.github/workflows/e2e-template-tvos.yml

@@ -15,6 +15,7 @@ on:
             - '**/lerna.json'
             - '**/metadata.json'
             - '**/renative.json'
+            - '**/rnv.json'
             - '**/package.json'
     pull_request:
         types: [labeled]

.github/workflows/e2e-template-web.yml

@@ -15,6 +15,7 @@ on:
             - '**/lerna.json'
             - '**/metadata.json'
             - '**/renative.json'
+            - '**/rnv.json'
             - '**/package.json'
     pull_request:
         types: [labeled]

buildHooks/src/prePublish.ts

@@ -172,12 +172,12 @@ export const prePublish = async (c: RnvContext) => {
                 pkgFile = readObjectSync<any>(_pkgPath);
                 pkgName = pkgFile?.name;
             }
-            const _rnvPath = path.join(dirPath, 'renative.json');
+            const _rnvPath = path.join(dirPath, RnvFileName.renative);
             if (fsExistsSync(_rnvPath)) {
                 rnvPath = _rnvPath;
                 rnvFile = readObjectSync(rnvPath);
             }
-            const _rnvTempPath = path.join(dirPath, 'renative.template.json');
+            const _rnvTempPath = path.join(dirPath, RnvFileName.renativeTemplate);
             if (fsExistsSync(_rnvTempPath)) {
                 rnvTempPath = _rnvTempPath;
                 rnvTempFile = readObjectSync(rnvTempPath);

packages/build-hooks-schema/src/schema.ts

@@ -6,29 +6,29 @@ import fs from 'fs';
 
 export const generateSchema = async () => {
     const {
-        zodConfigFilePlugin,
-        zodConfigFilePrivate,
-        zodConfigFileProject,
-        zodConfigFileTemplate,
-        zodConfigFileTemplates,
-        zodConfigFileWorkspace,
-        zodConfigFileIntegration,
-        zodConfigFileApp,
-        zodConfigFileLocal,
-        zodConfigFileEngine,
+        // zodConfigFilePlugin,
+        // zodConfigFilePrivate,
+        // zodConfigFileProject,
+        // zodConfigFileTemplate,
+        // zodConfigFileTemplates,
+        // zodConfigFileWorkspace,
+        // zodConfigFileIntegration,
+        // zodConfigFileApp,
+        // zodConfigFileLocal,
+        // zodConfigFileEngine,
         zodConfigFileRoot,
     } = ZodFileSchema;
     // LEGACY
-    _generateSchemaFile({ schema: zodConfigFileProject, schemaId: 'rnv.project' });
-    _generateSchemaFile({ schema: zodConfigFileApp, schemaId: 'rnv.app' });
-    _generateSchemaFile({ schema: zodConfigFileLocal, schemaId: 'rnv.local' });
-    _generateSchemaFile({ schema: zodConfigFileEngine, schemaId: 'rnv.engine' });
-    _generateSchemaFile({ schema: zodConfigFileWorkspace, schemaId: 'rnv.workspace' });
-    _generateSchemaFile({ schema: zodConfigFileTemplate, schemaId: 'rnv.template' });
-    _generateSchemaFile({ schema: zodConfigFilePrivate, schemaId: 'rnv.private' });
-    _generateSchemaFile({ schema: zodConfigFilePlugin, schemaId: 'rnv.plugin' });
-    _generateSchemaFile({ schema: zodConfigFileTemplates, schemaId: 'rnv.templates' });
-    _generateSchemaFile({ schema: zodConfigFileIntegration, schemaId: 'rnv.integration' });
+    // _generateSchemaFile({ schema: zodConfigFileProject, schemaId: 'rnv.project' });
+    // _generateSchemaFile({ schema: zodConfigFileApp, schemaId: 'rnv.app' });
+    // _generateSchemaFile({ schema: zodConfigFileLocal, schemaId: 'rnv.local' });
+    // _generateSchemaFile({ schema: zodConfigFileEngine, schemaId: 'rnv.engine' });
+    // _generateSchemaFile({ schema: zodConfigFileWorkspace, schemaId: 'rnv.workspace' });
+    // _generateSchemaFile({ schema: zodConfigFileTemplate, schemaId: 'rnv.template' });
+    // _generateSchemaFile({ schema: zodConfigFilePrivate, schemaId: 'rnv.private' });
+    // _generateSchemaFile({ schema: zodConfigFilePlugin, schemaId: 'rnv.plugin' });
+    // _generateSchemaFile({ schema: zodConfigFileTemplates, schemaId: 'rnv.templates' });
+    // _generateSchemaFile({ schema: zodConfigFileIntegration, schemaId: 'rnv.integration' });
     // CURRENT
     const definitions: Record<string, any> = {};
     Object.values(ZodSharedSchema).forEach((val) => {

packages/core/jsonSchema/renative-1.0.schema.json

@@ -2632,7 +2632,7 @@
                         },
                         "description": "Allows you to inject custom script into html header"
                       },
-                      "excludedDirs": {
+                      "excludedPaths": {
                         "type": "array",
                         "items": {
                           "type": "string"
@@ -5279,6 +5279,12 @@
               }
             }
           },
+          "required": [
+            "name",
+            "engineExtension",
+            "plugins",
+            "npm"
+          ],
           "additionalProperties": false
         },
         "plugin": {
@@ -5809,20 +5815,6 @@
           "description": "schema definition"
         }
       },
-      "required": [
-        "app",
-        "project",
-        "local",
-        "overrides",
-        "integration",
-        "engine",
-        "plugin",
-        "private",
-        "template",
-        "configTemplates",
-        "workspace",
-        "workspaces"
-      ],
       "additionalProperties": false
     }
   },

packages/core/src/__tests/_sanity.tstest.ts

@@ -15,8 +15,8 @@
 });
 
 // core context must not provide unknown options
 // @ts-expect-error
 console.log(preset1.UNTYPED);
 
 // must provide new options
 console.log(preset1.withSet1);
@@ -204,7 +204,17 @@
 
 const engine1 = createRnvEngine({
     tasks: [task1, task2, task3, task4, task5, task6],
-    config: {},
+    config: {
+        engine: {
+            engineExtension: 'js',
+            name: 'test',
+            npm: {},
+            overview: '',
+            platforms: {},
+            plugins: {},
+            custom: {},
+        },
+    },
     platforms: {},
 });
 type GCEngine1 = GetContextType<typeof engine1.getContext>;
@@ -234,7 +244,17 @@
 
 const engine2 = createRnvEngine({
     tasks: [],
-    config: {},
+    config: {
+        engine: {
+            engineExtension: 'js',
+            name: 'test',
+            npm: {},
+            overview: '',
+            platforms: {},
+            plugins: {},
+            custom: {},
+        },
+    },
     platforms: {},
 });
 type GCEngine2 = GetContextType<typeof engine2.getContext>;
@@ -254,7 +274,17 @@
 const engine3 = createRnvEngine({
     extendModules: [module1, module3],
     tasks: [],
-    config: {},
+    config: {
+        engine: {
+            engineExtension: 'js',
+            name: 'test',
+            npm: {},
+            overview: '',
+            platforms: {},
+            plugins: {},
+            custom: {},
+        },
+    },
     platforms: {},
 });
 type GCEngine3 = GetContextType<typeof engine3.getContext>;
@@ -289,7 +319,17 @@
 const engine4 = createRnvEngine({
     extendModules: [module1, module2, module3],
     tasks: [task2, task3, task4, task5, task6],
-    config: {},
+    config: {
+        engine: {
+            engineExtension: 'js',
+            name: 'test',
+            npm: {},
+            overview: '',
+            platforms: {},
+            plugins: {},
+            custom: {},
+        },
+    },
     platforms: {},
 });
 type GCEngine4 = GetContextType<typeof engine4.getContext>;

packages/core/src/configs/appConfigs.ts

@@ -26,7 +26,7 @@ export const listAppConfigsFoldersSync = (ignoreHiddenConfigs: boolean, appConfi
                 if (fsExistsSync(appConfig)) {
                     try {
                         const config = readObjectSync<ConfigFileApp>(appConfig);
-                        if (config?.hidden !== true) {
+                        if (config?.app?.hidden !== true) {
                             appConfigsDirs.push(dir);
                         }
                     } catch (e) {

packages/core/src/configs/buildConfig.ts

@@ -7,7 +7,7 @@ import {
     fsExistsSync,
     formatBytes,
     mkdirSync,
-    writeFileSync
+    writeFileSync,
 } from '../system/fs';
 import { chalk, logDefault, logWarning, logDebug } from '../logger';
 import { getContext } from '../context/provider';
@@ -27,16 +27,17 @@ const getEnginesPluginDelta = () => {
     const missingEnginePlugins: Record<string, string> = {};
 
     const engineConfig = c.platform ? c.runtime.enginesByPlatform[c.platform]?.config : undefined;
-    if (engineConfig?.plugins) {
-        const ePlugins = Object.keys(engineConfig.plugins);
+    const ePluginVals = engineConfig?.engine?.plugins;
+    if (ePluginVals) {
+        const ePlugins = Object.keys(ePluginVals);
 
         if (ePlugins?.length) {
             ePlugins.forEach((pluginKey) => {
-                if (!c.files?.project?.config?.plugins?.[pluginKey] && engineConfig.plugins?.[pluginKey]) {
-                    missingEnginePlugins[pluginKey] = engineConfig.plugins?.[pluginKey];
+                if (!c.files?.project?.config?.project?.plugins?.[pluginKey] && ePluginVals[pluginKey]) {
+                    missingEnginePlugins[pluginKey] = ePluginVals[pluginKey];
                 }
-                if (engineConfig.plugins?.[pluginKey]) {
-                    enginePlugins[pluginKey] = engineConfig.plugins?.[pluginKey];
+                if (ePluginVals[pluginKey]) {
+                    enginePlugins[pluginKey] = ePluginVals[pluginKey];
                 }
             });
         }

packages/core/src/configs/configProject.ts

@@ -52,8 +52,8 @@ export const upgradeDependencies = (
     _fixDeps(packageFile?.devDependencies, version);
     _fixDeps(packageFile?.dependencies, version);
     _fixDeps(packageFile?.peerDependencies, version);
-    if (configFile?.templateConfig) {
-        configFile.templateConfig.version = version;
+    if (configFile?.projectTemplate?.templateConfig) {
+        configFile.projectTemplate.templateConfig.version = version;
     }
 
     if (packageFile) {
@@ -86,8 +86,8 @@ export const updateProjectPlatforms = (platforms: Array<RnvPlatformKey>) => {
     } = c.paths;
     const currentConfig = c.files.project.config;
     if (currentConfig) {
-        currentConfig.defaults = currentConfig.defaults || {};
-        currentConfig.defaults.supportedPlatforms = platforms;
+        currentConfig.project.defaults = currentConfig.project.defaults || {};
+        currentConfig.project.defaults.supportedPlatforms = platforms;
         writeFileSync(config, currentConfig);
     } else {
         logWarning('Config not loaded yet. skipping updateProjectPlatforms');

packages/core/src/configs/index.ts

@@ -24,7 +24,8 @@ export const loadFileExtended = (fileObj: Record<string, any>, pathObj: RnvConte
     const extendsTemplate = fileObj[key]?.extendsTemplate;
     if (key === 'config' && extendsTemplate) {
         // extendsTemplate only applies to standard 'config'
-        let currTemplate = c.files.project[key]?.templateConfig?.name || fileObj[key].templateConfig?.name;
+        let currTemplate =
+            c.files.project[key]?.projectTemplate?.templateConfig?.name || fileObj[key].templateConfig?.name;
         if (!currTemplate) {
             if (extendsTemplate.startsWith('@')) {
                 currTemplate = extendsTemplate.split('/').slice(0, 2).join('/');
@@ -285,12 +286,12 @@ export const parseRenativeConfigs = async () => {
     }
 
     // LOAD WORKSPACE /[PROJECT_NAME]/RENATIVE.*.JSON
-    if (!c.files.project.config.projectName) {
+    if (!c.files.project.config?.project?.projectName) {
         return Promise.reject('Your renative.json is missing required property: projectName ');
     }
     generateContextPaths(
         c.paths.workspace.project,
-        path.join(c.paths.workspace.dir, c.files.project.config.projectName)
+        path.join(c.paths.workspace.dir, c.files.project.config.project.projectName)
     );
     _loadConfigFiles(c.files.workspace.project, c.paths.workspace.project);