From c1b61e5f0f98ea9e5a6e7f370f8e2c7668d03cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Mon, 14 Sep 2020 05:26:35 +0200 Subject: [PATCH] fix: Fix azure-pipelines' endOfLine (#9258) --- azure-pipelines.yml | 77 --------------------------------------------- package.json | 5 ++- 2 files changed, 2 insertions(+), 80 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8c51a73a8c2..e69de29bb2d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,77 +0,0 @@ -# -# Azure Pipelines configuration for building and testing create-react-app on Linux, Windows, and macOS. -# - -trigger: - - main - -variables: - CI: true - # Overrides the Yarn and NPM cache directories so they are on the same drive as the source. This helps improve build performance on Windows hosted agents. - YARN_CACHE_FOLDER: $(Build.SourcesDirectory)/../yarn-cache - NPM_CONFIG_CACHE: $(Build.SourcesDirectory)/../npm-cache - # Sets TEMP to be on the same drive as the cloned source on Windows. This avoids test scripts that "cd" into a directory under TEMP from failing because this directory is on a different drive from the current directory. - VSTS_OVERWRITE_TEMP: True - CRA_INTERNAL_TEST: true - -# ****************************************************************************** -# Simple test suite -# ****************************************************************************** -jobs: - - template: azure-pipelines-test-job.yml - parameters: - name: Simple - testScript: tasks/e2e-simple.sh - - # ****************************************************************************** - # Installs test suite - # ****************************************************************************** - - template: azure-pipelines-test-job.yml - parameters: - name: Installs - testScript: tasks/e2e-installs.sh - - # ****************************************************************************** - # Kitchensink test suite - # ****************************************************************************** - - template: azure-pipelines-test-job.yml - parameters: - name: Kitchensink - testScript: tasks/e2e-kitchensink.sh - - # ****************************************************************************** - # Kitchensink Eject test suite - # ****************************************************************************** - # - template: azure-pipelines-test-job.yml - # parameters: - # name: KitchensinkEject - # testScript: tasks/e2e-kitchensink-eject.sh - - # ****************************************************************************** - # Behavior test suite - # ****************************************************************************** - # - template: azure-pipelines-test-job.yml - # parameters: - # name: Behavior - # testScript: tasks/e2e-behavior.sh - # configurations: - # LinuxNode14: { vmImage: 'ubuntu-latest', nodeVersion: 14.x } - # LinuxNode16: { vmImage: 'ubuntu-latest', nodeVersion: 16.x } - # WindowsNode14: { vmImage: 'windows-2019', nodeVersion: 14.x } - # WindowsNode16: { vmImage: 'windows-2019', nodeVersion: 16.x } - # MacNode14: { vmImage: 'macOS-10.15', nodeVersion: 14.x } - # MacNode16: { vmImage: 'macOS-10.15', nodeVersion: 16.x } - - # ****************************************************************************** - # Old Node test suite - # ****************************************************************************** - - job: OldNode - pool: - vmImage: ubuntu-latest - steps: - - task: NodeTool@0 - inputs: - versionSpec: 8.x - displayName: 'Install Node.js 8.x' - - bash: tasks/e2e-old-node.sh - displayName: 'Run tests' diff --git a/package.json b/package.json index d4217526b63..e01c2c5f75a 100644 --- a/package.json +++ b/package.json @@ -18,9 +18,8 @@ "alex": "alex .", "test:integration": "jest test/integration", "test": "cd packages/react-scripts && node bin/react-scripts.js test", - "eslint": "eslint .", - "prettier": "prettier .", - "format": "npm run prettier -- --write" + "format": "prettier --trailing-comma es5 --single-quote --write 'packages/*/*.js' 'packages/*/!(node_modules)/**/*.js'", + "compile:lockfile": "node tasks/compile-lockfile.js" }, "devDependencies": { "@testing-library/jest-dom": "^5.15.1",