Skip to content

Commit 5fc9742

Browse files
author
Brian Vaughn
authored
Remove dependency on local git checkout from build process (facebook#17475)
* Remove dependency on local git checkout from build process * Updated Webpack dependencies to account for recent changes to deps for Flight
1 parent 6470e0f commit 5fc9742

File tree

11 files changed

+33
-73
lines changed

11 files changed

+33
-73
lines changed

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const {resolve} = require('path');
22
const {DefinePlugin} = require('webpack');
33
const {
4-
getGitHubURL,
4+
GITHUB_URL,
55
getVersionString,
66
} = require('react-devtools-extensions/utils');
77

@@ -15,7 +15,6 @@ const builtModulesDir = resolve(__dirname, '..', '..', 'build', 'node_modules');
1515

1616
const __DEV__ = NODE_ENV === 'development';
1717

18-
const GITHUB_URL = getGitHubURL();
1918
const DEVTOOLS_VERSION = getVersionString();
2019

2120
module.exports = {

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const {resolve} = require('path');
22
const {DefinePlugin} = require('webpack');
33
const {
4-
getGitHubURL,
4+
GITHUB_URL,
55
getVersionString,
66
} = require('react-devtools-extensions/utils');
77

@@ -15,7 +15,6 @@ const builtModulesDir = resolve(__dirname, '..', '..', 'build', 'node_modules');
1515

1616
const __DEV__ = NODE_ENV === 'development';
1717

18-
const GITHUB_URL = getGitHubURL();
1918
const DEVTOOLS_VERSION = getVersionString();
2019

2120
module.exports = {

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

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
32
"name": "react-devtools-extensions",
43
"version": "0.0.0",
54
"private": true,
@@ -26,18 +25,18 @@
2625
"babel-core": "^7.0.0-bridge",
2726
"babel-eslint": "^9.0.0",
2827
"babel-loader": "^8.0.4",
29-
"chrome-launch": "^1.1.4",
3028
"child-process-promise": "^2.2.1",
31-
"css-loader": "^1.0.1",
29+
"chrome-launch": "^1.1.4",
3230
"crx": "^5.0.0",
31+
"css-loader": "^1.0.1",
3332
"firefox-profile": "^1.0.2",
3433
"node-libs-browser": "0.5.3",
3534
"nullthrows": "^1.0.0",
3635
"raw-loader": "^3.1.0",
3736
"style-loader": "^0.23.1",
3837
"web-ext": "^3.0.0",
39-
"webpack": "^4.26.0",
40-
"webpack-cli": "^3.1.2",
38+
"webpack": "^4.41.2",
39+
"webpack-cli": "^3.3.10",
4140
"webpack-dev-server": "^3.3.1"
4241
}
4342
}

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

+15-19
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,17 @@ const {execSync} = require('child_process');
22
const {readFileSync} = require('fs');
33
const {resolve} = require('path');
44

5-
function getGitCommit() {
6-
return execSync('git show -s --format=%h')
7-
.toString()
8-
.trim();
9-
}
5+
const GITHUB_URL = 'https://github.com/facebook/react';
106

11-
function getGitHubURL() {
12-
// TODO potentially replace this with an fb.me URL (assuming it can forward the query params)
13-
const url = execSync('git remote get-url origin')
14-
.toString()
15-
.trim();
16-
17-
if (url.startsWith('https://')) {
18-
return url.replace('.git', '');
19-
} else {
20-
return url
21-
.replace(':', '/')
22-
.replace('git@', 'https://')
23-
.replace('.git', '');
7+
function getGitCommit() {
8+
try {
9+
return execSync('git show -s --format=%h')
10+
.toString()
11+
.trim();
12+
} catch (error) {
13+
// Mozilla runs this command from a git archive.
14+
// In that context, there is no Git revision.
15+
return null;
2416
}
2517
}
2618

@@ -36,4 +28,8 @@ function getVersionString() {
3628
return `${packageVersion}-${commit}`;
3729
}
3830

39-
module.exports = {getGitCommit, getGitHubURL, getVersionString};
31+
module.exports = {
32+
GITHUB_URL,
33+
getGitCommit,
34+
getVersionString,
35+
};

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const {resolve} = require('path');
44
const {DefinePlugin} = require('webpack');
5-
const {getGitHubURL, getVersionString} = require('./utils');
5+
const {GITHUB_URL, getVersionString} = require('./utils');
66

77
const NODE_ENV = process.env.NODE_ENV;
88
if (!NODE_ENV) {
@@ -14,7 +14,6 @@ const builtModulesDir = resolve(__dirname, '..', '..', 'build', 'node_modules');
1414

1515
const __DEV__ = NODE_ENV === 'development';
1616

17-
const GITHUB_URL = getGitHubURL();
1817
const DEVTOOLS_VERSION = getVersionString();
1918

2019
module.exports = {

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const {resolve} = require('path');
44
const {DefinePlugin} = require('webpack');
5-
const {getGitHubURL, getVersionString} = require('./utils');
5+
const {GITHUB_URL, getVersionString} = require('./utils');
66

77
const NODE_ENV = process.env.NODE_ENV;
88
if (!NODE_ENV) {
@@ -14,7 +14,6 @@ const builtModulesDir = resolve(__dirname, '..', '..', 'build', 'node_modules');
1414

1515
const __DEV__ = NODE_ENV === 'development';
1616

17-
const GITHUB_URL = getGitHubURL();
1817
const DEVTOOLS_VERSION = getVersionString();
1918

2019
module.exports = {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
"css-loader": "^1.0.1",
3939
"raw-loader": "^3.1.0",
4040
"style-loader": "^0.23.1",
41-
"webpack": "^4.26.0",
42-
"webpack-cli": "^3.1.2",
41+
"webpack": "^4.41.2",
42+
"webpack-cli": "^3.3.10",
4343
"webpack-dev-server": "^3.3.1"
4444
}
4545
}

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const {resolve} = require('path');
22
const {DefinePlugin} = require('webpack');
33
const {
4-
getGitHubURL,
4+
GITHUB_URL,
55
getVersionString,
66
} = require('react-devtools-extensions/utils');
77

@@ -13,7 +13,6 @@ if (!NODE_ENV) {
1313

1414
const __DEV__ = true; // NODE_ENV === 'development';
1515

16-
const GITHUB_URL = getGitHubURL();
1716
const DEVTOOLS_VERSION = getVersionString();
1817

1918
module.exports = {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"css-loader": "^1.0.1",
2727
"raw-loader": "^3.1.0",
2828
"style-loader": "^0.23.1",
29-
"webpack": "^4.26.0",
30-
"webpack-cli": "^3.1.2",
29+
"webpack": "^4.41.2",
30+
"webpack-cli": "^3.3.10",
3131
"webpack-dev-server": "^3.3.1"
3232
}
3333
}

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const {resolve} = require('path');
22
const {DefinePlugin} = require('webpack');
33
const {
4-
getGitHubURL,
4+
GITHUB_URL,
55
getVersionString,
66
} = require('react-devtools-extensions/utils');
77

@@ -21,7 +21,6 @@ const builtModulesDir = resolve(__dirname, '..', '..', 'build', 'node_modules');
2121

2222
const __DEV__ = NODE_ENV === 'development';
2323

24-
const GITHUB_URL = getGitHubURL();
2524
const DEVTOOLS_VERSION = getVersionString();
2625

2726
const config = {

‎yarn.lock

+4-33
Original file line numberDiff line numberDiff line change
@@ -13157,10 +13157,10 @@ webidl-conversions@^4.0.2:
1315713157
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
1315813158
integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
1315913159

13160-
webpack-cli@^3.1.2:
13161-
version "3.3.6"
13162-
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.6.tgz#2c8c399a2642133f8d736a359007a052e060032c"
13163-
integrity sha512-0vEa83M7kJtxK/jUhlpZ27WHIOndz5mghWL2O53kiDoA9DIxSKnfqB92LoqEn77cT4f3H2cZm1BMEat/6AZz3A==
13160+
webpack-cli@^3.3.10:
13161+
version "3.3.10"
13162+
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.10.tgz#17b279267e9b4fb549023fae170da8e6e766da13"
13163+
integrity sha512-u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg==
1316413164
dependencies:
1316513165
chalk "2.4.2"
1316613166
cross-spawn "6.0.5"
@@ -13239,35 +13239,6 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1:
1323913239
source-list-map "^2.0.0"
1324013240
source-map "~0.6.1"
1324113241

13242-
webpack@^4.26.0:
13243-
version "4.39.2"
13244-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.39.2.tgz#c9aa5c1776d7c309d1b3911764f0288c8c2816aa"
13245-
integrity sha512-AKgTfz3xPSsEibH00JfZ9sHXGUwIQ6eZ9tLN8+VLzachk1Cw2LVmy+4R7ZiwTa9cZZ15tzySjeMui/UnSCAZhA==
13246-
dependencies:
13247-
"@webassemblyjs/ast" "1.8.5"
13248-
"@webassemblyjs/helper-module-context" "1.8.5"
13249-
"@webassemblyjs/wasm-edit" "1.8.5"
13250-
"@webassemblyjs/wasm-parser" "1.8.5"
13251-
acorn "^6.2.1"
13252-
ajv "^6.10.2"
13253-
ajv-keywords "^3.4.1"
13254-
chrome-trace-event "^1.0.2"
13255-
enhanced-resolve "^4.1.0"
13256-
eslint-scope "^4.0.3"
13257-
json-parse-better-errors "^1.0.2"
13258-
loader-runner "^2.4.0"
13259-
loader-utils "^1.2.3"
13260-
memory-fs "^0.4.1"
13261-
micromatch "^3.1.10"
13262-
mkdirp "^0.5.1"
13263-
neo-async "^2.6.1"
13264-
node-libs-browser "^2.2.1"
13265-
schema-utils "^1.0.0"
13266-
tapable "^1.1.3"
13267-
terser-webpack-plugin "^1.4.1"
13268-
watchpack "^1.6.0"
13269-
webpack-sources "^1.4.1"
13270-
1327113242
webpack@^4.41.2:
1327213243
version "4.41.2"
1327313244
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e"

0 commit comments

Comments
 (0)