From f554fa91a6f2543344885e55023be4387b4eb9f1 Mon Sep 17 00:00:00 2001
From: Jack Zhao <yzhao@grailbio.com>
Date: Sun, 24 Jun 2018 15:32:53 -0700
Subject: [PATCH 1/5] support scoped packages for cra --scripts-version option
---
packages/create-react-app/createReactApp.js | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js
index 7645af388..fbf0f3c81 100755
--- a/packages/create-react-app/createReactApp.js
+++ b/packages/create-react-app/createReactApp.js
@@ -214,7 +214,9 @@ function createApp(name, verbose, version, useNpm, template) {
if (!semver.satisfies(process.version, '>=6.0.0')) {
console.log(
chalk.yellow(
- `You are using Node ${process.version} so the project will be bootstrapped with an old unsupported version of tools.\n\n` +
+ `You are using Node ${
+ process.version
+ } so the project will be bootstrapped with an old unsupported version of tools.\n\n` +
`Please update to Node 6 or higher for a better, fully supported experience.\n`
)
);
@@ -228,7 +230,9 @@ function createApp(name, verbose, version, useNpm, template) {
if (npmInfo.npmVersion) {
console.log(
chalk.yellow(
- `You are using npm ${npmInfo.npmVersion} so the project will be boostrapped with an old unsupported version of tools.\n\n` +
+ `You are using npm ${
+ npmInfo.npmVersion
+ } so the project will be boostrapped with an old unsupported version of tools.\n\n` +
`Please update to npm 3 or higher for a better, fully supported experience.\n`
)
);
@@ -409,7 +413,7 @@ function getInstallPackage(version, originalDirectory) {
if (validSemver) {
packageToInstall += `@${validSemver}`;
} else if (version) {
- if (version[0] === '@') {
+ if (version[0] === '@' && version.indexOf('/') === -1) {
packageToInstall += version;
} else if (version.match(/^file:/)) {
packageToInstall = `file:${path.resolve(
--
GitLab
From 51568d6f805378ee58311017b43e8e894fe5f1e1 Mon Sep 17 00:00:00 2001
From: Jack Zhao <yzhao@grailbio.com>
Date: Mon, 16 Jul 2018 20:27:46 -0700
Subject: [PATCH 2/5] cache yarn
---
.travis.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.travis.yml b/.travis.yml
index f27e0e9a2..4dfabf348 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ node_js:
- 8
- 9
cache:
+ yarn: true
directories:
- node_modules
- packages/create-react-app/node_modules
--
GitLab
From d63790dcee48b994550a7ae6c57fa1a013e32018 Mon Sep 17 00:00:00 2001
From: Jack Zhao <yzhao@grailbio.com>
Date: Mon, 16 Jul 2018 20:36:58 -0700
Subject: [PATCH 3/5] only cache yarn
---
.travis.yml | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 4dfabf348..6fc01a0af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,7 @@ language: node_js
node_js:
- 8
- 9
-cache:
- yarn: true
- directories:
- - node_modules
- - packages/create-react-app/node_modules
- - packages/react-scripts/node_modules
+cache: yarn
install: true
script:
- 'if [ $TEST_SUITE = "simple" ]; then tasks/e2e-simple.sh; fi'
--
GitLab
From 2eab37f862b4c2f8297876d70b2390d8e8ce6126 Mon Sep 17 00:00:00 2001
From: Jack Zhao <yzhao@grailbio.com>
Date: Thu, 20 Sep 2018 21:39:57 -0700
Subject: [PATCH 4/5] eslint 5.6
---
package.json | 2 +-
packages/react-error-overlay/package.json | 2 +-
packages/react-scripts/package.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index 2610953cc..82bb36b3d 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
"precommit": "lint-staged"
},
"devDependencies": {
- "eslint": "4.19.1",
+ "eslint": "5.6.0",
"execa": "1.0.0",
"husky": "^0.14.3",
"lerna": "2.9.1",
diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json
index b3c4e8355..b5eec1b76 100644
--- a/packages/react-error-overlay/package.json
+++ b/packages/react-error-overlay/package.json
@@ -42,7 +42,7 @@
"chalk": "^2.3.2",
"chokidar": "^2.0.2",
"cross-env": "5.1.4",
- "eslint": "4.19.1",
+ "eslint": "5.6.0",
"eslint-config-react-app": "^2.1.0",
"eslint-plugin-flowtype": "2.46.1",
"eslint-plugin-import": "2.9.0",
diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index 2811663c9..73dab1ad8 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -36,7 +36,7 @@
"css-loader": "0.28.11",
"dotenv": "6.0.0",
"dotenv-expand": "4.2.0",
- "eslint": "4.19.1",
+ "eslint": "5.6.0",
"eslint-config-react-app": "^2.1.0",
"eslint-loader": "2.1.1",
"eslint-plugin-flowtype": "2.50.1",
--
GitLab
From b1c50386ad2f236d4156996977c70a7ed34af692 Mon Sep 17 00:00:00 2001
From: Jack Zhao <yzhao@grailbio.com>
Date: Thu, 20 Sep 2018 21:42:41 -0700
Subject: [PATCH 5/5] removed config file
---
.travis.yml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 330f671e2..aea00ad24 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,11 @@ language: node_js
node_js:
- 8
- 10
-cache: yarn
+cache:
+ directories:
+ - node_modules
+ - packages/create-react-app/node_modules
+ - packages/react-scripts/node_modules
before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH="$HOME/.yarn/bin:$PATH"
--
GitLab