Skip to content

Commit 30b8ef3

Browse files
author
Brian Vaughn
committed
Iterated on Webpack configs until I got the inline and shell packages seemingly working
1 parent 44e4109 commit 30b8ef3

File tree

22 files changed

+4346
-242
lines changed

22 files changed

+4346
-242
lines changed

‎packages/react-devtools-core/webpack.backend.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ module.exports = {
3030
library: 'ReactDevToolsBackend',
3131
libraryTarget: 'umd',
3232
},
33-
resolve: {
34-
alias: {
35-
src: resolve(__dirname, '../../src'),
36-
},
37-
},
3833
plugins: [
3934
new DefinePlugin({
4035
__DEV__: true,
@@ -49,7 +44,12 @@ module.exports = {
4944
test: /\.js$/,
5045
loader: 'babel-loader',
5146
options: {
52-
configFile: resolve(__dirname, '../../babel.config.js'),
47+
configFile: resolve(
48+
__dirname,
49+
'..',
50+
'react-devtools-shared',
51+
'babel.config.js',
52+
),
5353
},
5454
},
5555
],

‎packages/react-devtools-core/webpack.standalone.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ module.exports = {
2929
library: '[name]',
3030
libraryTarget: 'commonjs2',
3131
},
32-
resolve: {
33-
alias: {
34-
src: resolve(__dirname, '../../src'),
35-
},
36-
},
3732
plugins: [
3833
new DefinePlugin({
3934
__DEV__: false,
@@ -49,7 +44,12 @@ module.exports = {
4944
test: /\.js$/,
5045
loader: 'babel-loader',
5146
options: {
52-
configFile: resolve(__dirname, '../../babel.config.js'),
47+
configFile: resolve(
48+
__dirname,
49+
'..',
50+
'react-devtools-shared',
51+
'babel.config.js',
52+
),
5353
},
5454
},
5555
{

‎packages/react-devtools-extensions/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ You can also build and install from source:
1212
```sh
1313
yarn install
1414

15-
yarn build:extension:chrome # builds at "packages/react-devtools-extensions/chrome/build"
16-
yarn build:extension:firefox # builds at "packages/react-devtools-extensions/firefox/build"
15+
yarn build:chrome # builds at "packages/react-devtools-extensions/chrome/build"
16+
yarn build:firefox # builds at "packages/react-devtools-extensions/firefox/build"
1717
```

‎packages/react-devtools-extensions/build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ const postProcess = async (tempPath, destinationPath) => {
9797
};
9898

9999
const main = async buildId => {
100-
const root = join(__dirname, '..', buildId);
100+
const root = join(__dirname, buildId);
101101
const manifestPath = join(root, 'manifest.json');
102102
const destinationPath = join(root, 'build');
103103

‎packages/react-devtools-extensions/chrome/test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
const chromeLaunch = require('chrome-launch');
66
const {resolve} = require('path');
77

8-
const EXTENSION_PATH = resolve('shells/browser/chrome/build/unpacked');
8+
const EXTENSION_PATH = resolve('./chrome/build/unpacked');
99
const START_URL = 'https://facebook.github.io/react/';
1010

1111
chromeLaunch(START_URL, {

‎packages/react-devtools-extensions/firefox/test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const {exec} = require('child-process-promise');
66
const {Finder} = require('firefox-profile');
77
const {resolve} = require('path');
88

9-
const EXTENSION_PATH = resolve('shells/browser/firefox/build/unpacked');
9+
const EXTENSION_PATH = resolve('./firefox/build/unpacked');
1010
const START_URL = 'https://facebook.github.io/react/';
1111

1212
const main = async () => {

‎packages/react-devtools-extensions/flow-typed/npm/react-test-renderer_v16.x.x.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ type TestRendererOptions = {
5050
};
5151

5252
declare module 'react-test-renderer' {
53+
// eslint-disable-next-line no-inner-declarations
5354
declare export type ReactTestRenderer = {
5455
toJSON(): null | ReactTestRendererJSON,
5556
toTree(): null | ReactTestRendererTree,

‎packages/react-devtools-extensions/package.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,39 @@
33
"name": "react-devtools-extensions",
44
"version": "0.0.0",
55
"private": true,
6+
"scripts": {
7+
"build": "cross-env NODE_ENV=production yarn run build:chrome && yarn run build:firefox",
8+
"build:dev": "cross-env NODE_ENV=development yarn run build:chrome && yarn run build:firefox",
9+
"build:chrome": "cross-env NODE_ENV=production node ./chrome/build",
10+
"build:chrome:crx": "cross-env NODE_ENV=production node ./chrome/build --crx",
11+
"build:chrome:dev": "cross-env NODE_ENV=development node ./chrome/build",
12+
"build:firefox": "cross-env NODE_ENV=production node ./firefox/build",
13+
"build:firefox:dev": "cross-env NODE_ENV=development node ./firefox/build",
14+
"test:chrome": "node ./chrome/test",
15+
"test:firefox": "node ./firefox/test"
16+
},
617
"devDependencies": {
18+
"@babel/core": "^7.1.6",
19+
"@babel/plugin-proposal-class-properties": "^7.1.0",
20+
"@babel/plugin-transform-flow-strip-types": "^7.1.6",
21+
"@babel/plugin-transform-react-jsx-source": "^7.2.0",
22+
"@babel/preset-env": "^7.1.6",
23+
"@babel/preset-flow": "^7.0.0",
24+
"@babel/preset-react": "^7.0.0",
25+
"archiver": "^3.0.0",
26+
"babel-core": "^7.0.0-bridge",
27+
"babel-eslint": "^9.0.0",
28+
"babel-jest": "^24.7.1",
729
"babel-loader": "^8.0.4",
30+
"chrome-launch": "^1.1.4",
31+
"child-process-promise": "^2.2.1",
832
"css-loader": "^1.0.1",
33+
"firefox-profile": "^1.0.2",
34+
"node-libs-browser": "0.5.3",
35+
"nullthrows": "^1.0.0",
936
"raw-loader": "^3.1.0",
1037
"style-loader": "^0.23.1",
38+
"web-ext": "^3.0.0",
1139
"webpack": "^4.26.0",
1240
"webpack-cli": "^3.1.2",
1341
"webpack-dev-server": "^3.3.1"

‎packages/react-devtools-extensions/webpack.backend.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ if (!NODE_ENV) {
1010
process.exit(1);
1111
}
1212

13+
const builtModulesDir = resolve(__dirname, '..', '..', 'build', 'node_modules');
14+
1315
const __DEV__ = NODE_ENV === 'development';
1416

1517
const GITHUB_URL = getGitHubURL();
@@ -27,7 +29,9 @@ module.exports = {
2729
},
2830
resolve: {
2931
alias: {
30-
src: resolve(__dirname, '../../../src'),
32+
react: resolve(builtModulesDir, 'react'),
33+
'react-dom': resolve(builtModulesDir, 'react-dom'),
34+
scheduler: resolve(builtModulesDir, 'scheduler'),
3135
},
3236
},
3337
plugins: [
@@ -44,7 +48,12 @@ module.exports = {
4448
test: /\.js$/,
4549
loader: 'babel-loader',
4650
options: {
47-
configFile: resolve(__dirname, '../../../babel.config.js'),
51+
configFile: resolve(
52+
__dirname,
53+
'..',
54+
'react-devtools-shared',
55+
'babel.config.js',
56+
),
4857
},
4958
},
5059
],

‎packages/react-devtools-extensions/webpack.config.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ if (!NODE_ENV) {
1010
process.exit(1);
1111
}
1212

13+
const builtModulesDir = resolve(__dirname, '..', '..', 'build', 'node_modules');
14+
1315
const __DEV__ = NODE_ENV === 'development';
1416

1517
const GITHUB_URL = getGitHubURL();
@@ -30,6 +32,13 @@ module.exports = {
3032
path: __dirname + '/build',
3133
filename: '[name].js',
3234
},
35+
resolve: {
36+
alias: {
37+
react: resolve(builtModulesDir, 'react'),
38+
'react-dom': resolve(builtModulesDir, 'react-dom'),
39+
scheduler: resolve(builtModulesDir, 'scheduler'),
40+
},
41+
},
3342
plugins: [
3443
new DefinePlugin({
3544
__DEV__: false,
@@ -45,7 +54,12 @@ module.exports = {
4554
test: /\.js$/,
4655
loader: 'babel-loader',
4756
options: {
48-
configFile: resolve(__dirname, '../babel.config.js'),
57+
configFile: resolve(
58+
__dirname,
59+
'..',
60+
'react-devtools-shared',
61+
'babel.config.js',
62+
),
4963
},
5064
},
5165
{

‎packages/react-devtools-inline/package.json

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,23 @@
2020
},
2121
"dependencies": {},
2222
"devDependencies": {
23-
"cross-env": "^3.1.4"
23+
"@babel/core": "^7.1.6",
24+
"@babel/plugin-proposal-class-properties": "^7.1.0",
25+
"@babel/plugin-transform-flow-strip-types": "^7.1.6",
26+
"@babel/plugin-transform-react-jsx-source": "^7.2.0",
27+
"@babel/preset-env": "^7.1.6",
28+
"@babel/preset-flow": "^7.0.0",
29+
"@babel/preset-react": "^7.0.0",
30+
"babel-core": "^7.0.0-bridge",
31+
"babel-eslint": "^9.0.0",
32+
"babel-jest": "^24.7.1",
33+
"babel-loader": "^8.0.4",
34+
"cross-env": "^3.1.4",
35+
"css-loader": "^1.0.1",
36+
"raw-loader": "^3.1.0",
37+
"style-loader": "^0.23.1",
38+
"webpack": "^4.26.0",
39+
"webpack-cli": "^3.1.2",
40+
"webpack-dev-server": "^3.3.1"
2441
}
2542
}

‎packages/react-devtools-inline/webpack.config.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ module.exports = {
2929
library: '[name]',
3030
libraryTarget: 'commonjs2',
3131
},
32-
resolve: {
33-
alias: {
34-
src: resolve(__dirname, '../../src'),
35-
},
36-
},
3732
externals: {
3833
react: 'react',
3934
'react-dom': 'react-dom',
@@ -54,7 +49,12 @@ module.exports = {
5449
test: /\.js$/,
5550
loader: 'babel-loader',
5651
options: {
57-
configFile: resolve(__dirname, '../../babel.config.js'),
52+
configFile: resolve(
53+
__dirname,
54+
'..',
55+
'react-devtools-shared',
56+
'babel.config.js',
57+
),
5858
},
5959
},
6060
{

‎packages/react-devtools-extensions/babel.config.js renamed to ‎packages/react-devtools-shared/babel.config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const chromeManifest = require('./chrome/manifest.json');
2-
const firefoxManifest = require('./firefox/manifest.json');
1+
const chromeManifest = require('../react-devtools-extensions/chrome/manifest.json');
2+
const firefoxManifest = require('../react-devtools-extensions/firefox/manifest.json');
33

44
const minChromeVersion = parseInt(chromeManifest.minimum_chrome_version, 10);
55
const minFirefoxVersion = parseInt(
@@ -26,7 +26,7 @@ module.exports = api => {
2626
targets.firefox = minFirefoxVersion.toString();
2727

2828
// This targets RN/Hermes.
29-
targets.IE = '11';
29+
targets.ie = '11';
3030
}
3131
const plugins = [
3232
['@babel/plugin-transform-flow-strip-types'],

‎packages/react-devtools-shared/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"name": "react-devtools-shared",
44
"version": "0.0.0",
55
"dependencies": {
6+
"@babel/runtime": "^7.0.0",
67
"@reach/menu-button": "^0.1.17",
78
"@reach/tooltip": "^0.2.2",
89
"clipboard-js": "^0.3.6",

‎packages/react-devtools-shared/src/devtools/views/DevTools.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ export default function DevTools({
9797

9898
const viewElementSource = useMemo(
9999
() => ({
100-
canViewElementSourceFunction,
101-
viewElementSourceFunction,
100+
canViewElementSourceFunction: canViewElementSourceFunction || null,
101+
viewElementSourceFunction: viewElementSourceFunction || null,
102102
}),
103103
[canViewElementSourceFunction, viewElementSourceFunction],
104104
);

‎packages/react-devtools-shared/src/devtools/views/ErrorBoundary.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export default class ErrorBoundary extends Component<Props, State> {
5151
let bugURL = process.env.GITHUB_URL;
5252
if (bugURL) {
5353
const title = `Error: "${errorMessage || ''}"`;
54-
const label = '😭 bug';
54+
const label = 'Component: Developer Tools';
5555

5656
let body = '<!-- please provide repro information here -->\n';
5757
body += '\n---------------------------------------------';

‎packages/react-devtools-shared/src/devtools/views/Profiler/SidebarSelectedFiberInfo.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ export default function SidebarSelectedFiberInfo(_: Props) {
3030
});
3131

3232
const listItems = [];
33-
for (let i = 0; i < commitIndices.length; i++) {
33+
let i = 0;
34+
for (i = 0; i < commitIndices.length; i++) {
3435
const commitIndex = commitIndices[i];
3536

3637
const {duration, timestamp} = profilerStore.getCommitData(

‎packages/react-devtools-shell/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Harness for testing local changes to the `react-devtools-inline` and `react-devtools-shared` packages.

‎packages/react-devtools-shell/package.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,32 @@
22
"private": true,
33
"name": "react-devtools-shell",
44
"version": "0.0.0",
5+
"scripts": {
6+
"build": "cross-env NODE_ENV=development cross-env TARGET=remote webpack --config webpack.config.js",
7+
"deploy": "yarn run build && now deploy && now alias react-devtools-experimental",
8+
"start": "cross-env NODE_ENV=development cross-env TARGET=local webpack-dev-server --open"
9+
},
510
"dependencies": {
611
"react-native-web": "^0.11.5"
12+
},
13+
"devDependencies": {
14+
"@babel/core": "^7.1.6",
15+
"@babel/plugin-proposal-class-properties": "^7.1.0",
16+
"@babel/plugin-transform-flow-strip-types": "^7.1.6",
17+
"@babel/plugin-transform-react-jsx-source": "^7.2.0",
18+
"@babel/preset-env": "^7.1.6",
19+
"@babel/preset-flow": "^7.0.0",
20+
"@babel/preset-react": "^7.0.0",
21+
"babel-core": "^7.0.0-bridge",
22+
"babel-eslint": "^9.0.0",
23+
"babel-jest": "^24.7.1",
24+
"babel-loader": "^8.0.4",
25+
"cross-env": "^3.1.4",
26+
"css-loader": "^1.0.1",
27+
"raw-loader": "^3.1.0",
28+
"style-loader": "^0.23.1",
29+
"webpack": "^4.26.0",
30+
"webpack-cli": "^3.1.2",
31+
"webpack-dev-server": "^3.3.1"
732
}
833
}

‎packages/react-devtools-shell/webpack.config.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ if (!TARGET) {
1717
process.exit(1);
1818
}
1919

20-
const __DEV__ = NODE_ENV === 'development';
20+
const builtModulesDir = resolve(__dirname, '..', '..', 'build', 'node_modules');
2121

22-
const root = resolve(__dirname, '../..');
22+
const __DEV__ = NODE_ENV === 'development';
2323

2424
const GITHUB_URL = getGitHubURL();
2525
const DEVTOOLS_VERSION = getVersionString();
@@ -33,11 +33,9 @@ const config = {
3333
},
3434
resolve: {
3535
alias: {
36-
'react-devtools-inline': resolve(
37-
root,
38-
'packages/react-devtools-inline/src/',
39-
),
40-
src: resolve(root, 'src'),
36+
react: resolve(builtModulesDir, 'react'),
37+
'react-dom': resolve(builtModulesDir, 'react-dom'),
38+
scheduler: resolve(builtModulesDir, 'scheduler'),
4139
},
4240
},
4341
plugins: [
@@ -54,7 +52,12 @@ const config = {
5452
test: /\.js$/,
5553
loader: 'babel-loader',
5654
options: {
57-
configFile: resolve(root, 'babel.config.js'),
55+
configFile: resolve(
56+
__dirname,
57+
'..',
58+
'react-devtools-shared',
59+
'babel.config.js',
60+
),
5861
},
5962
},
6063
{

‎scripts/flow/config/flowconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
.*/rollup/shims/facebook-www/.*
66
.*/rollup/shims/react-native/.*
77

8+
.*/node_modules/@snyk/.*
89
.*/node_modules/y18n/.*
910
.*/node_modules/chrome-devtools-frontend/.*
1011
.*/node_modules/devtools-timeline-model/.*

0 commit comments

Comments
 (0)