Engineer - Build application start as an engine app (#374)

.vscode/launch.json

@@ -1,53 +1,41 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "Mocha Current",
-            "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
-            "args": [
-                "--timeout",
-                "999999",
-                "${file}"
-            ],
-            "outputCapture": "std"
-        },
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "Mocha Pup Current",
-            "program": "${workspaceFolder}/node_modules/mocha-pup/cjs/cli.js",
-            "args": [
-                "${file}",
-                "--dev"
-            ],
-            "outputCapture": "std",
-            "internalConsoleOptions": "openOnSessionStart"
-        },
-        {
-            "type": "node",
-            "request": "attach",
-            "name": "Attach",
-            "port": 9229
-        },
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "Engine start",
-            "program": "${workspaceFolder}/node_modules/@wixc3/engine-scripts/cli.js",
-            "args": [
-                "start",
-            ],
-            "runtimeArgs": [
-                "--inspect"
-            ],
-            "outputCapture": "std",
-            "autoAttachChildProcesses": true
-        },
-    ]
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Mocha Current",
+      "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+      "args": ["--timeout", "999999", "${file}"],
+      "outputCapture": "std"
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Mocha Pup Current",
+      "program": "${workspaceFolder}/node_modules/mocha-pup/cjs/cli.js",
+      "args": ["${file}", "--dev"],
+      "outputCapture": "std",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "type": "node",
+      "request": "attach",
+      "name": "Attach",
+      "port": 9229
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Engine start",
+      "program": "${workspaceFolder}/node_modules/@wixc3/engine-scripts/cli.js",
+      "args": ["start"],
+      "runtimeArgs": ["--inspect"],
+      "outputCapture": "std",
+      "autoAttachChildProcesses": true
+    }
+  ]
 }

examples/electron-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@example/electron-app",
-  "version": "14.4.5",
+  "version": "15.0.0-rc.7",
   "main": "index.js",
   "scripts": {
     "start": "electron ."

examples/file-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@example/file-server",
-  "version": "14.4.4",
+  "version": "15.0.0-rc.7",
   "scripts": {
     "start": "engine start",
     "test": "yarn test:ix && yarn test:unit",

examples/playground/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@example/playground",
-  "version": "14.4.3",
+  "version": "15.0.0-rc.1",
   "scripts": {
     "start": "engine start"
   },

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "14.4.5",
+  "version": "15.0.0-rc.7",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

packages/core-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wixc3/engine-core-node",
-  "version": "14.4.5",
+  "version": "15.0.0-rc.1",
   "main": "cjs/index.js",
   "types": "cjs/index.d.ts",
   "scripts": {
@@ -12,7 +12,7 @@
     "prepack": "yarn build"
   },
   "dependencies": {
-    "@wixc3/engine-core": "^14.4.5",
+    "@wixc3/engine-core": "^15.0.0-rc.1",
     "create-listening-server": "^1.0.0",
     "express": "^4.17.1",
     "socket.io": "^2.3.0"

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wixc3/engine-core",
-  "version": "14.4.5",
+  "version": "15.0.0-rc.1",
   "main": "cjs/index.js",
   "types": "cjs/index.d.ts",
   "scripts": {

packages/engineer/bin/engineer.js

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+const { normalize, dirname } = require('path');
+
+if (__dirname.endsWith(normalize('/packages/engineer/bin'))) {
+    const configFilePath = require.resolve('../../../tsconfig.json');
+    const { createNodeExtension } = require('@ts-tools/node');
+    const nodeExtension = createNodeExtension({ configFilePath });
+    require.extensions['.ts'] = nodeExtension;
+    require.extensions['.tsx'] = nodeExtension;
+
+    const { options: tsconfigPathsOptions } = require('tsconfig-paths/lib/options');
+    tsconfigPathsOptions.cwd = dirname(configFilePath);
+    require('tsconfig-paths/register');
+    require('../src/cli');
+} else {
+    require('../cjs/src/cli');
+}

packages/engineer/build.js

@@ -0,0 +1,13 @@
+#!/usr/bin/env node
+const { dirname } = require('path');
+
+const configFilePath = require.resolve('../../tsconfig.json');
+const { createNodeExtension } = require('@ts-tools/node');
+const nodeExtension = createNodeExtension({ configFilePath });
+require.extensions['.ts'] = nodeExtension;
+require.extensions['.tsx'] = nodeExtension;
+
+const { options: tsconfigPathsOptions } = require('tsconfig-paths/lib/options');
+tsconfigPathsOptions.cwd = dirname(configFilePath);
+require('tsconfig-paths/register');
+require('./scripts/build');

packages/scripts/src/engine-dashboard/components/dashboard/dashboard.tsx → packages/engineer/engine-dashboard/components/dashboard/dashboard.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState, useCallback, memo } from 'react';
 import { FeaturesSelection } from './feature-selection';
-import { ServerState, isServerResponseMessage } from '../../../server-types';
+import { ServerState, isServerResponseMessage } from '../../server-types';
 import { classes } from './dashboard.st.css';
 import { RuntimeOptionsContainer, IRuntimeOption } from './runtime-options-container';
 import { ActionsContainer } from './actions-container';

packages/scripts/src/engine-dashboard/components/dashboard/feature-selection/feature-selection.tsx → packages/engineer/engine-dashboard/components/dashboard/feature-selection/feature-selection.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useMemo, useCallback, memo } from 'react';
 import Select from 'react-select';
-import type { ServerFeatureDef } from '../../../../server-types';
+import type { ServerFeatureDef } from '../../../server-types';
 import { classes } from './feature-selection.st.css';
 import { TitledElement } from '../titled-element';
 

packages/scripts/src/server-types.ts → packages/engineer/engine-dashboard/server-types.ts

@@ -1,4 +1,4 @@
-import type { IFeatureMessagePayload, IProcessMessage, ErrorResponse } from './types';
+import type { IFeatureMessagePayload, IProcessMessage, ErrorResponse } from '@wixc3/engine-scripts';
 
 export interface ServerResponse<T> extends IProcessMessage<T> {
     id: 'error' | 'feature-initialized' | 'feature-closed';