[WIP] Upgrade yarn and moon (#138)

* upgrade yarn and moon succesfully

* update tasks and dockerfile

* testing

* Replace swc with tsup for node builds
Fix circular dependency issues in models build
Update type imports
Remove unused packages

* Add missing plugin file

* Update node builds to use tsc
Update models to use reference import to prevent circular deps issues
Update all release scripts to use node 16

* remove project reference from landping page moon

* Fix landing page outputs
Fix jest test config

* cypress blue team command

* remove types

* add types back in to tsconfig

* Fix client mobx store loading errors

* pin moon to 1.8

* upgrade moon and locked all resolutions to 1.9.2

* Update lock file

---------

Co-authored-by: Austin Golding <austin.golding.dev@icloud.com>

.eslintrc.json

@@ -28,6 +28,14 @@
 				"argsIgnorePattern": "^_"
 			}
 		],
+		"@typescript-eslint/consistent-type-imports": [
+			"warn",
+			{
+				"prefer": "type-imports",
+				"fixStyle": "separate-type-imports",
+				"disallowTypeAnnotations": true
+			}
+		],
 		"import/no-anonymous-default-export": ["error"]
 	}
 }

.github/workflows/release.yml

@@ -31,4 +31,3 @@ jobs:
         with:
           name: RedEye
           path: artifacts
-

.moon/tasks.yml

@@ -44,30 +44,6 @@ fileGroups:
 # This setting requires a map, where the key is a unique name for the task,
 # and the value is an object of task parameters.
 tasks:
-  run-cypress:
-    local: true
-    command:
-      - cypress
-      - run
-      - --config-file
-      - cypress.config.js
-    env:
-      CYPRESS_BASE_URL: http://localhost:3500
-    platform: node
-    options:
-      runInCI: false
-  start-cypress:
-    local: true
-    command:
-      - cypress
-      - open
-      - --config-file
-      - cypress.config.js
-    env:
-      CYPRESS_BASE_URL: http://localhost:3500
-    platform: node
-    options:
-      runInCI: false
   test-jest:
     command: 'jest . --coverage --reporters="jest-junit" --passWithNoTests'
     inputs:
@@ -92,6 +68,16 @@ tasks:
     platform: node
     options:
       runInCI: false
+  lint-global:
+    command: 'eslint --config $workspaceRoot/.eslintrc.json --ignore-path $workspaceRoot/.gitignore src --fix --max-warnings 0'
+    inputs:
+      - '@globs(sources)'
+      - '@globs(tests)'
+      - '.eslintignore'
+      - '.eslintrc.json'
+    platform: node
+    options:
+      runInCI: false
   format:
     command:
       - prettier
@@ -144,18 +130,35 @@ tasks:
 
   # Library mode commands
   build-library:
-    command: 'cross-env npx -c "tsup-node ./src/index.ts --minify --format esm && tsc --emitDeclarationOnly --outDir dist"'
+    command: 'noop'
     inputs:
       - '@globs(sources)'
-      - '@globs(assets)'
+      - '@globs(tests)'
       - 'tsconfig.json'
     outputs:
       - dist
       - 'tsconfig.tsbuildinfo'
+    deps:
+      - ^:build
+      - ~:build-client-library
+      - ~:typecheck
+    env:
+      NODE_ENV: production
+    platform: node
+    options:
+      runDepsInParallel: false
+      runInCI: false
+  build-client-library:
+    command: 'tsup-node ./src/index.ts --minify --format esm'
+    inputs:
+      - '@globs(sources)'
+      - '@globs(assets)'
+      - 'tsconfig.json'
+    outputs:
+      - dist
     env:
       NODE_ENV: production
     deps:
-      - ^:build
       - ~:clean-dist
     platform: node
     options:
@@ -171,62 +174,57 @@ tasks:
     env:
       NODE_ENV: production
     platform: node
-    local: true
     options:
       runInCI: false
+      cache: false
 
   # Node commands
-
-  ## Build with SWC and type checking
-  build-node:
-    command: 'noop'
+  build-node-library:
+    command: 'tsc --project tsconfig.json --module commonjs --sourceMap --outDir @out(0)'
     inputs:
       - '@globs(sources)'
-      - '@globs(tests)'
+      - '@globs(assets)'
       - 'tsconfig.json'
     outputs:
       - dist
-      - 'tsconfig.tsbuildinfo'
-    deps:
-      - ^:build
-      - ~:build-swc
-      - ~:typecheck
     env:
       NODE_ENV: production
+    deps:
+      - ~:clean-dist
     platform: node
     options:
       runDepsInParallel: false
       runInCI: false
-
-  ## Build with SWC and clean dist
-  build-swc:
-    command: 'swc src -d @out(0) --copy-files'
+  build-node:
+    command: 'noop'
     inputs:
       - '@globs(sources)'
-      - '.swcrc'
-    outputs:
-      - dist
+      - '@globs(tests)'
+      - 'tsconfig.json'
     deps:
-      - ~:clean-dist
+      - ^:build
+      - ~:build-node-library
+    env:
+      NODE_ENV: production
     platform: node
     options:
+      runDepsInParallel: false
       runInCI: false
 
   start-node:
     env:
       NODE_ENV: development
-    command: 'nodemon --ext ts --watch src --exec "swc src -d dist && yarn node ./dist/index.js" --ignore "src/**/*.test.ts"'
-    local: true
+    command: 'tsup-node src/index.ts --sourcemap --watch --onSuccess "yarn node --enable-source-maps dist/index.js" --ignore-watch "src/**/*.test.ts"'
     inputs:
       - '@globs(sources)'
       - '@globs(tests)'
       - 'tsconfig.json'
     platform: node
+    local: true
     options:
       runInCI: false
 
   # Release Commands
-
   release-all:
     command: 'noop'
     deps:
@@ -303,6 +301,7 @@ tasks:
     platform: node
     options:
       runInCI: false
+      cache: false
 
   ## Typecheck
   typecheck:

.moon/toolchain.yml

@@ -18,7 +18,7 @@ node:
 
   # The version of the package manager (above) to use.
   yarn:
-    version: '3.2.3'
+    version: '3.5.1'
 
   # Add `node.version` as a constraint in the root `package.json` `engines`.
   addEnginesConstraint: true

.moon/workspace.yml

@@ -6,9 +6,9 @@ $schema: 'https://moonrepo.dev/schemas/workspace.json'
 
 # Extend and inherit an external configuration file. Must be a valid HTTPS URL or file system path.
 # extends: './shared/workspace.yml'
-runner:
-  implicitDeps:
-    - '^:build'
+# runner:
+#   implicitDeps:
+#     - '^:build'
 # REQUIRED: A map of all projects found within the workspace, or a list or file system globs.
 # When using a map, each entry requires a unique project ID as the map key, and a file system
 # path to the project folder as the map value. File paths are relative from the workspace root,

.yarnrc.yml

@@ -1,9 +1,13 @@
 enableTelemetry: false
 
 logFilters:
- - code: YN0013
-   level: discard
+  - code: YN0013
+    level: discard
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.2.3.cjs
+plugins:
+  - path: .yarn/plugins/@ArTs/plugin-http-proxy.cjs
+    spec: 'https://github.com/arontsang/yarn-plugin-http-proxy/releases/latest/download/index.cjs'
+
+yarnPath: .yarn/releases/yarn-3.5.1.cjs

applications/client/.eslintrc.yaml

@@ -20,6 +20,7 @@ extends:
   - prettier
 rules:
   react-hooks/exhaustive-deps: 0 # Disabled for mobx
+  react/no-unknown-property: 0 # Disabled for css and cy-test
   import/prefer-default-export: 0 # Prefer named exports
   import/no-default-export: 2 # Prefer named exports
   no-console: 1 # Warn about console logs, use window.console.log if the log should be available in production

applications/client/src/components/Mitre/readme.md

@@ -1,17 +1,12 @@
-
-
-
 # Download MITRE ATT&CK Framework Json
 
 https://github.com/mitre/cti/blob/master/enterprise-attack/enterprise-attack.json
 
-
-
-
 This data may need to be updated periodically
+
 - Visit https://mitre-attack.github.io/attack-navigator/
 - Select "Create New Layer" > "Enterprise"
 - In the top toolbar under "Selection Controls" click "Search & MultiSelect" (the search icon 🔎)
 - In the right panel, under "Techniques" click "Select All."
 - With all techniques selected, In the top toolbar under "Layer Controls" click "Download layer as json" (the down arrow icon ⬇)
-- replace the `layer.json` file with the newly downloaded one.
+- replace the `layer.json` file with the newly downloaded one.

applications/client/src/views/Campaign/Explore/Panels/Meta/HideDialog.tsx

@@ -51,7 +51,7 @@ export const ToggleHiddenDialog = observer<Props>(
 		const dialogTitle = isHidingFinal
 			? `Cannot hide final ${infoType.toLowerCase()}${bulk ? 's' : ''}`
 			: // : `${verb} this ${infoType.toLowerCase()}?`;
-				  `${verb} ${bulk ? 'these' : 'this'} ${infoType.toLowerCase()}${bulk ? 's' : ''}?`;
+			  `${verb} ${bulk ? 'these' : 'this'} ${infoType.toLowerCase()}${bulk ? 's' : ''}?`;
 
 		return (
 			<DialogEx onClose={onClose} title={dialogTitle} {...props}>

applications/client/tsconfig.json

@@ -39,8 +39,7 @@
 					"validProperties": ["r", "dominant-baseline"]
 				}
 			}
-		],
-		"types": ["react/next"]
+		]
 	},
 	"include": ["src"],
 	"references": [

applications/landing-page/moon.yml

@@ -13,7 +13,7 @@ tasks:
     inputs:
       - '@group(astro)'
     outputs:
-      - 'dist'
+      - 'dist-landing'
   start-astro:
     local: true
     deps:
@@ -22,7 +22,3 @@ tasks:
       runInCI: false
       runDepsInParallel: false
     command: 'astro dev'
-# Disable project references
-toolchain:
-  typescript:
-  syncProjectReferences: false

applications/redeye-e2e/.env.blue

@@ -0,0 +1,2 @@
+
+SERVER_BLUE_TEAM=true

applications/redeye-e2e/moon.yml

@@ -1,32 +1,44 @@
 dependsOn:
   - 'server'
   - 'client'
+
 tasks:
-  open-cy:
-    command: 'concurrently "yarn start:client" "yarn start:server" "yarn moon run redeye-e2e:start-cypress"'
+  start:
     local: true
+    command:
+      - cypress
+      - open
+      - --config-file
+      - cypress.config.js
+    env:
+      CYPRESS_BASE_URL: http://localhost:3500
     options:
-      runFromWorkspaceRoot: true
-  open-cy-blue:
-    command: 'concurrently "yarn start:server" "yarn start:client" "yarn moon run redeye-e2e:start-cypress"'
+      runInCI: false
+
+  run:
     local: true
-    options:
-      runFromWorkspaceRoot: true
+    command:
+      - cypress
+      - run
+      - --config-file
+      - cypress.config.js
     env:
-      SERVER_BLUE_TEAM: 'true'
-  cy-ci-chrome-redteam:
-    local: true
-    command: 'concurrently "yarn start:server" "yarn start:client" "yarn moon run redeye-e2e:run-cypress -- --headed --browser=chrome"'
+      CYPRESS_BASE_URL: http://localhost:3500
+    platform: node
     options:
-      runFromWorkspaceRoot: true
-  cy-ci-firefox-redteam:
+      runInCI: false
+
+  open-cy:
+    command: 'noop'
+    deps:
+      - 'client:start-dev'
+      - 'server:start-dev'
+      - 'redeye-e2e:start'
     local: true
-    command: 'concurrently "yarn start:server" "yarn start:client" "yarn moon run redeye-e2e:run-cypress -- --browser=firefox --headed --spec **/**/e2e/redteam/**/**/**"'
-    options:
-      runFromWorkspaceRoot: true
-  cy-ci-chrome-blueteam:
+
+  open-cy-blue:
+    command: 'concurrently "yarn start:server" "yarn start:client" "yarn moon run redeye-e2e:start"'
     local: true
-    command: 'concurrently "yarn start:server" "yarn start:client" "yarn moon run redeye-e2e:run-cypress -- --headed --browser=chrome --spec **/**/e2e/blueteam/**/**/**"'
     options:
       runFromWorkspaceRoot: true
     env:

applications/server/.env.blue

@@ -0,0 +1,2 @@
+
+SERVER_BLUE_TEAM=true