consolidate tsconfig.workspace.jsons into toplevel tsconfig.demo.json

Author: LucDeCaf

demos/example-electron-node/tsconfig.workspace.json

@@ -83,15 +83,12 @@ const linkDemo = async (demoName: string) => {
   }
 
   const tsConfigPath = path.join(demoSrc, 'tsconfig.json');
-  const tsConfigWorkspacePath = path.join(demoSrc, 'tsconfig.workspace.json');
-  let workspaceFileFound = false;
 
   changes = false;
   if (fs.existsSync(tsConfigPath)) {
     console.log('Checking tsconfig.json');
 
     let tsConfig: any;
-    let tsConfigWorkspace: any;
     try {
       tsConfig = JSON.parse(fs.readFileSync(tsConfigPath, 'utf8'));
     } catch (ex) {
@@ -107,23 +104,6 @@ const linkDemo = async (demoName: string) => {
         if (ref.path === 'tsconfig.workspace.json') {
           console.log('- Unlinking tsconfig.workspace.json');
 
-          tsConfig.references.splice(i);
-          changes = true;
-        } else if (ref.path.startsWith('..')) {
-          // Move reference to workspace file
-          console.log(`- Moving ${ref.path} to tsconfig.workspace.json`);
-          tsConfigWorkspace = {};
-
-          if (fs.existsSync(tsConfigWorkspacePath)) {
-            tsConfigWorkspace = JSON.parse(fs.readFileSync(tsConfigWorkspacePath, 'utf8'));
-          }
-
-          if ('references' in tsConfigWorkspace) {
-            tsConfigWorkspace.references.push(ref);
-          } else {
-            tsConfigWorkspace.references = [ref];
-          }
-
           tsConfig.references.splice(i);
           changes = true;
         }
@@ -136,9 +116,6 @@ const linkDemo = async (demoName: string) => {
 
     if (changes) {
       fs.writeFileSync(tsConfigPath, `${JSON.stringify(tsConfig, null, 2)}\n`, 'utf8');
-      if (tsConfigWorkspace) {
-        fs.writeFileSync(tsConfigWorkspacePath, `${JSON.stringify(tsConfigWorkspace, null, 2)}\n`, 'utf8');
-      }
     } else {
       console.log('- No changes');
     }

demos/example-electron/tsconfig.workspace.json

@@ -84,24 +84,23 @@ const linkDemo = async (demoName: string) => {
     console.log('- No changes');
   }
 
-  // Update tsconfig.json using tsconfig.workspace.json
+  // Update tsconfig.json to reference tsconfig.demo.json
   const tsConfigPath = path.join(demoSrc, 'tsconfig.json');
-  const tsConfigWorkspacePath = path.join(demoSrc, 'tsconfig.workspace.json');
 
-  if (fs.existsSync(tsConfigWorkspacePath)) {
+  if (fs.existsSync(tsConfigPath)) {
     const tsConfig = JSON.parse(fs.readFileSync(tsConfigPath, 'utf8'));
 
     const workspaceRef = {
-      path: 'tsconfig.workspace.json'
+      path: '../../tsconfig.demo.json'
     };
 
-    console.log('Linking tsconfig.workspace.json');
+    console.log('Linking tsconfig.demo.json');
 
     changes = false;
     const references = tsConfig['references'];
 
     if (references) {
-      const existingWorkspaceRef = references.find((v: any) => v.path === 'tsconfig.workspace.json');
+      const existingWorkspaceRef = references.find((v: any) => v.path === '../../tsconfig.demo.json');
       if (existingWorkspaceRef == undefined) {
         tsConfig['references'].push(workspaceRef);
         changes = true;

demos/react-supabase-todolist-optional-sync/tsconfig.workspace.json

@@ -0,0 +1,11 @@
+// Gets linked into the demos' local tsconfig files when doing local development.
+{
+  "references": [
+    {
+      "path": "./packages/web"
+    },
+    {
+      "path": "./packages/node"
+    }
+  ]
+}