diff --git a/.eslintrc.js b/.eslintrc.js index 064c4b8c..d4c48837 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -14,9 +14,9 @@ module.exports = { devDependencies: [ "**/__tests__/**", // web app will be built with parcel in the dist folder, so we only package the final html/js files, not the deps - "packages/measure/src/webapp/**", - "packages/web-reporter-ui/utils/testUtils.ts", - "packages/web-reporter/src/**", + "packages/commands/measure/src/webapp/**", + "packages/core/web-reporter-ui/utils/testUtils.ts", + "packages/commands/report/src/**", "**/*.config.js", // This is necessary for tailwind.config.js in both web-reporter and web-reporter-ui ], }, diff --git a/.github/workflows/ios_e2e.sh b/.github/workflows/ios_e2e.sh index dda8b884..9d7401b8 100755 --- a/.github/workflows/ios_e2e.sh +++ b/.github/workflows/ios_e2e.sh @@ -22,4 +22,4 @@ xcrun simctl install $UDID ./.github/workflows/fakeStore.app xcrun simctl launch $UDID $APPID mkdir -p report -npx flashlight-ios-poc ios-test --appId $APPID --simulatorId $UDID --testCommand 'maestro test ./packages/ios-poc/test.yaml' --resultsFilePath './report/result.json' \ No newline at end of file +npx flashlight-ios-poc ios-test --appId $APPID --simulatorId $UDID --testCommand 'maestro test ./packages/platforms/ios/test.yaml' --resultsFilePath './report/result.json' \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cbc3fb2f..1c982298 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,7 +43,7 @@ yarn workspace @perf-profiler/measure start Then run the `measure` commmand with: ```bash -DEVELOPMENT_MODE=true node packages/measure/dist/server/bin.js measure +DEVELOPMENT_MODE=true node packages/commands/measure/dist/server/bin.js measure ``` ### `test` command @@ -52,7 +52,7 @@ To run the command locally: ``` -node packages/e2e-performance/dist/bin.js test +node packages/commands/test/dist/bin.js test ``` @@ -74,7 +74,7 @@ yarn workspace @perf-profiler/web-reporter start ``` -Then in `packages/web-reporter/src/App.tsx`, uncomment the lines to add your own measures: +Then in `packages/commands/report/src/App.tsx`, uncomment the lines to add your own measures: ```ts // Uncomment with when locally testing diff --git a/jest.config.js b/jest.config.js index 46c14c9e..69bee46b 100644 --- a/jest.config.js +++ b/jest.config.js @@ -12,18 +12,18 @@ const commonOptions = { setupFiles: ["/jest-setup.ts"], }; -const WEB_PACKAGES = ["flipper-plugin-android-performance-profiler", "measure", "web-reporter-ui"]; +const WEB_PACKAGES = ["plugins/flipper", "commands/measure", "core/web-reporter-ui"]; const NODE_PACKAGES = [ - "android-performance-profiler", - "appium-helper", - "appium-test-cases", - "aws-device-farm", - "e2e-performance", - "eslint-plugin-flashlight-eslint-rules", - "reporter", - "shell", - "web-reporter", + "platforms/android", + "plugins/appium-helper", + "plugins/appium-test-cases", + "plugins/aws-device-farm", + "commands/test", + "plugins/eslint", + "core/reporter", + "core/shell", + "commands/report", ]; module.exports = { diff --git a/lerna.json b/lerna.json index c1963577..dc6dbfcf 100644 --- a/lerna.json +++ b/lerna.json @@ -1,18 +1,18 @@ { "packages": [ - "./packages/logger", - "./packages/shell", - "./packages/types", - "./packages/android-performance-profiler", - "./packages/appium-helper", - "./packages/e2e-performance", - "./packages/reporter", - "./packages/web-reporter-ui", - "./packages/web-reporter", - "./packages/appium-test-cases", - "./packages/aws-device-farm", - "./packages/measure", - "./packages/ios-poc" + "./packages/core/logger", + "./packages/core/shell", + "./packages/core/types", + "./packages/platforms/android", + "./packages/plugins/appium-helper", + "./packages/commands/test", + "./packages/core/reporter", + "./packages/core/web-reporter-ui", + "./packages/commands/report", + "./packages/plugins/appium-test-cases", + "./packages/plugins/aws-device-farm", + "./packages/commands/measure", + "./packages/platforms/ios" ], "useWorkspaces": false, "npmClient": "yarn", diff --git a/package.json b/package.json index ae670d14..547f6ba3 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ }, "license": "MIT", "workspaces": [ - "packages/*", + "packages/*/*", "examples/*" ], "bugs": { diff --git a/packages/measure/.postcssrc b/packages/commands/measure/.postcssrc similarity index 100% rename from packages/measure/.postcssrc rename to packages/commands/measure/.postcssrc diff --git a/packages/measure/CHANGELOG.md b/packages/commands/measure/CHANGELOG.md similarity index 100% rename from packages/measure/CHANGELOG.md rename to packages/commands/measure/CHANGELOG.md diff --git a/packages/measure/package.json b/packages/commands/measure/package.json similarity index 100% rename from packages/measure/package.json rename to packages/commands/measure/package.json diff --git a/packages/measure/src/__tests__/__snapshots__/measure.test.tsx.snap b/packages/commands/measure/src/__tests__/__snapshots__/measure.test.tsx.snap similarity index 100% rename from packages/measure/src/__tests__/__snapshots__/measure.test.tsx.snap rename to packages/commands/measure/src/__tests__/__snapshots__/measure.test.tsx.snap diff --git a/packages/measure/src/__tests__/measure.test.tsx b/packages/commands/measure/src/__tests__/measure.test.tsx similarity index 100% rename from packages/measure/src/__tests__/measure.test.tsx rename to packages/commands/measure/src/__tests__/measure.test.tsx diff --git a/packages/measure/src/__tests__/utils/removeCLIColors.ts b/packages/commands/measure/src/__tests__/utils/removeCLIColors.ts similarity index 100% rename from packages/measure/src/__tests__/utils/removeCLIColors.ts rename to packages/commands/measure/src/__tests__/utils/removeCLIColors.ts diff --git a/packages/measure/src/common/useLogSocketEvents.ts b/packages/commands/measure/src/common/useLogSocketEvents.ts similarity index 100% rename from packages/measure/src/common/useLogSocketEvents.ts rename to packages/commands/measure/src/common/useLogSocketEvents.ts diff --git a/packages/measure/src/server/ServerApp.tsx b/packages/commands/measure/src/server/ServerApp.tsx similarity index 100% rename from packages/measure/src/server/ServerApp.tsx rename to packages/commands/measure/src/server/ServerApp.tsx diff --git a/packages/measure/src/server/ServerSocketConnectionApp.tsx b/packages/commands/measure/src/server/ServerSocketConnectionApp.tsx similarity index 100% rename from packages/measure/src/server/ServerSocketConnectionApp.tsx rename to packages/commands/measure/src/server/ServerSocketConnectionApp.tsx diff --git a/packages/measure/src/server/bin.tsx b/packages/commands/measure/src/server/bin.tsx similarity index 100% rename from packages/measure/src/server/bin.tsx rename to packages/commands/measure/src/server/bin.tsx diff --git a/packages/measure/src/server/components/HostAndPortInfo.tsx b/packages/commands/measure/src/server/components/HostAndPortInfo.tsx similarity index 100% rename from packages/measure/src/server/components/HostAndPortInfo.tsx rename to packages/commands/measure/src/server/components/HostAndPortInfo.tsx diff --git a/packages/measure/src/server/constants.ts b/packages/commands/measure/src/server/constants.ts similarity index 100% rename from packages/measure/src/server/constants.ts rename to packages/commands/measure/src/server/constants.ts diff --git a/packages/measure/src/server/socket/socketInterface.ts b/packages/commands/measure/src/server/socket/socketInterface.ts similarity index 100% rename from packages/measure/src/server/socket/socketInterface.ts rename to packages/commands/measure/src/server/socket/socketInterface.ts diff --git a/packages/measure/src/server/socket/socketState.ts b/packages/commands/measure/src/server/socket/socketState.ts similarity index 100% rename from packages/measure/src/server/socket/socketState.ts rename to packages/commands/measure/src/server/socket/socketState.ts diff --git a/packages/measure/src/server/useBundleIdControls.ts b/packages/commands/measure/src/server/useBundleIdControls.ts similarity index 100% rename from packages/measure/src/server/useBundleIdControls.ts rename to packages/commands/measure/src/server/useBundleIdControls.ts diff --git a/packages/measure/src/webapp/MeasureWebApp.tsx b/packages/commands/measure/src/webapp/MeasureWebApp.tsx similarity index 100% rename from packages/measure/src/webapp/MeasureWebApp.tsx rename to packages/commands/measure/src/webapp/MeasureWebApp.tsx diff --git a/packages/flipper-plugin-android-performance-profiler/src/components/AppBar.tsx b/packages/commands/measure/src/webapp/components/AppBar.tsx similarity index 100% rename from packages/flipper-plugin-android-performance-profiler/src/components/AppBar.tsx rename to packages/commands/measure/src/webapp/components/AppBar.tsx diff --git a/packages/measure/src/webapp/components/BundleIdSelector.tsx b/packages/commands/measure/src/webapp/components/BundleIdSelector.tsx similarity index 100% rename from packages/measure/src/webapp/components/BundleIdSelector.tsx rename to packages/commands/measure/src/webapp/components/BundleIdSelector.tsx diff --git a/packages/measure/src/webapp/components/SocketState.tsx b/packages/commands/measure/src/webapp/components/SocketState.tsx similarity index 100% rename from packages/measure/src/webapp/components/SocketState.tsx rename to packages/commands/measure/src/webapp/components/SocketState.tsx diff --git a/packages/flipper-plugin-android-performance-profiler/src/components/StartButton.tsx b/packages/commands/measure/src/webapp/components/StartButton.tsx similarity index 100% rename from packages/flipper-plugin-android-performance-profiler/src/components/StartButton.tsx rename to packages/commands/measure/src/webapp/components/StartButton.tsx diff --git a/packages/measure/src/webapp/components/TextField.tsx b/packages/commands/measure/src/webapp/components/TextField.tsx similarity index 100% rename from packages/measure/src/webapp/components/TextField.tsx rename to packages/commands/measure/src/webapp/components/TextField.tsx diff --git a/packages/web-reporter/src/index.html b/packages/commands/measure/src/webapp/index.html similarity index 89% rename from packages/web-reporter/src/index.html rename to packages/commands/measure/src/webapp/index.html index 43a15a2e..8af90ec9 100644 --- a/packages/web-reporter/src/index.html +++ b/packages/commands/measure/src/webapp/index.html @@ -8,7 +8,7 @@