diff --git a/packages/react-devtools-core/src/backend.js b/packages/react-devtools-core/src/backend.js index 71dac50aa75ea..3874e58a07984 100644 --- a/packages/react-devtools-core/src/backend.js +++ b/packages/react-devtools-core/src/backend.js @@ -1,17 +1,17 @@ // @flow -import Agent from 'src/backend/agent'; -import Bridge from 'src/bridge'; -import { installHook } from 'src/hook'; -import { initBackend } from 'src/backend'; -import { __DEBUG__ } from 'src/constants'; -import setupNativeStyleEditor from 'src/backend/NativeStyleEditor/setupNativeStyleEditor'; -import { getDefaultComponentFilters } from 'src/utils'; +import Agent from 'react-devtools-shared/src/backend/agent'; +import Bridge from 'react-devtools-shared/src/bridge'; +import { installHook } from 'react-devtools-shared/src/hook'; +import { initBackend } from 'react-devtools-shared/src/backend'; +import { __DEBUG__ } from 'react-devtools-shared/src/constants'; +import setupNativeStyleEditor from 'react-devtools-shared/src/backend/NativeStyleEditor/setupNativeStyleEditor'; +import { getDefaultComponentFilters } from 'react-devtools-shared/src/utils'; -import type { BackendBridge } from 'src/bridge'; -import type { ComponentFilter } from 'src/types'; -import type { DevToolsHook } from 'src/backend/types'; -import type { ResolveNativeStyle } from 'src/backend/NativeStyleEditor/setupNativeStyleEditor'; +import type { BackendBridge } from 'react-devtools-shared/src/bridge'; +import type { ComponentFilter } from 'react-devtools-shared/src/types'; +import type { DevToolsHook } from 'react-devtools-shared/src/backend/types'; +import type { ResolveNativeStyle } from 'react-devtools-shared/src/backend/NativeStyleEditor/setupNativeStyleEditor'; type ConnectOptions = { host?: string, diff --git a/packages/react-devtools-core/src/standalone.js b/packages/react-devtools-core/src/standalone.js index c93a3de812546..23d5424fec53c 100644 --- a/packages/react-devtools-core/src/standalone.js +++ b/packages/react-devtools-core/src/standalone.js @@ -7,18 +7,18 @@ import { // $FlowFixMe Flow does not yet know about createRoot() unstable_createRoot as createRoot, } from 'react-dom'; -import Bridge from 'src/bridge'; -import Store from 'src/devtools/store'; -import { getSavedComponentFilters, getAppendComponentStack } from 'src/utils'; +import Bridge from 'react-devtools-shared/src/bridge'; +import Store from 'react-devtools-shared/src/devtools/store'; +import { getSavedComponentFilters, getAppendComponentStack } from 'react-devtools-shared/src/utils'; import { Server } from 'ws'; import { existsSync, readFileSync } from 'fs'; -import { installHook } from 'src/hook'; -import DevTools from 'src/devtools/views/DevTools'; +import { installHook } from 'react-devtools-shared/src/hook'; +import DevTools from 'react-devtools-shared/src/devtools/views/DevTools'; import { doesFilePathExist, launchEditor } from './editor'; -import { __DEBUG__ } from 'src/constants'; +import { __DEBUG__ } from 'react-devtools-shared/src/constants'; -import type { FrontendBridge } from 'src/bridge'; -import type { InspectedElement } from 'src/devtools/views/Components/types'; +import type { FrontendBridge } from 'react-devtools-shared/src/bridge'; +import type { InspectedElement } from 'react-devtools-shared/src/devtools/views/Components/types'; installHook(window); diff --git a/packages/react-devtools-extensions/shells/browser/chrome/README.md b/packages/react-devtools-extensions/chrome/README.md similarity index 100% rename from packages/react-devtools-extensions/shells/browser/chrome/README.md rename to packages/react-devtools-extensions/chrome/README.md diff --git a/packages/react-devtools-extensions/shells/browser/chrome/build.js b/packages/react-devtools-extensions/chrome/build.js similarity index 100% rename from packages/react-devtools-extensions/shells/browser/chrome/build.js rename to packages/react-devtools-extensions/chrome/build.js diff --git a/packages/react-devtools-extensions/shells/browser/chrome/deploy.js b/packages/react-devtools-extensions/chrome/deploy.js similarity index 100% rename from packages/react-devtools-extensions/shells/browser/chrome/deploy.js rename to packages/react-devtools-extensions/chrome/deploy.js diff --git a/packages/react-devtools-extensions/shells/browser/chrome/manifest.json b/packages/react-devtools-extensions/chrome/manifest.json similarity index 100% rename from packages/react-devtools-extensions/shells/browser/chrome/manifest.json rename to packages/react-devtools-extensions/chrome/manifest.json diff --git a/packages/react-devtools-extensions/shells/browser/chrome/now.json b/packages/react-devtools-extensions/chrome/now.json similarity index 100% rename from packages/react-devtools-extensions/shells/browser/chrome/now.json rename to packages/react-devtools-extensions/chrome/now.json diff --git a/packages/react-devtools-extensions/shells/browser/chrome/test.js b/packages/react-devtools-extensions/chrome/test.js similarity index 100% rename from packages/react-devtools-extensions/shells/browser/chrome/test.js rename to packages/react-devtools-extensions/chrome/test.js diff --git a/packages/react-devtools-extensions/shells/browser/firefox/README.md b/packages/react-devtools-extensions/firefox/README.md similarity index 100% rename from packages/react-devtools-extensions/shells/browser/firefox/README.md rename to packages/react-devtools-extensions/firefox/README.md diff --git a/packages/react-devtools-extensions/shells/browser/firefox/build.js b/packages/react-devtools-extensions/firefox/build.js similarity index 100% rename from packages/react-devtools-extensions/shells/browser/firefox/build.js rename to packages/react-devtools-extensions/firefox/build.js diff --git a/packages/react-devtools-extensions/shells/browser/firefox/deploy.js b/packages/react-devtools-extensions/firefox/deploy.js similarity index 100% rename from packages/react-devtools-extensions/shells/browser/firefox/deploy.js rename to packages/react-devtools-extensions/firefox/deploy.js diff --git a/packages/react-devtools-extensions/shells/browser/firefox/manifest.json b/packages/react-devtools-extensions/firefox/manifest.json similarity index 100% rename from packages/react-devtools-extensions/shells/browser/firefox/manifest.json rename to packages/react-devtools-extensions/firefox/manifest.json diff --git a/packages/react-devtools-extensions/shells/browser/firefox/now.json b/packages/react-devtools-extensions/firefox/now.json similarity index 100% rename from packages/react-devtools-extensions/shells/browser/firefox/now.json rename to packages/react-devtools-extensions/firefox/now.json diff --git a/packages/react-devtools-extensions/shells/browser/firefox/test.js b/packages/react-devtools-extensions/firefox/test.js similarity index 100% rename from packages/react-devtools-extensions/shells/browser/firefox/test.js rename to packages/react-devtools-extensions/firefox/test.js diff --git a/packages/react-devtools-extensions/package.json b/packages/react-devtools-extensions/package.json index 87675b602c38d..833b8f5796389 100644 --- a/packages/react-devtools-extensions/package.json +++ b/packages/react-devtools-extensions/package.json @@ -1,164 +1,6 @@ { - "version": "4.0.0", - "repository": "bvaughn/react-devtools-experimental", - "license": "MIT", - "private": true, - "workspaces": [ - "packages/*" - ], - "jest": { - "modulePathIgnorePatterns": [ - "/shells" - ], - "modulePaths": [ - "" - ], - "moduleNameMapper": { - "^src/(.*)$": "/src/$1", - "\\.css$": "/src/__tests__/__mocks__/cssMock.js" - }, - "setupFiles": [ - "/src/__tests__/setupEnv" - ], - "setupFilesAfterEnv": [ - "/src/__tests__/setupTests" - ], - "snapshotSerializers": [ - "/src/__tests__/inspectedElementSerializer", - "/src/__tests__/storeSerializer" - ], - "testMatch": [ - "**/__tests__/**/*-test.js" - ] - }, - "scripts": { - "build:core:backend": "cd ./packages/react-devtools-core && yarn build:backend", - "build:core:standalone": "cd ./packages/react-devtools-core && yarn build:standalone", - "build:core": "cd ./packages/react-devtools-core && yarn build", - "build:inline": "cd ./packages/react-devtools-inline && yarn build", - "build:demo": "cd ./shells/dev && cross-env NODE_ENV=development cross-env TARGET=remote webpack --config webpack.config.js", - "build:extension": "cross-env NODE_ENV=production yarn run build:extension:chrome && yarn run build:extension:firefox", - "build:extension:dev": "cross-env NODE_ENV=development yarn run build:extension:chrome && yarn run build:extension:firefox", - "build:extension:chrome": "cross-env NODE_ENV=production node ./shells/browser/chrome/build", - "build:extension:chrome:crx": "cross-env NODE_ENV=production node ./shells/browser/chrome/build --crx", - "build:extension:chrome:dev": "cross-env NODE_ENV=development node ./shells/browser/chrome/build", - "build:extension:firefox": "cross-env NODE_ENV=production node ./shells/browser/firefox/build", - "build:extension:firefox:dev": "cross-env NODE_ENV=development node ./shells/browser/firefox/build", - "build:standalone": "cd packages/react-devtools-core && yarn run build", - "deploy": "yarn run deploy:demo && yarn run deploy:chrome && yarn run deploy:firefox", - "deploy:demo": "yarn run build:demo && cd shells/dev/ && now deploy && now alias react-devtools-experimental", - "deploy:chrome": "node ./shells/browser/chrome/deploy", - "deploy:firefox": "node ./shells/browser/firefox/deploy", - "linc": "lint-staged", - "lint": "eslint '**/*.js'", - "lint:ci": "eslint '**/*.js' --max-warnings 0", - "precommit": "lint-staged", - "prettier": "prettier --write '**/*.{js,json,css}'", - "prettier:ci": "prettier --check '**/*.{js,json,css}'", - "start": "cd ./shells/dev && cross-env NODE_ENV=development cross-env TARGET=local webpack-dev-server --open", - "start:core:backend": "cd ./packages/react-devtools-core && yarn start:backend", - "start:core:standalone": "cd ./packages/react-devtools-core && yarn start:standalone", - "start:electron": "cd ./packages/react-devtools && node bin.js", - "start:prod": "cd ./shells/dev && cross-env NODE_ENV=production cross-env TARGET=local webpack-dev-server --open", - "test": "jest", - "test-debug": "node --inspect-brk node_modules/.bin/jest --runInBand", - "test:chrome": "node ./shells/browser/chrome/test", - "test:firefox": "node ./shells/browser/firefox/test", - "test:standalone": "cd packages/react-devtools && yarn start", - "typecheck": "flow check --show-all-errors" - }, - "devEngines": { - "node": "10.x || 11.x" - }, - "lint-staged": { - "{shells,src}/**/*.{js,json,css}": [ - "prettier --write", - "git add" - ], - "**/*.js": "eslint --max-warnings 0" - }, - "devDependencies": { - "@babel/core": "^7.1.6", - "@babel/plugin-proposal-class-properties": "^7.1.0", - "@babel/plugin-transform-flow-strip-types": "^7.1.6", - "@babel/plugin-transform-react-jsx-source": "^7.2.0", - "@babel/preset-env": "^7.1.6", - "@babel/preset-flow": "^7.0.0", - "@babel/preset-react": "^7.0.0", - "@reach/menu-button": "^0.1.17", - "@reach/tooltip": "^0.2.2", - "archiver": "^3.0.0", - "babel-core": "^7.0.0-bridge", - "babel-eslint": "^9.0.0", - "babel-jest": "^24.7.1", - "babel-loader": "^8.0.4", - "child-process-promise": "^2.2.1", - "chrome-launch": "^1.1.4", - "classnames": "2.2.1", - "cli-spinners": "^1.0.0", - "clipboard-js": "^0.3.6", - "cross-env": "^5.2.0", - "crx": "^5.0.0", - "css-loader": "^1.0.1", - "error-stack-parser": "^2.0.2", - "es6-symbol": "3.0.2", - "escape-string-regexp": "^1.0.5", - "eslint": "^4.19.1", - "eslint-config-prettier": "^2.9.0", - "eslint-config-react-app": "^2.1.0", - "eslint-config-standard": "^11.0.0", - "eslint-config-standard-react": "^6.0.0", - "eslint-plugin-flowtype": "^2.47.1", - "eslint-plugin-import": "^2.11.0", - "eslint-plugin-jsx-a11y": "^5", - "eslint-plugin-node": "^6.0.1", - "eslint-plugin-prettier": "^2.6.0", - "eslint-plugin-promise": "^3.7.0", - "eslint-plugin-react": "^7.7.0", - "eslint-plugin-react-hooks": "^1.6.0", - "eslint-plugin-standard": "^3.0.1", - "events": "^3.0.0", - "fbjs": "0.5.1", - "fbjs-scripts": "0.7.0", - "firefox-profile": "^1.0.2", - "flow-bin": "^0.103.0", - "fs-extra": "^3.0.1", - "gh-pages": "^1.0.0", - "immutable": "3.7.6", - "jest": "^24.7.1", - "lerna": "^2.8.0", - "lint-staged": "^7.0.5", - "local-storage-fallback": "^4.1.1", - "lodash.throttle": "^4.1.1", - "log-update": "^2.0.0", - "lru-cache": "^4.1.3", - "memoize-one": "^3.1.1", - "node-libs-browser": "0.5.3", - "nullthrows": "^1.0.0", - "object-assign": "4.0.1", - "opener": "^1.5.1", - "prettier": "^1.16.4", - "prop-types": "^15.6.2", - "raw-loader": "^3.1.0", - "react": "^0.0.0-424099da6", - "react-15": "npm:react@^15", - "react-color": "^2.11.7", - "react-dom": "^0.0.0-424099da6", - "react-dom-15": "npm:react-dom@^15", - "react-is": "0.0.0-424099da6", - "react-native-web": "^0.11.5", - "react-test-renderer": "^0.0.0-424099da6", - "react-virtualized-auto-sizer": "^1.0.2", - "request-promise": "^4.2.4", - "rimraf": "^2.6.3", - "scheduler": "^0.0.0-424099da6", - "semver": "^5.5.1", - "serve-static": "^1.14.1", - "style-loader": "^0.23.1", - "web-ext": "^3.0.0", - "webpack": "^4.26.0", - "webpack-cli": "^3.1.2", - "webpack-dev-server": "^3.3.1", - "yargs": "^13.2.4" - } + + "name": "react-devtools-extensions", + "version": "0.0.0", + "private": true } diff --git a/packages/react-devtools-extensions/shells/browser/shared/build.js b/packages/react-devtools-extensions/shared/build.js similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/build.js rename to packages/react-devtools-extensions/shared/build.js diff --git a/packages/react-devtools-extensions/shells/browser/shared/deploy.chrome.html b/packages/react-devtools-extensions/shared/deploy.chrome.html similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/deploy.chrome.html rename to packages/react-devtools-extensions/shared/deploy.chrome.html diff --git a/packages/react-devtools-extensions/shells/browser/shared/deploy.firefox.html b/packages/react-devtools-extensions/shared/deploy.firefox.html similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/deploy.firefox.html rename to packages/react-devtools-extensions/shared/deploy.firefox.html diff --git a/packages/react-devtools-extensions/shells/browser/shared/deploy.html b/packages/react-devtools-extensions/shared/deploy.html similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/deploy.html rename to packages/react-devtools-extensions/shared/deploy.html diff --git a/packages/react-devtools-extensions/shells/browser/shared/deploy.js b/packages/react-devtools-extensions/shared/deploy.js similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/deploy.js rename to packages/react-devtools-extensions/shared/deploy.js diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/128-deadcode.png b/packages/react-devtools-extensions/shared/icons/128-deadcode.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/128-deadcode.png rename to packages/react-devtools-extensions/shared/icons/128-deadcode.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/128-development.png b/packages/react-devtools-extensions/shared/icons/128-development.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/128-development.png rename to packages/react-devtools-extensions/shared/icons/128-development.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/128-disabled.png b/packages/react-devtools-extensions/shared/icons/128-disabled.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/128-disabled.png rename to packages/react-devtools-extensions/shared/icons/128-disabled.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/128-outdated.png b/packages/react-devtools-extensions/shared/icons/128-outdated.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/128-outdated.png rename to packages/react-devtools-extensions/shared/icons/128-outdated.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/128-production.png b/packages/react-devtools-extensions/shared/icons/128-production.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/128-production.png rename to packages/react-devtools-extensions/shared/icons/128-production.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/128-unminified.png b/packages/react-devtools-extensions/shared/icons/128-unminified.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/128-unminified.png rename to packages/react-devtools-extensions/shared/icons/128-unminified.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/16-deadcode.png b/packages/react-devtools-extensions/shared/icons/16-deadcode.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/16-deadcode.png rename to packages/react-devtools-extensions/shared/icons/16-deadcode.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/16-development.png b/packages/react-devtools-extensions/shared/icons/16-development.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/16-development.png rename to packages/react-devtools-extensions/shared/icons/16-development.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/16-disabled.png b/packages/react-devtools-extensions/shared/icons/16-disabled.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/16-disabled.png rename to packages/react-devtools-extensions/shared/icons/16-disabled.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/16-outdated.png b/packages/react-devtools-extensions/shared/icons/16-outdated.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/16-outdated.png rename to packages/react-devtools-extensions/shared/icons/16-outdated.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/16-production.png b/packages/react-devtools-extensions/shared/icons/16-production.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/16-production.png rename to packages/react-devtools-extensions/shared/icons/16-production.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/16-unminified.png b/packages/react-devtools-extensions/shared/icons/16-unminified.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/16-unminified.png rename to packages/react-devtools-extensions/shared/icons/16-unminified.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/32-deadcode.png b/packages/react-devtools-extensions/shared/icons/32-deadcode.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/32-deadcode.png rename to packages/react-devtools-extensions/shared/icons/32-deadcode.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/32-development.png b/packages/react-devtools-extensions/shared/icons/32-development.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/32-development.png rename to packages/react-devtools-extensions/shared/icons/32-development.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/32-disabled.png b/packages/react-devtools-extensions/shared/icons/32-disabled.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/32-disabled.png rename to packages/react-devtools-extensions/shared/icons/32-disabled.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/32-outdated.png b/packages/react-devtools-extensions/shared/icons/32-outdated.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/32-outdated.png rename to packages/react-devtools-extensions/shared/icons/32-outdated.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/32-production.png b/packages/react-devtools-extensions/shared/icons/32-production.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/32-production.png rename to packages/react-devtools-extensions/shared/icons/32-production.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/32-unminified.png b/packages/react-devtools-extensions/shared/icons/32-unminified.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/32-unminified.png rename to packages/react-devtools-extensions/shared/icons/32-unminified.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/48-deadcode.png b/packages/react-devtools-extensions/shared/icons/48-deadcode.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/48-deadcode.png rename to packages/react-devtools-extensions/shared/icons/48-deadcode.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/48-development.png b/packages/react-devtools-extensions/shared/icons/48-development.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/48-development.png rename to packages/react-devtools-extensions/shared/icons/48-development.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/48-disabled.png b/packages/react-devtools-extensions/shared/icons/48-disabled.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/48-disabled.png rename to packages/react-devtools-extensions/shared/icons/48-disabled.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/48-outdated.png b/packages/react-devtools-extensions/shared/icons/48-outdated.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/48-outdated.png rename to packages/react-devtools-extensions/shared/icons/48-outdated.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/48-production.png b/packages/react-devtools-extensions/shared/icons/48-production.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/48-production.png rename to packages/react-devtools-extensions/shared/icons/48-production.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/48-unminified.png b/packages/react-devtools-extensions/shared/icons/48-unminified.png similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/48-unminified.png rename to packages/react-devtools-extensions/shared/icons/48-unminified.png diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/deadcode.svg b/packages/react-devtools-extensions/shared/icons/deadcode.svg similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/deadcode.svg rename to packages/react-devtools-extensions/shared/icons/deadcode.svg diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/development.svg b/packages/react-devtools-extensions/shared/icons/development.svg similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/development.svg rename to packages/react-devtools-extensions/shared/icons/development.svg diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/disabled.svg b/packages/react-devtools-extensions/shared/icons/disabled.svg similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/disabled.svg rename to packages/react-devtools-extensions/shared/icons/disabled.svg diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/outdated.svg b/packages/react-devtools-extensions/shared/icons/outdated.svg similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/outdated.svg rename to packages/react-devtools-extensions/shared/icons/outdated.svg diff --git a/packages/react-devtools-extensions/shells/browser/shared/icons/production.svg b/packages/react-devtools-extensions/shared/icons/production.svg similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/icons/production.svg rename to packages/react-devtools-extensions/shared/icons/production.svg diff --git a/packages/react-devtools-extensions/shells/browser/shared/main.html b/packages/react-devtools-extensions/shared/main.html similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/main.html rename to packages/react-devtools-extensions/shared/main.html diff --git a/packages/react-devtools-extensions/shells/browser/shared/panel.html b/packages/react-devtools-extensions/shared/panel.html similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/panel.html rename to packages/react-devtools-extensions/shared/panel.html diff --git a/packages/react-devtools-extensions/shells/browser/shared/popups/deadcode.html b/packages/react-devtools-extensions/shared/popups/deadcode.html similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/popups/deadcode.html rename to packages/react-devtools-extensions/shared/popups/deadcode.html diff --git a/packages/react-devtools-extensions/shells/browser/shared/popups/development.html b/packages/react-devtools-extensions/shared/popups/development.html similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/popups/development.html rename to packages/react-devtools-extensions/shared/popups/development.html diff --git a/packages/react-devtools-extensions/shells/browser/shared/popups/disabled.html b/packages/react-devtools-extensions/shared/popups/disabled.html similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/popups/disabled.html rename to packages/react-devtools-extensions/shared/popups/disabled.html diff --git a/packages/react-devtools-extensions/shells/browser/shared/popups/outdated.html b/packages/react-devtools-extensions/shared/popups/outdated.html similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/popups/outdated.html rename to packages/react-devtools-extensions/shared/popups/outdated.html diff --git a/packages/react-devtools-extensions/shells/browser/shared/popups/production.html b/packages/react-devtools-extensions/shared/popups/production.html similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/popups/production.html rename to packages/react-devtools-extensions/shared/popups/production.html diff --git a/packages/react-devtools-extensions/shells/browser/shared/popups/shared.js b/packages/react-devtools-extensions/shared/popups/shared.js similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/popups/shared.js rename to packages/react-devtools-extensions/shared/popups/shared.js diff --git a/packages/react-devtools-extensions/shells/browser/shared/popups/unminified.html b/packages/react-devtools-extensions/shared/popups/unminified.html similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/popups/unminified.html rename to packages/react-devtools-extensions/shared/popups/unminified.html diff --git a/packages/react-devtools-extensions/shells/browser/shared/src/backend.js b/packages/react-devtools-extensions/shared/src/backend.js similarity index 85% rename from packages/react-devtools-extensions/shells/browser/shared/src/backend.js rename to packages/react-devtools-extensions/shared/src/backend.js index c8cee150d8cb6..a8260bb8e91ab 100644 --- a/packages/react-devtools-extensions/shells/browser/shared/src/backend.js +++ b/packages/react-devtools-extensions/shared/src/backend.js @@ -20,10 +20,10 @@ function welcome(event) { window.addEventListener('message', welcome); function setup(hook) { - const Agent = require('src/backend/agent').default; - const Bridge = require('src/bridge').default; - const { initBackend } = require('src/backend'); - const setupNativeStyleEditor = require('src/backend/NativeStyleEditor/setupNativeStyleEditor') + const Agent = require('react-devtools-shared/src/backend/agent').default; + const Bridge = require('react-devtools-shared/src/bridge').default; + const { initBackend } = require('react-devtools-shared/src/backend'); + const setupNativeStyleEditor = require('react-devtools-shared/src/backend/NativeStyleEditor/setupNativeStyleEditor') .default; const bridge = new Bridge({ diff --git a/packages/react-devtools-extensions/shells/browser/shared/src/background.js b/packages/react-devtools-extensions/shared/src/background.js similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/src/background.js rename to packages/react-devtools-extensions/shared/src/background.js diff --git a/packages/react-devtools-extensions/shells/browser/shared/src/contentScript.js b/packages/react-devtools-extensions/shared/src/contentScript.js similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/src/contentScript.js rename to packages/react-devtools-extensions/shared/src/contentScript.js diff --git a/packages/react-devtools-extensions/shells/browser/shared/src/inject.js b/packages/react-devtools-extensions/shared/src/inject.js similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/src/inject.js rename to packages/react-devtools-extensions/shared/src/inject.js diff --git a/packages/react-devtools-extensions/shells/browser/shared/src/injectGlobalHook.js b/packages/react-devtools-extensions/shared/src/injectGlobalHook.js similarity index 93% rename from packages/react-devtools-extensions/shells/browser/shared/src/injectGlobalHook.js rename to packages/react-devtools-extensions/shared/src/injectGlobalHook.js index 2bdc7c8a7f5b2..0b75fb77c00e5 100644 --- a/packages/react-devtools-extensions/shells/browser/shared/src/injectGlobalHook.js +++ b/packages/react-devtools-extensions/shared/src/injectGlobalHook.js @@ -1,9 +1,9 @@ /* global chrome */ import nullthrows from 'nullthrows'; -import { installHook } from 'src/hook'; -import { SESSION_STORAGE_RELOAD_AND_PROFILE_KEY } from 'src/constants'; -import { sessionStorageGetItem } from 'src/storage'; +import { installHook } from 'react-devtools-shared/src/hook'; +import { SESSION_STORAGE_RELOAD_AND_PROFILE_KEY } from 'react-devtools-shared/src/constants'; +import { sessionStorageGetItem } from 'react-devtools-shared/src/storage'; function injectCode(code) { const script = document.createElement('script'); diff --git a/packages/react-devtools-extensions/shells/browser/shared/src/main.js b/packages/react-devtools-extensions/shared/src/main.js similarity index 97% rename from packages/react-devtools-extensions/shells/browser/shared/src/main.js rename to packages/react-devtools-extensions/shared/src/main.js index f4942e5f01f80..027be3ce6b9bd 100644 --- a/packages/react-devtools-extensions/shells/browser/shared/src/main.js +++ b/packages/react-devtools-extensions/shared/src/main.js @@ -2,21 +2,21 @@ import { createElement } from 'react'; import { unstable_createRoot as createRoot, flushSync } from 'react-dom'; -import Bridge from 'src/bridge'; -import Store from 'src/devtools/store'; +import Bridge from 'react-devtools-shared/src/bridge'; +import Store from 'react-devtools-shared/src/devtools/store'; import inject from './inject'; import { createViewElementSource, getBrowserName, getBrowserTheme, } from './utils'; -import { getSavedComponentFilters, getAppendComponentStack } from 'src/utils'; +import { getSavedComponentFilters, getAppendComponentStack } from 'react-devtools-shared/src/utils'; import { localStorageGetItem, localStorageRemoveItem, localStorageSetItem, -} from 'src/storage'; -import DevTools from 'src/devtools/views/DevTools'; +} from 'react-devtools-shared/src/storage'; +import DevTools from 'react-devtools-shared/src/devtools/views/DevTools'; const LOCAL_STORAGE_SUPPORTS_PROFILING_KEY = 'React::DevTools::supportsProfiling'; diff --git a/packages/react-devtools-extensions/shells/browser/shared/src/panel.js b/packages/react-devtools-extensions/shared/src/panel.js similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/src/panel.js rename to packages/react-devtools-extensions/shared/src/panel.js diff --git a/packages/react-devtools-extensions/shells/browser/shared/src/renderer.js b/packages/react-devtools-extensions/shared/src/renderer.js similarity index 93% rename from packages/react-devtools-extensions/shells/browser/shared/src/renderer.js rename to packages/react-devtools-extensions/shared/src/renderer.js index 0a0e74808efd0..e9165c40e6696 100644 --- a/packages/react-devtools-extensions/shells/browser/shared/src/renderer.js +++ b/packages/react-devtools-extensions/shared/src/renderer.js @@ -8,7 +8,7 @@ * @flow */ -import { attach } from 'src/backend/renderer'; +import { attach } from 'react-devtools-shared/src/backend/renderer'; Object.defineProperty( window, diff --git a/packages/react-devtools-extensions/shells/browser/shared/src/utils.js b/packages/react-devtools-extensions/shared/src/utils.js similarity index 100% rename from packages/react-devtools-extensions/shells/browser/shared/src/utils.js rename to packages/react-devtools-extensions/shared/src/utils.js diff --git a/packages/react-devtools-extensions/shells/browser/shared/webpack.backend.js b/packages/react-devtools-extensions/shared/webpack.backend.js similarity index 94% rename from packages/react-devtools-extensions/shells/browser/shared/webpack.backend.js rename to packages/react-devtools-extensions/shared/webpack.backend.js index cf034bccef31c..31bd9a3449111 100644 --- a/packages/react-devtools-extensions/shells/browser/shared/webpack.backend.js +++ b/packages/react-devtools-extensions/shared/webpack.backend.js @@ -1,6 +1,6 @@ const { resolve } = require('path'); const { DefinePlugin } = require('webpack'); -const { getGitHubURL, getVersionString } = require('../../utils'); +const { getGitHubURL, getVersionString } = require('../utils'); const NODE_ENV = process.env.NODE_ENV; if (!NODE_ENV) { diff --git a/packages/react-devtools-extensions/shells/browser/shared/webpack.config.js b/packages/react-devtools-extensions/shared/webpack.config.js similarity index 87% rename from packages/react-devtools-extensions/shells/browser/shared/webpack.config.js rename to packages/react-devtools-extensions/shared/webpack.config.js index 23342ca46c446..06cd0eceed68e 100644 --- a/packages/react-devtools-extensions/shells/browser/shared/webpack.config.js +++ b/packages/react-devtools-extensions/shared/webpack.config.js @@ -1,6 +1,6 @@ const { resolve } = require('path'); const { DefinePlugin } = require('webpack'); -const { getGitHubURL, getVersionString } = require('../../utils'); +const { getGitHubURL, getVersionString } = require('../utils'); const NODE_ENV = process.env.NODE_ENV; if (!NODE_ENV) { @@ -28,11 +28,6 @@ module.exports = { path: __dirname + '/build', filename: '[name].js', }, - resolve: { - alias: { - src: resolve(__dirname, '../../../src'), - }, - }, plugins: [ new DefinePlugin({ __DEV__: false, @@ -48,7 +43,7 @@ module.exports = { test: /\.js$/, loader: 'babel-loader', options: { - configFile: resolve(__dirname, '../../../babel.config.js'), + configFile: resolve(__dirname, '../babel.config.js'), }, }, { diff --git a/packages/react-devtools-extensions/shells/utils.js b/packages/react-devtools-extensions/utils.js similarity index 100% rename from packages/react-devtools-extensions/shells/utils.js rename to packages/react-devtools-extensions/utils.js diff --git a/packages/react-devtools-inline/src/backend.js b/packages/react-devtools-inline/src/backend.js index 4b437458f512c..7ff6d02f2bb28 100644 --- a/packages/react-devtools-inline/src/backend.js +++ b/packages/react-devtools-inline/src/backend.js @@ -1,10 +1,10 @@ /** @flow */ -import Agent from 'src/backend/agent'; -import Bridge from 'src/bridge'; -import { initBackend } from 'src/backend'; -import { installHook } from 'src/hook'; -import setupNativeStyleEditor from 'src/backend/NativeStyleEditor/setupNativeStyleEditor'; +import Agent from 'react-devtools-shared/src/backend/agent'; +import Bridge from 'react-devtools-shared/src/bridge'; +import { initBackend } from 'react-devtools-shared/src/backend'; +import { installHook } from 'react-devtools-shared/src/hook'; +import setupNativeStyleEditor from 'react-devtools-shared/src/backend/NativeStyleEditor/setupNativeStyleEditor'; import { MESSAGE_TYPE_GET_SAVED_PREFERENCES, MESSAGE_TYPE_SAVED_PREFERENCES, diff --git a/packages/react-devtools-inline/src/frontend.js b/packages/react-devtools-inline/src/frontend.js index b64363014a198..a1f8da206d64c 100644 --- a/packages/react-devtools-inline/src/frontend.js +++ b/packages/react-devtools-inline/src/frontend.js @@ -1,21 +1,21 @@ /** @flow */ import React, { forwardRef } from 'react'; -import Bridge from 'src/bridge'; -import Store from 'src/devtools/store'; -import DevTools from 'src/devtools/views/DevTools'; -import { getSavedComponentFilters, getAppendComponentStack } from 'src/utils'; +import Bridge from 'react-devtools-shared/src/bridge'; +import Store from 'react-devtools-shared/src/devtools/store'; +import DevTools from 'react-devtools-shared/src/devtools/views/DevTools'; +import { getSavedComponentFilters, getAppendComponentStack } from 'react-devtools-shared/src/utils'; import { MESSAGE_TYPE_GET_SAVED_PREFERENCES, MESSAGE_TYPE_SAVED_PREFERENCES, } from './constants'; -import type { FrontendBridge } from 'src/bridge'; -import type { Props } from 'src/devtools/views/DevTools'; +import type { FrontendBridge } from 'react-devtools-shared/src/bridge'; +import type { Props } from 'react-devtools-shared/src/devtools/views/DevTools'; export function initialize( contentWindow: window -): React$AbstractComponent { +): React.AbstractComponent { const onMessage = ({ data, source }) => { if (source === 'react-devtools-content-script') { // Ignore messages from the DevTools browser extension. diff --git a/packages/react-devtools-shared/package.json b/packages/react-devtools-shared/package.json new file mode 100644 index 0000000000000..2ba9cf60125b4 --- /dev/null +++ b/packages/react-devtools-shared/package.json @@ -0,0 +1,13 @@ +{ + "private": true, + "name": "react-devtools-shared", + "version": "0.0.0", + "dependencies": { + "@reach/menu-button": "^0.1.17", + "@reach/tooltip": "^0.2.2", + "clipboard-js": "^0.3.6", + "lodash.throttle": "^4.1.1", + "memoize-one": "^3.1.1", + "react-virtualized-auto-sizer": "^1.0.2" + } +} diff --git a/packages/react-devtools-shared/src/__tests__/bridge-test.js b/packages/react-devtools-shared/src/__tests__/bridge-test.js index fe89a6c2b10f9..3bf6055c4b121 100644 --- a/packages/react-devtools-shared/src/__tests__/bridge-test.js +++ b/packages/react-devtools-shared/src/__tests__/bridge-test.js @@ -4,7 +4,7 @@ describe('Bridge', () => { let Bridge; beforeEach(() => { - Bridge = require('src/bridge').default; + Bridge = require('react-devtools-shared/src/bridge').default; }); it('should shutdown properly', () => { diff --git a/packages/react-devtools-shared/src/__tests__/inspectedElementContext-test.js b/packages/react-devtools-shared/src/__tests__/inspectedElementContext-test.js index 2cf1ed8632975..78696aa16d8b0 100644 --- a/packages/react-devtools-shared/src/__tests__/inspectedElementContext-test.js +++ b/packages/react-devtools-shared/src/__tests__/inspectedElementContext-test.js @@ -1,9 +1,9 @@ // @flow import typeof ReactTestRenderer from 'react-test-renderer'; -import type { GetInspectedElementPath } from 'src/devtools/views/Components/InspectedElementContext'; -import type { FrontendBridge } from 'src/bridge'; -import type Store from 'src/devtools/store'; +import type { GetInspectedElementPath } from 'react-devtools-shared/src/devtools/views/Components/InspectedElementContext'; +import type { FrontendBridge } from 'react-devtools-shared/src/bridge'; +import type Store from 'react-devtools-shared/src/devtools/store'; describe('InspectedElementContext', () => { let React; @@ -25,7 +25,7 @@ describe('InspectedElementContext', () => { utils = require('./utils'); utils.beforeEachProfiling(); - meta = require('src/hydration').meta; + meta = require('react-devtools-shared/src/hydration').meta; bridge = global.bridge; store = global.store; @@ -36,13 +36,13 @@ describe('InspectedElementContext', () => { TestUtils = require('react-dom/test-utils'); TestRenderer = utils.requireTestRenderer(); - BridgeContext = require('src/devtools/views/context').BridgeContext; - InspectedElementContext = require('src/devtools/views/Components/InspectedElementContext') + BridgeContext = require('react-devtools-shared/src/devtools/views/context').BridgeContext; + InspectedElementContext = require('react-devtools-shared/src/devtools/views/Components/InspectedElementContext') .InspectedElementContext; - InspectedElementContextController = require('src/devtools/views/Components/InspectedElementContext') + InspectedElementContextController = require('react-devtools-shared/src/devtools/views/Components/InspectedElementContext') .InspectedElementContextController; - StoreContext = require('src/devtools/views/context').StoreContext; - TreeContextController = require('src/devtools/views/Components/TreeContext') + StoreContext = require('react-devtools-shared/src/devtools/views/context').StoreContext; + TreeContextController = require('react-devtools-shared/src/devtools/views/Components/TreeContext') .TreeContextController; }); diff --git a/packages/react-devtools-shared/src/__tests__/legacy/inspectElement-test.js b/packages/react-devtools-shared/src/__tests__/legacy/inspectElement-test.js index 7b8c2b04a9f52..fe1e7fa89f58e 100644 --- a/packages/react-devtools-shared/src/__tests__/legacy/inspectElement-test.js +++ b/packages/react-devtools-shared/src/__tests__/legacy/inspectElement-test.js @@ -1,9 +1,9 @@ // @flow -import type { InspectedElementPayload } from 'src/backend/types'; -import type { DehydratedData } from 'src/devtools/views/Components/types'; -import type { FrontendBridge } from 'src/bridge'; -import type Store from 'src/devtools/store'; +import type { InspectedElementPayload } from 'react-devtools-shared/src/backend/types'; +import type { DehydratedData } from 'react-devtools-shared/src/devtools/views/Components/types'; +import type { FrontendBridge } from 'react-devtools-shared/src/bridge'; +import type Store from 'react-devtools-shared/src/devtools/store'; describe('InspectedElementContext', () => { let React; @@ -59,8 +59,8 @@ describe('InspectedElementContext', () => { bridge = global.bridge; store = global.store; - hydrate = require('src/hydration').hydrate; - meta = require('src/hydration').meta; + hydrate = require('react-devtools-shared/src/hydration').hydrate; + meta = require('react-devtools-shared/src/hydration').meta; // Redirect all React/ReactDOM requires to the v15 UMD. // We use the UMD because Jest doesn't enable us to mock deep imports (e.g. "react/lib/Something"). diff --git a/packages/react-devtools-shared/src/__tests__/ownersListContext-test.js b/packages/react-devtools-shared/src/__tests__/ownersListContext-test.js index 97681b70bdde5..a596eb91bfcd0 100644 --- a/packages/react-devtools-shared/src/__tests__/ownersListContext-test.js +++ b/packages/react-devtools-shared/src/__tests__/ownersListContext-test.js @@ -1,9 +1,9 @@ // @flow import typeof ReactTestRenderer from 'react-test-renderer'; -import type { Element } from 'src/devtools/views/Components/types'; -import type { FrontendBridge } from 'src/bridge'; -import type Store from 'src/devtools/store'; +import type { Element } from 'react-devtools-shared/src/devtools/views/Components/types'; +import type { FrontendBridge } from 'react-devtools-shared/src/bridge'; +import type Store from 'react-devtools-shared/src/devtools/store'; describe('OwnersListContext', () => { let React; @@ -31,13 +31,13 @@ describe('OwnersListContext', () => { ReactDOM = require('react-dom'); TestRenderer = utils.requireTestRenderer(); - BridgeContext = require('src/devtools/views/context').BridgeContext; - OwnersListContext = require('src/devtools/views/Components/OwnersListContext') + BridgeContext = require('react-devtools-shared/src/devtools/views/context').BridgeContext; + OwnersListContext = require('react-devtools-shared/src/devtools/views/Components/OwnersListContext') .OwnersListContext; - OwnersListContextController = require('src/devtools/views/Components/OwnersListContext') + OwnersListContextController = require('react-devtools-shared/src/devtools/views/Components/OwnersListContext') .OwnersListContextController; - StoreContext = require('src/devtools/views/context').StoreContext; - TreeContextController = require('src/devtools/views/Components/TreeContext') + StoreContext = require('react-devtools-shared/src/devtools/views/context').StoreContext; + TreeContextController = require('react-devtools-shared/src/devtools/views/Components/TreeContext') .TreeContextController; }); diff --git a/packages/react-devtools-shared/src/__tests__/profilerContext-test.js b/packages/react-devtools-shared/src/__tests__/profilerContext-test.js index c06f70d0390d2..35695f7e36a42 100644 --- a/packages/react-devtools-shared/src/__tests__/profilerContext-test.js +++ b/packages/react-devtools-shared/src/__tests__/profilerContext-test.js @@ -1,10 +1,10 @@ // @flow import typeof ReactTestRenderer from 'react-test-renderer'; -import type { FrontendBridge } from 'src/bridge'; -import type { Context } from 'src/devtools/views/Profiler/ProfilerContext'; -import type { DispatcherContext } from 'src/devtools/views/Components/TreeContext'; -import type Store from 'src/devtools/store'; +import type { FrontendBridge } from 'react-devtools-shared/src/bridge'; +import type { Context } from 'react-devtools-shared/src/devtools/views/Profiler/ProfilerContext'; +import type { DispatcherContext } from 'react-devtools-shared/src/devtools/views/Components/TreeContext'; +import type Store from 'react-devtools-shared/src/devtools/store'; describe('ProfilerContext', () => { let React; @@ -35,17 +35,17 @@ describe('ProfilerContext', () => { ReactDOM = require('react-dom'); TestRenderer = utils.requireTestRenderer(); - BridgeContext = require('src/devtools/views/context').BridgeContext; - ProfilerContext = require('src/devtools/views/Profiler/ProfilerContext') + BridgeContext = require('react-devtools-shared/src/devtools/views/context').BridgeContext; + ProfilerContext = require('react-devtools-shared/src/devtools/views/Profiler/ProfilerContext') .ProfilerContext; - ProfilerContextController = require('src/devtools/views/Profiler/ProfilerContext') + ProfilerContextController = require('react-devtools-shared/src/devtools/views/Profiler/ProfilerContext') .ProfilerContextController; - StoreContext = require('src/devtools/views/context').StoreContext; - TreeContextController = require('src/devtools/views/Components/TreeContext') + StoreContext = require('react-devtools-shared/src/devtools/views/context').StoreContext; + TreeContextController = require('react-devtools-shared/src/devtools/views/Components/TreeContext') .TreeContextController; - TreeDispatcherContext = require('src/devtools/views/Components/TreeContext') + TreeDispatcherContext = require('react-devtools-shared/src/devtools/views/Components/TreeContext') .TreeDispatcherContext; - TreeStateContext = require('src/devtools/views/Components/TreeContext') + TreeStateContext = require('react-devtools-shared/src/devtools/views/Components/TreeContext') .TreeStateContext; }); diff --git a/packages/react-devtools-shared/src/__tests__/profilerStore-test.js b/packages/react-devtools-shared/src/__tests__/profilerStore-test.js index 0f4074f165b66..5f8e7c64c5d74 100644 --- a/packages/react-devtools-shared/src/__tests__/profilerStore-test.js +++ b/packages/react-devtools-shared/src/__tests__/profilerStore-test.js @@ -1,6 +1,6 @@ // @flow -import type Store from 'src/devtools/store'; +import type Store from 'react-devtools-shared/src/devtools/store'; describe('ProfilerStore', () => { let React; diff --git a/packages/react-devtools-shared/src/__tests__/profilingCache-test.js b/packages/react-devtools-shared/src/__tests__/profilingCache-test.js index 6f6e4742cda4f..dca9fc64621d6 100644 --- a/packages/react-devtools-shared/src/__tests__/profilingCache-test.js +++ b/packages/react-devtools-shared/src/__tests__/profilingCache-test.js @@ -1,8 +1,8 @@ // @flow import typeof ReactTestRenderer from 'react-test-renderer'; -import type { FrontendBridge } from 'src/bridge'; -import type Store from 'src/devtools/store'; +import type { FrontendBridge } from 'react-devtools-shared/src/bridge'; +import type Store from 'react-devtools-shared/src/devtools/store'; describe('ProfilingCache', () => { let PropTypes; diff --git a/packages/react-devtools-shared/src/__tests__/profilingCharts-test.js b/packages/react-devtools-shared/src/__tests__/profilingCharts-test.js index 0e7fff951e940..acf6bc90137b0 100644 --- a/packages/react-devtools-shared/src/__tests__/profilingCharts-test.js +++ b/packages/react-devtools-shared/src/__tests__/profilingCharts-test.js @@ -1,7 +1,7 @@ // @flow import typeof TestRendererType from 'react-test-renderer'; -import type Store from 'src/devtools/store'; +import type Store from 'react-devtools-shared/src/devtools/store'; describe('profiling charts', () => { let React; diff --git a/packages/react-devtools-shared/src/__tests__/profilingCommitTreeBuilder-test.js b/packages/react-devtools-shared/src/__tests__/profilingCommitTreeBuilder-test.js index 0ef670607f967..79084dfef295a 100644 --- a/packages/react-devtools-shared/src/__tests__/profilingCommitTreeBuilder-test.js +++ b/packages/react-devtools-shared/src/__tests__/profilingCommitTreeBuilder-test.js @@ -1,7 +1,7 @@ // @flow import typeof TestRendererType from 'react-test-renderer'; -import type Store from 'src/devtools/store'; +import type Store from 'react-devtools-shared/src/devtools/store'; describe('commit tree', () => { let React; diff --git a/packages/react-devtools-shared/src/__tests__/profilingUtils-test.js b/packages/react-devtools-shared/src/__tests__/profilingUtils-test.js index 66029a2568707..81d76f65bc6d5 100644 --- a/packages/react-devtools-shared/src/__tests__/profilingUtils-test.js +++ b/packages/react-devtools-shared/src/__tests__/profilingUtils-test.js @@ -4,7 +4,7 @@ describe('profiling utils', () => { let utils; beforeEach(() => { - utils = require('src/devtools/views/Profiler/utils'); + utils = require('react-devtools-shared/src/devtools/views/Profiler/utils'); }); it('should throw if importing older/unsupported data', () => { diff --git a/packages/react-devtools-shared/src/__tests__/setupTests.js b/packages/react-devtools-shared/src/__tests__/setupTests.js index 3fb0a57a2f279..df9eb4ae0ca5a 100644 --- a/packages/react-devtools-shared/src/__tests__/setupTests.js +++ b/packages/react-devtools-shared/src/__tests__/setupTests.js @@ -1,6 +1,6 @@ // @flow -import type { BackendBridge, FrontendBridge } from 'src/bridge'; +import type { BackendBridge, FrontendBridge } from 'react-devtools-shared/src/bridge'; const env = jasmine.getEnv(); env.beforeEach(() => { @@ -8,15 +8,15 @@ env.beforeEach(() => { // rather than imported at the head of the module. // That's because we reset modules between tests, // which disconnects the DevTool's cache from the current dispatcher ref. - const Agent = require('src/backend/agent').default; - const { initBackend } = require('src/backend'); - const Bridge = require('src/bridge').default; - const Store = require('src/devtools/store').default; - const { installHook } = require('src/hook'); + const Agent = require('react-devtools-shared/src/backend/agent').default; + const { initBackend } = require('react-devtools-shared/src/backend'); + const Bridge = require('react-devtools-shared/src/bridge').default; + const Store = require('react-devtools-shared/src/devtools/store').default; + const { installHook } = require('react-devtools-shared/src/hook'); const { getDefaultComponentFilters, saveComponentFilters, - } = require('src/utils'); + } = require('react-devtools-shared/src/utils'); // Fake timers let us flush Bridge operations between setup and assertions. jest.useFakeTimers(); diff --git a/packages/react-devtools-shared/src/__tests__/storeComponentFilters-test.js b/packages/react-devtools-shared/src/__tests__/storeComponentFilters-test.js index 5e2385b33b96b..11f54ad30137f 100644 --- a/packages/react-devtools-shared/src/__tests__/storeComponentFilters-test.js +++ b/packages/react-devtools-shared/src/__tests__/storeComponentFilters-test.js @@ -1,7 +1,7 @@ // @flow -import type { FrontendBridge } from 'src/bridge'; -import type Store from 'src/devtools/store'; +import type { FrontendBridge } from 'react-devtools-shared/src/bridge'; +import type Store from 'react-devtools-shared/src/devtools/store'; describe('Store component filters', () => { let React; @@ -29,7 +29,7 @@ describe('Store component filters', () => { React = require('react'); ReactDOM = require('react-dom'); TestUtils = require('react-dom/test-utils'); - Types = require('src/types'); + Types = require('react-devtools-shared/src/types'); utils = require('./utils'); }); diff --git a/packages/react-devtools-shared/src/__tests__/storeSerializer.js b/packages/react-devtools-shared/src/__tests__/storeSerializer.js index fd2d4e36f8ab3..1dde4bc7a0809 100644 --- a/packages/react-devtools-shared/src/__tests__/storeSerializer.js +++ b/packages/react-devtools-shared/src/__tests__/storeSerializer.js @@ -3,7 +3,7 @@ export function test(maybeStore) { // It's important to lazy-require the Store rather than imported at the head of the module. // Because we reset modules between tests, different Store implementations will be used for each test. // Unfortunately Jest does not reset its own serializer modules. - return maybeStore instanceof require('src/devtools/store').default; + return maybeStore instanceof require('react-devtools-shared/src/devtools/store').default; } // print() is part of Jest's serializer API diff --git a/packages/react-devtools-shared/src/__tests__/treeContext-test.js b/packages/react-devtools-shared/src/__tests__/treeContext-test.js index 68d3ea422b496..e007dcf97cb36 100644 --- a/packages/react-devtools-shared/src/__tests__/treeContext-test.js +++ b/packages/react-devtools-shared/src/__tests__/treeContext-test.js @@ -1,12 +1,12 @@ // @flow import typeof ReactTestRenderer from 'react-test-renderer'; -import type { FrontendBridge } from 'src/bridge'; -import type Store from 'src/devtools/store'; +import type { FrontendBridge } from 'react-devtools-shared/src/bridge'; +import type Store from 'react-devtools-shared/src/devtools/store'; import type { DispatcherContext, StateContext, -} from 'src/devtools/views/Components/TreeContext'; +} from 'react-devtools-shared/src/devtools/views/Components/TreeContext'; describe('TreeListContext', () => { let React; @@ -35,9 +35,9 @@ describe('TreeListContext', () => { ReactDOM = require('react-dom'); TestRenderer = utils.requireTestRenderer(); - BridgeContext = require('src/devtools/views/context').BridgeContext; - StoreContext = require('src/devtools/views/context').StoreContext; - TreeContext = require('src/devtools/views/Components/TreeContext'); + BridgeContext = require('react-devtools-shared/src/devtools/views/context').BridgeContext; + StoreContext = require('react-devtools-shared/src/devtools/views/context').StoreContext; + TreeContext = require('react-devtools-shared/src/devtools/views/Components/TreeContext'); }); afterEach(() => { diff --git a/packages/react-devtools-shared/src/__tests__/utils.js b/packages/react-devtools-shared/src/__tests__/utils.js index bf0c816109fa0..a1e0274f0d676 100644 --- a/packages/react-devtools-shared/src/__tests__/utils.js +++ b/packages/react-devtools-shared/src/__tests__/utils.js @@ -2,10 +2,10 @@ import typeof ReactTestRenderer from 'react-test-renderer'; -import type { FrontendBridge } from 'src/bridge'; -import type Store from 'src/devtools/store'; -import type { ProfilingDataFrontend } from 'src/devtools/views/Profiler/types'; -import type { ElementType } from 'src/types'; +import type { FrontendBridge } from 'react-devtools-shared/src/bridge'; +import type Store from 'react-devtools-shared/src/devtools/store'; +import type { ProfilingDataFrontend } from 'react-devtools-shared/src/devtools/views/Profiler/types'; +import type { ElementType } from 'react-devtools-shared/src/types'; export function act(callback: Function): void { const { act: actTestRenderer } = require('react-test-renderer'); @@ -75,7 +75,7 @@ export function createDisplayNameFilter( source: string, isEnabled: boolean = true ) { - const Types = require('src/types'); + const Types = require('react-devtools-shared/src/types'); let isValid = true; try { new RegExp(source); @@ -91,7 +91,7 @@ export function createDisplayNameFilter( } export function createHOCFilter(isEnabled: boolean = true) { - const Types = require('src/types'); + const Types = require('react-devtools-shared/src/types'); return { type: Types.ComponentFilterHOC, isEnabled, @@ -103,7 +103,7 @@ export function createElementTypeFilter( elementType: ElementType, isEnabled: boolean = true ) { - const Types = require('src/types'); + const Types = require('react-devtools-shared/src/types'); return { type: Types.ComponentFilterElementType, isEnabled, @@ -115,7 +115,7 @@ export function createLocationFilter( source: string, isEnabled: boolean = true ) { - const Types = require('src/types'); + const Types = require('react-devtools-shared/src/types'); let isValid = true; try { new RegExp(source); @@ -166,7 +166,7 @@ export function exportImportHelper(bridge: FrontendBridge, store: Store): void { const { prepareProfilingDataExport, prepareProfilingDataFrontendFromExport, - } = require('src/devtools/views/Profiler/utils'); + } = require('react-devtools-shared/src/devtools/views/Profiler/utils'); const { profilerStore } = store; diff --git a/packages/react-devtools-shared/src/backend/NativeStyleEditor/setupNativeStyleEditor.js b/packages/react-devtools-shared/src/backend/NativeStyleEditor/setupNativeStyleEditor.js index 642dbb91eb87e..81b7f9d71cdea 100644 --- a/packages/react-devtools-shared/src/backend/NativeStyleEditor/setupNativeStyleEditor.js +++ b/packages/react-devtools-shared/src/backend/NativeStyleEditor/setupNativeStyleEditor.js @@ -1,9 +1,9 @@ // @flow -import Agent from 'src/backend/agent'; +import Agent from 'react-devtools-shared/src/backend/agent'; import resolveBoxStyle from './resolveBoxStyle'; -import type { BackendBridge } from 'src/bridge'; +import type { BackendBridge } from 'react-devtools-shared/src/bridge'; import type { RendererID } from '../types'; import type { StyleAndLayout } from './types'; diff --git a/packages/react-devtools-shared/src/backend/agent.js b/packages/react-devtools-shared/src/backend/agent.js index f246934a5d3d9..362518b8c7b5c 100644 --- a/packages/react-devtools-shared/src/backend/agent.js +++ b/packages/react-devtools-shared/src/backend/agent.js @@ -12,11 +12,11 @@ import { sessionStorageGetItem, sessionStorageRemoveItem, sessionStorageSetItem, -} from 'src/storage'; +} from 'react-devtools-shared/src/storage'; import setupHighlighter from './views/Highlighter'; import { patch as patchConsole, unpatch as unpatchConsole } from './console'; -import type { BackendBridge } from 'src/bridge'; +import type { BackendBridge } from 'react-devtools-shared/src/bridge'; import type { InstanceAndStyle, NativeType, diff --git a/packages/react-devtools-shared/src/backend/legacy/renderer.js b/packages/react-devtools-shared/src/backend/legacy/renderer.js index 51ca6a626ac97..18d3513b121ba 100644 --- a/packages/react-devtools-shared/src/backend/legacy/renderer.js +++ b/packages/react-devtools-shared/src/backend/legacy/renderer.js @@ -6,10 +6,10 @@ import { ElementTypeRoot, ElementTypeHostComponent, ElementTypeOtherOrUnknown, -} from 'src/types'; +} from 'react-devtools-shared/src/types'; import { getUID, utfEncodeString, printOperationsArray } from '../../utils'; import { cleanForBridge, copyWithSet } from '../utils'; -import { getDisplayName } from 'src/utils'; +import { getDisplayName } from 'react-devtools-shared/src/utils'; import { __DEBUG__, TREE_OPERATION_ADD, @@ -28,7 +28,7 @@ import type { PathMatch, RendererInterface, } from '../types'; -import type { ComponentFilter, ElementType } from 'src/types'; +import type { ComponentFilter, ElementType } from 'react-devtools-shared/src/types'; import type { Owner, InspectedElement } from '../types'; export type InternalInstance = Object; diff --git a/packages/react-devtools-shared/src/backend/renderer.js b/packages/react-devtools-shared/src/backend/renderer.js index 63aae20c87882..44f00a9f02ba4 100644 --- a/packages/react-devtools-shared/src/backend/renderer.js +++ b/packages/react-devtools-shared/src/backend/renderer.js @@ -16,7 +16,7 @@ import { ElementTypeProfiler, ElementTypeRoot, ElementTypeSuspense, -} from 'src/types'; +} from 'react-devtools-shared/src/types'; import { getDisplayName, getDefaultComponentFilters, @@ -24,8 +24,8 @@ import { getUID, setInObject, utfEncodeString, -} from 'src/utils'; -import { sessionStorageGetItem } from 'src/storage'; +} from 'react-devtools-shared/src/utils'; +import { sessionStorageGetItem } from 'react-devtools-shared/src/storage'; import { cleanForBridge, copyWithSet } from './utils'; import { __DEBUG__, @@ -58,8 +58,8 @@ import type { ReactRenderer, RendererInterface, } from './types'; -import type { Interaction } from 'src/devtools/views/Profiler/types'; -import type { ComponentFilter, ElementType } from 'src/types'; +import type { Interaction } from 'react-devtools-shared/src/devtools/views/Profiler/types'; +import type { ComponentFilter, ElementType } from 'react-devtools-shared/src/types'; type getDisplayNameForFiberType = (fiber: Fiber) => string | null; type getTypeSymbolType = (type: any) => Symbol | number; diff --git a/packages/react-devtools-shared/src/backend/types.js b/packages/react-devtools-shared/src/backend/types.js index 75cd1e11f5a64..498d1ef8fc159 100644 --- a/packages/react-devtools-shared/src/backend/types.js +++ b/packages/react-devtools-shared/src/backend/types.js @@ -1,8 +1,8 @@ // @flow -import type { ComponentFilter, ElementType } from 'src/types'; -import type { Interaction } from 'src/devtools/views/Profiler/types'; -import type { ResolveNativeStyle } from 'src/backend/NativeStyleEditor/setupNativeStyleEditor'; +import type { ComponentFilter, ElementType } from 'react-devtools-shared/src/types'; +import type { Interaction } from 'react-devtools-shared/src/devtools/views/Profiler/types'; +import type { ResolveNativeStyle } from 'react-devtools-shared/src/backend/NativeStyleEditor/setupNativeStyleEditor'; type BundleType = | 0 // PROD diff --git a/packages/react-devtools-shared/src/backend/utils.js b/packages/react-devtools-shared/src/backend/utils.js index 020d841d46ced..3028805d736e1 100644 --- a/packages/react-devtools-shared/src/backend/utils.js +++ b/packages/react-devtools-shared/src/backend/utils.js @@ -2,7 +2,7 @@ import { dehydrate } from '../hydration'; -import type { DehydratedData } from 'src/devtools/views/Components/types'; +import type { DehydratedData } from 'react-devtools-shared/src/devtools/views/Components/types'; export function cleanForBridge( data: Object | null, diff --git a/packages/react-devtools-shared/src/backend/views/Highlighter/index.js b/packages/react-devtools-shared/src/backend/views/Highlighter/index.js index c50ef74c56501..ca91a95858592 100644 --- a/packages/react-devtools-shared/src/backend/views/Highlighter/index.js +++ b/packages/react-devtools-shared/src/backend/views/Highlighter/index.js @@ -2,10 +2,10 @@ import memoize from 'memoize-one'; import throttle from 'lodash.throttle'; -import Agent from 'src/backend/agent'; +import Agent from 'react-devtools-shared/src/backend/agent'; import { hideOverlay, showOverlay } from './Highlighter'; -import type { BackendBridge } from 'src/bridge'; +import type { BackendBridge } from 'react-devtools-shared/src/bridge'; // This plug-in provides in-page highlighting of the selected element. // It is used by the browser extension nad the standalone DevTools shell (when connected to a browser). diff --git a/packages/react-devtools-shared/src/bridge.js b/packages/react-devtools-shared/src/bridge.js index cc110f8e5031a..a4ac0ecea7567 100644 --- a/packages/react-devtools-shared/src/bridge.js +++ b/packages/react-devtools-shared/src/bridge.js @@ -8,8 +8,8 @@ import type { OwnersList, ProfilingDataBackend, RendererID, -} from 'src/backend/types'; -import type { StyleAndLayout as StyleAndLayoutPayload } from 'src/backend/NativeStyleEditor/types'; +} from 'react-devtools-shared/src/backend/types'; +import type { StyleAndLayout as StyleAndLayoutPayload } from 'react-devtools-shared/src/backend/NativeStyleEditor/types'; const BATCH_DURATION = 100; @@ -205,8 +205,10 @@ class Bridge< } while (this._messageQueue.length); // Make sure once again that there is no dangling timer. - clearTimeout(this._timeoutID); - this._timeoutID = null; + if (this._timeoutID !== null) { + clearTimeout(this._timeoutID); + this._timeoutID = null; + } } _flush = () => { @@ -214,8 +216,10 @@ class Bridge< // so we do not bail out if the bridge marked as destroyed. // It is a private method that the bridge ensures is only called at the right times. - clearTimeout(this._timeoutID); - this._timeoutID = null; + if (this._timeoutID !== null) { + clearTimeout(this._timeoutID); + this._timeoutID = null; + } if (this._messageQueue.length) { for (let i = 0; i < this._messageQueue.length; i += 2) { diff --git a/packages/react-devtools-shared/src/constants.js b/packages/react-devtools-shared/src/constants.js index d27de3ed5bc40..4fa9fbbc95bcb 100644 --- a/packages/react-devtools-shared/src/constants.js +++ b/packages/react-devtools-shared/src/constants.js @@ -34,12 +34,10 @@ export const CHANGE_LOG_URL = // Sometimes the inline target is rendered before root styles are applied, // which would result in e.g. NaN itemSize being passed to react-window list. // -// We can't use the Webpack loader syntax in the context of Jest though, -// so tests need some reasonably meaningful fallback value. -let COMFORTABLE_LINE_HEIGHT = 15; -let COMPACT_LINE_HEIGHT = 10; +let COMFORTABLE_LINE_HEIGHT; +let COMPACT_LINE_HEIGHT; -if (!__TEST__) { +try { // $FlowFixMe const rawStyleString = require('!!raw-loader!src/devtools/views/root.css') // eslint-disable-line import/no-webpack-loader-syntax .default; @@ -52,6 +50,11 @@ if (!__TEST__) { COMFORTABLE_LINE_HEIGHT = extractVar('comfortable-line-height-data'); COMPACT_LINE_HEIGHT = extractVar('compact-line-height-data'); +} catch (error) { + // We can't use the Webpack loader syntax in the context of Jest, + // so tests need some reasonably meaningful fallback value. + COMFORTABLE_LINE_HEIGHT = 15; + COMPACT_LINE_HEIGHT = 10; } export { COMFORTABLE_LINE_HEIGHT, COMPACT_LINE_HEIGHT }; diff --git a/packages/react-devtools-shared/src/devtools/ProfilerStore.js b/packages/react-devtools-shared/src/devtools/ProfilerStore.js index 103947ac8c802..98a78470bd225 100644 --- a/packages/react-devtools-shared/src/devtools/ProfilerStore.js +++ b/packages/react-devtools-shared/src/devtools/ProfilerStore.js @@ -5,8 +5,8 @@ import { prepareProfilingDataFrontendFromBackendAndStore } from './views/Profile import ProfilingCache from './ProfilingCache'; import Store from './store'; -import type { FrontendBridge } from 'src/bridge'; -import type { ProfilingDataBackend } from 'src/backend/types'; +import type { FrontendBridge } from 'react-devtools-shared/src/bridge'; +import type { ProfilingDataBackend } from 'react-devtools-shared/src/backend/types'; import type { CommitDataFrontend, ProfilingDataForRootFrontend, diff --git a/packages/react-devtools-shared/src/devtools/ProfilingCache.js b/packages/react-devtools-shared/src/devtools/ProfilingCache.js index d8f1819ddb632..6ffe360efdeee 100644 --- a/packages/react-devtools-shared/src/devtools/ProfilingCache.js +++ b/packages/react-devtools-shared/src/devtools/ProfilingCache.js @@ -4,24 +4,24 @@ import ProfilerStore from './ProfilerStore'; import { getCommitTree, invalidateCommitTrees, -} from 'src/devtools/views/Profiler/CommitTreeBuilder'; +} from 'react-devtools-shared/src/devtools/views/Profiler/CommitTreeBuilder'; import { getChartData as getFlamegraphChartData, invalidateChartData as invalidateFlamegraphChartData, -} from 'src/devtools/views/Profiler/FlamegraphChartBuilder'; +} from 'react-devtools-shared/src/devtools/views/Profiler/FlamegraphChartBuilder'; import { getChartData as getInteractionsChartData, invalidateChartData as invalidateInteractionsChartData, -} from 'src/devtools/views/Profiler/InteractionsChartBuilder'; +} from 'react-devtools-shared/src/devtools/views/Profiler/InteractionsChartBuilder'; import { getChartData as getRankedChartData, invalidateChartData as invalidateRankedChartData, -} from 'src/devtools/views/Profiler/RankedChartBuilder'; +} from 'react-devtools-shared/src/devtools/views/Profiler/RankedChartBuilder'; -import type { CommitTree } from 'src/devtools/views/Profiler/types'; -import type { ChartData as FlamegraphChartData } from 'src/devtools/views/Profiler/FlamegraphChartBuilder'; -import type { ChartData as InteractionsChartData } from 'src/devtools/views/Profiler/InteractionsChartBuilder'; -import type { ChartData as RankedChartData } from 'src/devtools/views/Profiler/RankedChartBuilder'; +import type { CommitTree } from 'react-devtools-shared/src/devtools/views/Profiler/types'; +import type { ChartData as FlamegraphChartData } from 'react-devtools-shared/src/devtools/views/Profiler/FlamegraphChartBuilder'; +import type { ChartData as InteractionsChartData } from 'react-devtools-shared/src/devtools/views/Profiler/InteractionsChartBuilder'; +import type { ChartData as RankedChartData } from 'react-devtools-shared/src/devtools/views/Profiler/RankedChartBuilder'; export default class ProfilingCache { _fiberCommits: Map> = new Map(); diff --git a/packages/react-devtools-shared/src/devtools/index.js b/packages/react-devtools-shared/src/devtools/index.js index 33e628e96542a..7e5c8b76b2e82 100644 --- a/packages/react-devtools-shared/src/devtools/index.js +++ b/packages/react-devtools-shared/src/devtools/index.js @@ -1,6 +1,6 @@ // @flow -import type { FrontendBridge } from 'src/bridge'; +import type { FrontendBridge } from 'react-devtools-shared/src/bridge'; type Shell = {| connect: (callback: Function) => void, diff --git a/packages/react-devtools-shared/src/devtools/store.js b/packages/react-devtools-shared/src/devtools/store.js index e032463957e08..9492a4dc7c7b6 100644 --- a/packages/react-devtools-shared/src/devtools/store.js +++ b/packages/react-devtools-shared/src/devtools/store.js @@ -18,12 +18,12 @@ import { } from '../utils'; import { localStorageGetItem, localStorageSetItem } from '../storage'; import { __DEBUG__ } from '../constants'; -import { printStore } from 'src/__tests__/storeSerializer'; +import { printStore } from '../__tests__/storeSerializer'; import ProfilerStore from './ProfilerStore'; import type { Element } from './views/Components/types'; import type { ComponentFilter, ElementType } from '../types'; -import type { FrontendBridge } from 'src/bridge'; +import type { FrontendBridge } from 'react-devtools-shared/src/bridge'; const debug = (methodName, ...args) => { if (__DEBUG__) { diff --git a/packages/react-devtools-shared/src/devtools/views/Components/Badge.js b/packages/react-devtools-shared/src/devtools/views/Components/Badge.js index 76ac7bf6246e1..613a32a3961c6 100644 --- a/packages/react-devtools-shared/src/devtools/views/Components/Badge.js +++ b/packages/react-devtools-shared/src/devtools/views/Components/Badge.js @@ -1,10 +1,10 @@ // @flow import React, { Fragment } from 'react'; -import { ElementTypeMemo, ElementTypeForwardRef } from 'src/types'; +import { ElementTypeMemo, ElementTypeForwardRef } from 'react-devtools-shared/src/types'; import styles from './Badge.css'; -import type { ElementType } from 'src/types'; +import type { ElementType } from 'react-devtools-shared/src/types'; type Props = {| className?: string, diff --git a/packages/react-devtools-shared/src/devtools/views/Components/Components.js b/packages/react-devtools-shared/src/devtools/views/Components/Components.js index 2623041e0c4a5..3b57757a47f7b 100644 --- a/packages/react-devtools-shared/src/devtools/views/Components/Components.js +++ b/packages/react-devtools-shared/src/devtools/views/Components/Components.js @@ -8,8 +8,8 @@ import { NativeStyleContextController } from './NativeStyleEditor/context'; import { OwnersListContextController } from './OwnersListContext'; import portaledContent from '../portaledContent'; import { ModalDialog } from '../ModalDialog'; -import SettingsModal from 'src/devtools/views/Settings/SettingsModal'; -import { SettingsModalContextController } from 'src/devtools/views/Settings/SettingsModalContext'; +import SettingsModal from 'react-devtools-shared/src/devtools/views/Settings/SettingsModal'; +import { SettingsModalContextController } from 'react-devtools-shared/src/devtools/views/Settings/SettingsModalContext'; import styles from './Components.css'; diff --git a/packages/react-devtools-shared/src/devtools/views/Components/Element.js b/packages/react-devtools-shared/src/devtools/views/Components/Element.js index dc7f52c065a5d..a8dfebdb5901e 100644 --- a/packages/react-devtools-shared/src/devtools/views/Components/Element.js +++ b/packages/react-devtools-shared/src/devtools/views/Components/Element.js @@ -1,7 +1,7 @@ // @flow import React, { Fragment, useContext, useMemo, useState } from 'react'; -import Store from 'src/devtools/store'; +import Store from 'react-devtools-shared/src/devtools/store'; import Badge from './Badge'; import ButtonIcon from '../ButtonIcon'; import { createRegExp } from '../utils'; diff --git a/packages/react-devtools-shared/src/devtools/views/Components/HocBadges.js b/packages/react-devtools-shared/src/devtools/views/Components/HocBadges.js index 6cd329e8266a0..e88dbdef07f15 100644 --- a/packages/react-devtools-shared/src/devtools/views/Components/HocBadges.js +++ b/packages/react-devtools-shared/src/devtools/views/Components/HocBadges.js @@ -1,7 +1,7 @@ // @flow import React from 'react'; -import { ElementTypeForwardRef, ElementTypeMemo } from 'src/types'; +import { ElementTypeForwardRef, ElementTypeMemo } from 'react-devtools-shared/src/types'; import styles from './HocBadges.css'; import type { Element } from './types'; diff --git a/packages/react-devtools-shared/src/devtools/views/Components/HooksTree.js b/packages/react-devtools-shared/src/devtools/views/Components/HooksTree.js index 10df0c470a65e..84c9a1929e6f9 100644 --- a/packages/react-devtools-shared/src/devtools/views/Components/HooksTree.js +++ b/packages/react-devtools-shared/src/devtools/views/Components/HooksTree.js @@ -14,7 +14,7 @@ import styles from './HooksTree.css'; import { meta } from '../../../hydration'; import type { InspectPath } from './SelectedElement'; -import type { HooksNode, HooksTree } from 'src/backend/types'; +import type { HooksNode, HooksTree } from 'react-devtools-shared/src/backend/types'; type HooksTreeViewProps = {| canEditHooks: boolean, diff --git a/packages/react-devtools-shared/src/devtools/views/Components/InspectedElementContext.js b/packages/react-devtools-shared/src/devtools/views/Components/InspectedElementContext.js index cc9d1f5969f33..df92a6ffd5a5c 100644 --- a/packages/react-devtools-shared/src/devtools/views/Components/InspectedElementContext.js +++ b/packages/react-devtools-shared/src/devtools/views/Components/InspectedElementContext.js @@ -11,19 +11,19 @@ import React, { import { unstable_batchedUpdates as batchedUpdates } from 'react-dom'; import { createResource } from '../../cache'; import { BridgeContext, StoreContext } from '../context'; -import { hydrate, fillInPath } from 'src/hydration'; +import { hydrate, fillInPath } from 'react-devtools-shared/src/hydration'; import { TreeStateContext } from './TreeContext'; -import { separateDisplayNameAndHOCs } from 'src/utils'; +import { separateDisplayNameAndHOCs } from 'react-devtools-shared/src/utils'; import type { InspectedElement as InspectedElementBackend, InspectedElementPayload, -} from 'src/backend/types'; +} from 'react-devtools-shared/src/backend/types'; import type { DehydratedData, Element, InspectedElement as InspectedElementFrontend, -} from 'src/devtools/views/Components/types'; +} from 'react-devtools-shared/src/devtools/views/Components/types'; import type { Resource, Thenable } from '../../cache'; export type GetInspectedElementPath = ( diff --git a/packages/react-devtools-shared/src/devtools/views/Components/InspectedElementTree.js b/packages/react-devtools-shared/src/devtools/views/Components/InspectedElementTree.js index 5475b236c8999..a296a6306fb36 100644 --- a/packages/react-devtools-shared/src/devtools/views/Components/InspectedElementTree.js +++ b/packages/react-devtools-shared/src/devtools/views/Components/InspectedElementTree.js @@ -29,7 +29,7 @@ export default function InspectedElementTree({ }: Props) { const isEmpty = data === null || Object.keys(data).length === 0; - const handleCopy = useCallback(() => copy(serializeDataForCopy(data)), [ + const handleCopy = useCallback(() => copy(serializeDataForCopy(((data: any): Object))), [ data, ]); diff --git a/packages/react-devtools-shared/src/devtools/views/Components/NativeStyleEditor/StyleEditor.js b/packages/react-devtools-shared/src/devtools/views/Components/NativeStyleEditor/StyleEditor.js index 94d6923c37f1d..d1797e820cc01 100644 --- a/packages/react-devtools-shared/src/devtools/views/Components/NativeStyleEditor/StyleEditor.js +++ b/packages/react-devtools-shared/src/devtools/views/Components/NativeStyleEditor/StyleEditor.js @@ -3,7 +3,7 @@ import React, { useContext, useMemo, useRef, useState } from 'react'; import { unstable_batchedUpdates as batchedUpdates } from 'react-dom'; import { copy } from 'clipboard-js'; -import { BridgeContext, StoreContext } from 'src/devtools/views/context'; +import { BridgeContext, StoreContext } from 'react-devtools-shared/src/devtools/views/context'; import Button from '../../Button'; import ButtonIcon from '../../ButtonIcon'; import { serializeDataForCopy } from '../../utils'; diff --git a/packages/react-devtools-shared/src/devtools/views/Components/NativeStyleEditor/context.js b/packages/react-devtools-shared/src/devtools/views/Components/NativeStyleEditor/context.js index f062fef43e57a..479b56f816682 100644 --- a/packages/react-devtools-shared/src/devtools/views/Components/NativeStyleEditor/context.js +++ b/packages/react-devtools-shared/src/devtools/views/Components/NativeStyleEditor/context.js @@ -9,14 +9,14 @@ import React, { useState, } from 'react'; import { unstable_batchedUpdates as batchedUpdates } from 'react-dom'; -import { createResource } from 'src/devtools/cache'; -import { BridgeContext, StoreContext } from 'src/devtools/views/context'; +import { createResource } from 'react-devtools-shared/src/devtools/cache'; +import { BridgeContext, StoreContext } from 'react-devtools-shared/src/devtools/views/context'; import { TreeStateContext } from '../TreeContext'; -import type { StyleAndLayout as StyleAndLayoutBackend } from 'src/backend/NativeStyleEditor/types'; +import type { StyleAndLayout as StyleAndLayoutBackend } from 'react-devtools-shared/src/backend/NativeStyleEditor/types'; import type { StyleAndLayout as StyleAndLayoutFrontend } from './types'; -import type { Element } from 'src/devtools/views/Components/types'; -import type { Resource, Thenable } from 'src/devtools/cache'; +import type { Element } from 'react-devtools-shared/src/devtools/views/Components/types'; +import type { Resource, Thenable } from 'react-devtools-shared/src/devtools/cache'; export type GetStyleAndLayout = (id: number) => StyleAndLayoutFrontend | null; diff --git a/packages/react-devtools-shared/src/devtools/views/Components/NativeStyleEditor/index.js b/packages/react-devtools-shared/src/devtools/views/Components/NativeStyleEditor/index.js index def85e5610002..3298e0d9e990e 100644 --- a/packages/react-devtools-shared/src/devtools/views/Components/NativeStyleEditor/index.js +++ b/packages/react-devtools-shared/src/devtools/views/Components/NativeStyleEditor/index.js @@ -1,9 +1,9 @@ // @flow import React, { Fragment, useContext, useMemo } from 'react'; -import Store from 'src/devtools/store'; -import { StoreContext } from 'src/devtools/views/context'; -import { useSubscription } from 'src/devtools/views/hooks'; +import Store from 'react-devtools-shared/src/devtools/store'; +import { StoreContext } from 'react-devtools-shared/src/devtools/views/context'; +import { useSubscription } from 'react-devtools-shared/src/devtools/views/hooks'; import { NativeStyleContext } from './context'; import LayoutViewer from './LayoutViewer'; import StyleEditor from './StyleEditor'; @@ -26,7 +26,7 @@ export default function NativeStyleEditorWrapper(_: Props) { }), [store] ); - const supportsNativeStyleEditor = useSubscription( + const supportsNativeStyleEditor = useSubscription( subscription ); diff --git a/packages/react-devtools-shared/src/devtools/views/Components/NativeStyleEditor/types.js b/packages/react-devtools-shared/src/devtools/views/Components/NativeStyleEditor/types.js index 882412af3a1c3..8d2bdbfa1c080 100644 --- a/packages/react-devtools-shared/src/devtools/views/Components/NativeStyleEditor/types.js +++ b/packages/react-devtools-shared/src/devtools/views/Components/NativeStyleEditor/types.js @@ -3,7 +3,7 @@ import type { Layout as LayoutBackend, Style as StyleBackend, -} from 'src/backend/NativeStyleEditor/types'; +} from 'react-devtools-shared/src/backend/NativeStyleEditor/types'; export type Layout = LayoutBackend; export type Style = StyleBackend; diff --git a/packages/react-devtools-shared/src/devtools/views/Components/OwnersListContext.js b/packages/react-devtools-shared/src/devtools/views/Components/OwnersListContext.js index 6da02d3546ed8..f1d71249b9203 100644 --- a/packages/react-devtools-shared/src/devtools/views/Components/OwnersListContext.js +++ b/packages/react-devtools-shared/src/devtools/views/Components/OwnersListContext.js @@ -9,10 +9,10 @@ import React, { import { createResource } from '../../cache'; import { BridgeContext, StoreContext } from '../context'; import { TreeStateContext } from './TreeContext'; -import { separateDisplayNameAndHOCs } from 'src/utils'; +import { separateDisplayNameAndHOCs } from 'react-devtools-shared/src/utils'; -import type { OwnersList } from 'src/backend/types'; -import type { Element, Owner } from 'src/devtools/views/Components/types'; +import type { OwnersList } from 'react-devtools-shared/src/backend/types'; +import type { Element, Owner } from 'react-devtools-shared/src/devtools/views/Components/types'; import type { Resource, Thenable } from '../../cache'; type Context = (id: number) => Array | null; diff --git a/packages/react-devtools-shared/src/devtools/views/Components/SelectedElement.js b/packages/react-devtools-shared/src/devtools/views/Components/SelectedElement.js index 30e9bd527014d..260e133c37759 100644 --- a/packages/react-devtools-shared/src/devtools/views/Components/SelectedElement.js +++ b/packages/react-devtools-shared/src/devtools/views/Components/SelectedElement.js @@ -21,13 +21,13 @@ import { ElementTypeFunction, ElementTypeMemo, ElementTypeSuspense, -} from 'src/types'; +} from 'react-devtools-shared/src/types'; import styles from './SelectedElement.css'; import type { GetInspectedElementPath } from './InspectedElementContext'; import type { Element, InspectedElement } from './types'; -import type { ElementType } from 'src/types'; +import type { ElementType } from 'react-devtools-shared/src/types'; export type Props = {||}; diff --git a/packages/react-devtools-shared/src/devtools/views/Components/SelectedTreeHighlight.js b/packages/react-devtools-shared/src/devtools/views/Components/SelectedTreeHighlight.js index 9260784384c59..f5bdebdd59933 100644 --- a/packages/react-devtools-shared/src/devtools/views/Components/SelectedTreeHighlight.js +++ b/packages/react-devtools-shared/src/devtools/views/Components/SelectedTreeHighlight.js @@ -76,7 +76,7 @@ export default function SelectedTreeHighlight(_: {||}) { }), [selectedElementID, store] ); - const data = useSubscription(subscription); + const data = useSubscription(subscription); if (ownerID !== null) { return null; diff --git a/packages/react-devtools-shared/src/devtools/views/Components/Tree.js b/packages/react-devtools-shared/src/devtools/views/Components/Tree.js index 7c575e450a209..ee64ee9580f8c 100644 --- a/packages/react-devtools-shared/src/devtools/views/Components/Tree.js +++ b/packages/react-devtools-shared/src/devtools/views/Components/Tree.js @@ -19,7 +19,7 @@ import ElementView from './Element'; import InspectHostNodesToggle from './InspectHostNodesToggle'; import OwnersStack from './OwnersStack'; import SearchInput from './SearchInput'; -import SettingsModalContextToggle from 'src/devtools/views/Settings/SettingsModalContextToggle'; +import SettingsModalContextToggle from 'react-devtools-shared/src/devtools/views/Settings/SettingsModalContextToggle'; import SelectedTreeHighlight from './SelectedTreeHighlight'; import TreeFocusedContext from './TreeFocusedContext'; diff --git a/packages/react-devtools-shared/src/devtools/views/Components/ViewElementSourceContext.js b/packages/react-devtools-shared/src/devtools/views/Components/ViewElementSourceContext.js index 30a3f017af20f..643596b670001 100644 --- a/packages/react-devtools-shared/src/devtools/views/Components/ViewElementSourceContext.js +++ b/packages/react-devtools-shared/src/devtools/views/Components/ViewElementSourceContext.js @@ -5,7 +5,7 @@ import { createContext } from 'react'; import type { CanViewElementSource, ViewElementSource, -} from 'src/devtools/views/DevTools'; +} from 'react-devtools-shared/src/devtools/views/DevTools'; export type Context = {| canViewElementSourceFunction: CanViewElementSource | null, diff --git a/packages/react-devtools-shared/src/devtools/views/Components/types.js b/packages/react-devtools-shared/src/devtools/views/Components/types.js index bba0b300c9f70..a641e8d40df7f 100644 --- a/packages/react-devtools-shared/src/devtools/views/Components/types.js +++ b/packages/react-devtools-shared/src/devtools/views/Components/types.js @@ -1,6 +1,6 @@ // @flow -import type { ElementType } from 'src/types'; +import type { ElementType } from 'react-devtools-shared/src/types'; // Each element on the frontend corresponds to a Fiber on the backend. // Some of its information (e.g. id, type, displayName) come from the backend. diff --git a/packages/react-devtools-shared/src/devtools/views/DevTools.js b/packages/react-devtools-shared/src/devtools/views/DevTools.js index 44d48b61318f3..a7e2016ccd39a 100644 --- a/packages/react-devtools-shared/src/devtools/views/DevTools.js +++ b/packages/react-devtools-shared/src/devtools/views/DevTools.js @@ -24,8 +24,8 @@ import styles from './DevTools.css'; import './root.css'; -import type { InspectedElement } from 'src/devtools/views/Components/types'; -import type { FrontendBridge } from 'src/bridge'; +import type { InspectedElement } from 'react-devtools-shared/src/devtools/views/Components/types'; +import type { FrontendBridge } from 'react-devtools-shared/src/bridge'; export type BrowserTheme = 'dark' | 'light'; export type TabID = 'components' | 'profiler'; @@ -79,7 +79,7 @@ const tabs = [componentsTab, profilerTab]; export default function DevTools({ bridge, browserTheme = 'light', - canViewElementSourceFunction = null, + canViewElementSourceFunction, defaultTab = 'components', componentsPortalContainer, overrideTab, @@ -88,7 +88,7 @@ export default function DevTools({ showWelcomeToTheNewDevToolsDialog = false, store, warnIfLegacyBackendDetected = false, - viewElementSourceFunction = null, + viewElementSourceFunction, }: Props) { const [tab, setTab] = useState(defaultTab); if (overrideTab != null && overrideTab !== tab) { diff --git a/packages/react-devtools-shared/src/devtools/views/Profiler/CommitTreeBuilder.js b/packages/react-devtools-shared/src/devtools/views/Profiler/CommitTreeBuilder.js index d805f92b1cc74..a1564524558c9 100644 --- a/packages/react-devtools-shared/src/devtools/views/Profiler/CommitTreeBuilder.js +++ b/packages/react-devtools-shared/src/devtools/views/Profiler/CommitTreeBuilder.js @@ -6,17 +6,17 @@ import { TREE_OPERATION_REMOVE, TREE_OPERATION_REORDER_CHILDREN, TREE_OPERATION_UPDATE_TREE_BASE_DURATION, -} from 'src/constants'; -import { utfDecodeString } from 'src/utils'; -import { ElementTypeRoot } from 'src/types'; -import ProfilerStore from 'src/devtools/ProfilerStore'; +} from 'react-devtools-shared/src/constants'; +import { utfDecodeString } from 'react-devtools-shared/src/utils'; +import { ElementTypeRoot } from 'react-devtools-shared/src/types'; +import ProfilerStore from 'react-devtools-shared/src/devtools/ProfilerStore'; -import type { ElementType } from 'src/types'; +import type { ElementType } from 'react-devtools-shared/src/types'; import type { CommitTree, CommitTreeNode, ProfilingDataForRootFrontend, -} from 'src/devtools/views/Profiler/types'; +} from 'react-devtools-shared/src/devtools/views/Profiler/types'; const debug = (methodName, ...args) => { if (__DEBUG__) { diff --git a/packages/react-devtools-shared/src/devtools/views/Profiler/FlamegraphChartBuilder.js b/packages/react-devtools-shared/src/devtools/views/Profiler/FlamegraphChartBuilder.js index 9530febfc7a5d..ef934c2ec264c 100644 --- a/packages/react-devtools-shared/src/devtools/views/Profiler/FlamegraphChartBuilder.js +++ b/packages/react-devtools-shared/src/devtools/views/Profiler/FlamegraphChartBuilder.js @@ -1,8 +1,8 @@ // @flow -import { ElementTypeForwardRef, ElementTypeMemo } from 'src/types'; +import { ElementTypeForwardRef, ElementTypeMemo } from 'react-devtools-shared/src/types'; import { formatDuration } from './utils'; -import ProfilerStore from 'src/devtools/ProfilerStore'; +import ProfilerStore from 'react-devtools-shared/src/devtools/ProfilerStore'; import type { CommitTree } from './types'; diff --git a/packages/react-devtools-shared/src/devtools/views/Profiler/InteractionsChartBuilder.js b/packages/react-devtools-shared/src/devtools/views/Profiler/InteractionsChartBuilder.js index 6171749ef0a69..48b1bb79c8ace 100644 --- a/packages/react-devtools-shared/src/devtools/views/Profiler/InteractionsChartBuilder.js +++ b/packages/react-devtools-shared/src/devtools/views/Profiler/InteractionsChartBuilder.js @@ -1,6 +1,6 @@ // @flow -import ProfilerStore from 'src/devtools/ProfilerStore'; +import ProfilerStore from 'react-devtools-shared/src/devtools/ProfilerStore'; import type { Interaction } from './types'; diff --git a/packages/react-devtools-shared/src/devtools/views/Profiler/Profiler.js b/packages/react-devtools-shared/src/devtools/views/Profiler/Profiler.js index a4a5ce935fd88..b99630bcc9852 100644 --- a/packages/react-devtools-shared/src/devtools/views/Profiler/Profiler.js +++ b/packages/react-devtools-shared/src/devtools/views/Profiler/Profiler.js @@ -16,9 +16,9 @@ import SnapshotSelector from './SnapshotSelector'; import SidebarCommitInfo from './SidebarCommitInfo'; import SidebarInteractions from './SidebarInteractions'; import SidebarSelectedFiberInfo from './SidebarSelectedFiberInfo'; -import SettingsModal from 'src/devtools/views/Settings/SettingsModal'; -import SettingsModalContextToggle from 'src/devtools/views/Settings/SettingsModalContextToggle'; -import { SettingsModalContextController } from 'src/devtools/views/Settings/SettingsModalContext'; +import SettingsModal from 'react-devtools-shared/src/devtools/views/Settings/SettingsModal'; +import SettingsModalContextToggle from 'react-devtools-shared/src/devtools/views/Settings/SettingsModalContextToggle'; +import { SettingsModalContextController } from 'react-devtools-shared/src/devtools/views/Settings/SettingsModalContext'; import portaledContent from '../portaledContent'; import styles from './Profiler.css'; diff --git a/packages/react-devtools-shared/src/devtools/views/Profiler/ProfilerContext.js b/packages/react-devtools-shared/src/devtools/views/Profiler/ProfilerContext.js index f50947e1cf778..48d8af33aaf31 100644 --- a/packages/react-devtools-shared/src/devtools/views/Profiler/ProfilerContext.js +++ b/packages/react-devtools-shared/src/devtools/views/Profiler/ProfilerContext.js @@ -121,7 +121,7 @@ function ProfilerContextController({ children }: Props) { isProfiling, profilingData, supportsProfiling, - } = useSubscription(subscription); + } = useSubscription(subscription); const [prevProfilingData, setPrevProfilingData] = useState(); const [rootID, setRootID] = useState(null); diff --git a/packages/react-devtools-shared/src/devtools/views/Profiler/RankedChartBuilder.js b/packages/react-devtools-shared/src/devtools/views/Profiler/RankedChartBuilder.js index 67b38fccbf389..d0f302fea2be4 100644 --- a/packages/react-devtools-shared/src/devtools/views/Profiler/RankedChartBuilder.js +++ b/packages/react-devtools-shared/src/devtools/views/Profiler/RankedChartBuilder.js @@ -1,8 +1,8 @@ // @flow -import { ElementTypeForwardRef, ElementTypeMemo } from 'src/types'; +import { ElementTypeForwardRef, ElementTypeMemo } from 'react-devtools-shared/src/types'; import { formatDuration } from './utils'; -import ProfilerStore from 'src/devtools/ProfilerStore'; +import ProfilerStore from 'react-devtools-shared/src/devtools/ProfilerStore'; import type { CommitTree } from './types'; diff --git a/packages/react-devtools-shared/src/devtools/views/Profiler/ReloadAndProfileButton.js b/packages/react-devtools-shared/src/devtools/views/Profiler/ReloadAndProfileButton.js index 0c92ae6efeb1d..05c7882fe9f0a 100644 --- a/packages/react-devtools-shared/src/devtools/views/Profiler/ReloadAndProfileButton.js +++ b/packages/react-devtools-shared/src/devtools/views/Profiler/ReloadAndProfileButton.js @@ -5,7 +5,7 @@ import Button from '../Button'; import ButtonIcon from '../ButtonIcon'; import { BridgeContext, StoreContext } from '../context'; import { useSubscription } from '../hooks'; -import Store from 'src/devtools/store'; +import Store from 'react-devtools-shared/src/devtools/store'; type SubscriptionData = {| recordChangeDescriptions: boolean, @@ -36,7 +36,7 @@ export default function ReloadAndProfileButton() { const { recordChangeDescriptions, supportsReloadAndProfile, - } = useSubscription(subscription); + } = useSubscription(subscription); const reloadAndProfile = useCallback(() => { // TODO If we want to support reload-and-profile for e.g. React Native, diff --git a/packages/react-devtools-shared/src/devtools/views/Profiler/SidebarSelectedFiberInfo.js b/packages/react-devtools-shared/src/devtools/views/Profiler/SidebarSelectedFiberInfo.js index 9a34361a173c8..214e44677a244 100644 --- a/packages/react-devtools-shared/src/devtools/views/Profiler/SidebarSelectedFiberInfo.js +++ b/packages/react-devtools-shared/src/devtools/views/Profiler/SidebarSelectedFiberInfo.js @@ -1,7 +1,7 @@ // @flow import React, { Fragment, useContext } from 'react'; -import ProfilerStore from 'src/devtools/ProfilerStore'; +import ProfilerStore from 'react-devtools-shared/src/devtools/ProfilerStore'; import { ProfilerContext } from './ProfilerContext'; import { formatDuration, formatTime } from './utils'; import { StoreContext } from '../context'; diff --git a/packages/react-devtools-shared/src/devtools/views/Profiler/types.js b/packages/react-devtools-shared/src/devtools/views/Profiler/types.js index d8c954e5b7fac..06beb521cca27 100644 --- a/packages/react-devtools-shared/src/devtools/views/Profiler/types.js +++ b/packages/react-devtools-shared/src/devtools/views/Profiler/types.js @@ -1,6 +1,6 @@ // @flow -import type { ElementType } from 'src/types'; +import type { ElementType } from 'react-devtools-shared/src/types'; export type CommitTreeNode = {| id: number, diff --git a/packages/react-devtools-shared/src/devtools/views/Profiler/utils.js b/packages/react-devtools-shared/src/devtools/views/Profiler/utils.js index 973d5ba2d5279..3caf128483c5a 100644 --- a/packages/react-devtools-shared/src/devtools/views/Profiler/utils.js +++ b/packages/react-devtools-shared/src/devtools/views/Profiler/utils.js @@ -1,8 +1,8 @@ // @flow -import { PROFILER_EXPORT_VERSION } from 'src/constants'; +import { PROFILER_EXPORT_VERSION } from 'react-devtools-shared/src/constants'; -import type { ProfilingDataBackend } from 'src/backend/types'; +import type { ProfilingDataBackend } from 'react-devtools-shared/src/backend/types'; import type { ProfilingDataExport, ProfilingDataForRootExport, diff --git a/packages/react-devtools-shared/src/devtools/views/Settings/ComponentsSettings.js b/packages/react-devtools-shared/src/devtools/views/Settings/ComponentsSettings.js index 6b62b935f17e3..3757c5139bd87 100644 --- a/packages/react-devtools-shared/src/devtools/views/Settings/ComponentsSettings.js +++ b/packages/react-devtools-shared/src/devtools/views/Settings/ComponentsSettings.js @@ -10,7 +10,7 @@ import React, { } from 'react'; import { useSubscription } from '../hooks'; import { StoreContext } from '../context'; -import Store from 'src/devtools/store'; +import Store from 'react-devtools-shared/src/devtools/store'; import Button from '../Button'; import ButtonIcon from '../ButtonIcon'; import Toggle from '../Toggle'; @@ -28,7 +28,7 @@ import { ElementTypeOtherOrUnknown, ElementTypeProfiler, ElementTypeSuspense, -} from 'src/types'; +} from 'react-devtools-shared/src/types'; import styles from './SettingsShared.css'; @@ -39,7 +39,7 @@ import type { ElementType, ElementTypeComponentFilter, RegExpComponentFilter, -} from 'src/types'; +} from 'react-devtools-shared/src/types'; export default function ComponentsSettings(_: {||}) { const store = useContext(StoreContext); @@ -54,7 +54,7 @@ export default function ComponentsSettings(_: {||}) { }), [store] ); - const collapseNodesByDefault = useSubscription( + const collapseNodesByDefault = useSubscription( collapseNodesByDefaultSubscription ); diff --git a/packages/react-devtools-shared/src/devtools/views/Settings/GeneralSettings.js b/packages/react-devtools-shared/src/devtools/views/Settings/GeneralSettings.js index 8b8692d739b5a..59edf3bfcbf1d 100644 --- a/packages/react-devtools-shared/src/devtools/views/Settings/GeneralSettings.js +++ b/packages/react-devtools-shared/src/devtools/views/Settings/GeneralSettings.js @@ -2,7 +2,7 @@ import React, { useContext } from 'react'; import { SettingsContext } from './SettingsContext'; -import { CHANGE_LOG_URL } from 'src/constants'; +import { CHANGE_LOG_URL } from 'react-devtools-shared/src/constants'; import styles from './SettingsShared.css'; diff --git a/packages/react-devtools-shared/src/devtools/views/Settings/ProfilerSettings.js b/packages/react-devtools-shared/src/devtools/views/Settings/ProfilerSettings.js index b13f7ad6e838f..0a09cab1e44ad 100644 --- a/packages/react-devtools-shared/src/devtools/views/Settings/ProfilerSettings.js +++ b/packages/react-devtools-shared/src/devtools/views/Settings/ProfilerSettings.js @@ -3,8 +3,8 @@ import React, { useCallback, useContext, useMemo, useRef } from 'react'; import { useSubscription } from '../hooks'; import { StoreContext } from '../context'; -import { ProfilerContext } from 'src/devtools/views/Profiler/ProfilerContext'; -import Store from 'src/devtools/store'; +import { ProfilerContext } from 'react-devtools-shared/src/devtools/views/Profiler/ProfilerContext'; +import Store from 'react-devtools-shared/src/devtools/store'; import styles from './SettingsShared.css'; @@ -27,7 +27,7 @@ export default function ProfilerSettings(_: {||}) { }), [store] ); - const recordChangeDescriptions = useSubscription( + const recordChangeDescriptions = useSubscription( recordChangeDescriptionsSubscription ); diff --git a/packages/react-devtools-shared/src/devtools/views/Settings/SettingsContext.js b/packages/react-devtools-shared/src/devtools/views/Settings/SettingsContext.js index 62f3ae01da832..200559e15f788 100644 --- a/packages/react-devtools-shared/src/devtools/views/Settings/SettingsContext.js +++ b/packages/react-devtools-shared/src/devtools/views/Settings/SettingsContext.js @@ -11,7 +11,7 @@ import { COMFORTABLE_LINE_HEIGHT, COMPACT_LINE_HEIGHT, LOCAL_STORAGE_SHOULD_PATCH_CONSOLE_KEY, -} from 'src/constants'; +} from 'react-devtools-shared/src/constants'; import { useLocalStorage } from '../hooks'; import { BridgeContext } from '../context'; diff --git a/packages/react-devtools-shared/src/devtools/views/Settings/SettingsModal.js b/packages/react-devtools-shared/src/devtools/views/Settings/SettingsModal.js index ae972e70f4770..8b876d3750681 100644 --- a/packages/react-devtools-shared/src/devtools/views/Settings/SettingsModal.js +++ b/packages/react-devtools-shared/src/devtools/views/Settings/SettingsModal.js @@ -8,7 +8,7 @@ import React, { useRef, } from 'react'; import { SettingsModalContext } from './SettingsModalContext'; -import Store from 'src/devtools/store'; +import Store from 'react-devtools-shared/src/devtools/store'; import Button from '../Button'; import ButtonIcon from '../ButtonIcon'; import TabBar from '../TabBar'; @@ -45,7 +45,7 @@ export default function SettingsModal(_: {||}) { }), [profilerStore] ); - const isProfiling = useSubscription(isProfilingSubscription); + const isProfiling = useSubscription(isProfilingSubscription); if (isProfiling && isModalShowing) { setIsModalShowing(false); } diff --git a/packages/react-devtools-shared/src/devtools/views/Settings/SettingsModalContextToggle.js b/packages/react-devtools-shared/src/devtools/views/Settings/SettingsModalContextToggle.js index 5124cdb168afd..3781612b8f44c 100644 --- a/packages/react-devtools-shared/src/devtools/views/Settings/SettingsModalContextToggle.js +++ b/packages/react-devtools-shared/src/devtools/views/Settings/SettingsModalContextToggle.js @@ -6,7 +6,7 @@ import Button from '../Button'; import ButtonIcon from '../ButtonIcon'; import { StoreContext } from '../context'; import { useSubscription } from '../hooks'; -import Store from 'src/devtools/store'; +import Store from 'react-devtools-shared/src/devtools/store'; export default function SettingsModalContextToggle() { const { setIsModalShowing } = useContext(SettingsModalContext); @@ -29,7 +29,7 @@ export default function SettingsModalContextToggle() { }), [profilerStore] ); - const isProfiling = useSubscription(isProfilingSubscription); + const isProfiling = useSubscription(isProfilingSubscription); return (