From cbe30022e98beecd0366caba9fb81f88d0290566 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Wed, 26 Aug 2020 21:15:28 -0400 Subject: [PATCH 1/4] Rename ./rescources/jest to ./resources/jest.sh --- package.json | 4 ++-- resources/{jest => jest.sh} | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) rename resources/{jest => jest.sh} (96%) mode change 100755 => 100644 diff --git a/package.json b/package.json index 5d2b263908..89a77a730c 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,8 @@ "lint": "run-s lint:*", "lint:ts": "tslint \"__tests__/**/*.ts\"", "lint:js": "eslint \"{__tests__,src,pages/src,pages/lib}/**/*.js\"", - "format": "prettier --single-quote --trailing-comma=es5 --write \"{__tests__,src,pages/src,pages/lib,perf,resources}/**/*{\\.js,\\.ts}\"", - "testonly": "./resources/jest", + "format": "prettier --single-quote --trailing-comma=es5 --write \"{__tests__,src,pages/src,pages/lib,perf,resources}/**/*{.js,.ts}\"", + "testonly": "./resources/jest.sh", "test": "run-s format build lint testonly test:types:*", "test:travis": "npm run test && ./resources/check-changes", "test:types:ts": "tsc ./type-definitions/Immutable.d.ts --lib es2015 && dtslint type-definitions/ts-tests", diff --git a/resources/jest b/resources/jest.sh old mode 100755 new mode 100644 similarity index 96% rename from resources/jest rename to resources/jest.sh index 98ecbc9d56..dc08dfa784 --- a/resources/jest +++ b/resources/jest.sh @@ -1,8 +1,8 @@ -#!/bin/bash - -# Copyright (c) 2014-present, Facebook, Inc. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -if [[ $TRAVIS ]]; then jest --no-cache -i; else jest --no-cache; fi; +#!/bin/bash + +# Copyright (c) 2014-present, Facebook, Inc. +# +# This source code is licensed under the MIT license found in the +# LICENSE file in the root directory of this source tree. + +if [[ $TRAVIS ]]; then jest --no-cache -i; else jest --no-cache; fi; From a7e5a7c1f1f976d7b949930f39cf77179fe3be92 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Wed, 26 Aug 2020 21:18:00 -0400 Subject: [PATCH 2/4] Oops --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 89a77a730c..c7b665a8cb 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "lint": "run-s lint:*", "lint:ts": "tslint \"__tests__/**/*.ts\"", "lint:js": "eslint \"{__tests__,src,pages/src,pages/lib}/**/*.js\"", - "format": "prettier --single-quote --trailing-comma=es5 --write \"{__tests__,src,pages/src,pages/lib,perf,resources}/**/*{.js,.ts}\"", + "format": "prettier --single-quote --trailing-comma=es5 --write \"{__tests__,src,pages/src,pages/lib,perf,resources}/**/*{\\.js,\\.ts}\"", "testonly": "./resources/jest.sh", "test": "run-s format build lint testonly test:types:*", "test:travis": "npm run test && ./resources/check-changes", From 10e10d523e6aded2ec83298deb25e4ed9341cfec Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Wed, 26 Aug 2020 21:19:42 -0400 Subject: [PATCH 3/4] Update permissions --- resources/jest.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 resources/jest.sh diff --git a/resources/jest.sh b/resources/jest.sh old mode 100644 new mode 100755 From 64e47a976e7094dc115bf30381f6df5fd60eb784 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Wed, 26 Aug 2020 21:20:43 -0400 Subject: [PATCH 4/4] LF --- resources/jest.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/jest.sh b/resources/jest.sh index dc08dfa784..98ecbc9d56 100755 --- a/resources/jest.sh +++ b/resources/jest.sh @@ -1,8 +1,8 @@ -#!/bin/bash - -# Copyright (c) 2014-present, Facebook, Inc. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -if [[ $TRAVIS ]]; then jest --no-cache -i; else jest --no-cache; fi; +#!/bin/bash + +# Copyright (c) 2014-present, Facebook, Inc. +# +# This source code is licensed under the MIT license found in the +# LICENSE file in the root directory of this source tree. + +if [[ $TRAVIS ]]; then jest --no-cache -i; else jest --no-cache; fi;