fix: Fix azure-pipelines' endOfLine

facebook · Sep 13, 2020 · da8f4ec · da8f4ec
1 parent e258532
commit da8f4ec
Show file tree

Hide file tree

Showing 5 changed files with 133 additions and 132 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf
diff --git a/.github/stale.yml b/.github/stale.yml
@@ -9,20 +9,20 @@ daysUntilClose: 5
 
 # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
 exemptLabels:
-  - "contributions: claimed"
-  - "contributions: up for grabs!"
-  - "good first issue"
-  - "issue: announcement"
-  - "issue: bug"
-  - "issue: needs investigation"
-  - "issue: proposal"
-  - "tag: breaking change"
-  - "tag: bug fix"
-  - "tag: documentation"
-  - "tag: enhancement"
-  - "tag: internal"
-  - "tag: new feature"
-  - "tag: underlying tools"
+  - 'contributions: claimed'
+  - 'contributions: up for grabs!'
+  - 'good first issue'
+  - 'issue: announcement'
+  - 'issue: bug'
+  - 'issue: needs investigation'
+  - 'issue: proposal'
+  - 'tag: breaking change'
+  - 'tag: bug fix'
+  - 'tag: documentation'
+  - 'tag: enhancement'
+  - 'tag: internal'
+  - 'tag: new feature'
+  - 'tag: underlying tools'
 
 # Set to true to ignore issues in a project (defaults to false)
 exemptProjects: true

diff --git a/azure-pipelines-test-job.yml b/azure-pipelines-test-job.yml
@@ -1,38 +1,38 @@
-#
-# Azure Pipelines job for building and testing create-react-app on Linux, Windows, and macOS.
-#
-
-parameters:
-  name: ''
-  testScript: ''
-  configurations:
-    LinuxNode10: { vmImage: 'ubuntu-16.04', nodeVersion: 10.x }
-    LinuxNode12: { vmImage: 'ubuntu-16.04', nodeVersion: 12.x }
-
-jobs:
-  - job: ${{ parameters.name }}
-    strategy:
-      matrix:
-        ${{ insert }}: ${{ parameters.configurations }}
-    pool:
-      vmImage: $(vmImage)
-    steps:
-      - script: |
-          git config --global core.autocrlf false
-          git config --global user.name "Create React App"
-          git config --global user.email "[email protected]"
-        displayName: 'Initialize Git config'
-
-      - checkout: self
-        path: create-react-app
-
-      - task: NodeTool@0
-        inputs:
-          versionSpec: $(nodeVersion)
-        displayName: 'Install Node.js'
-
-      - script: yarn --frozen-lockfile
-        displayName: 'Run yarn'
-
-      - bash: ${{ parameters.testScript }}
-        displayName: 'Run tests'
+#
+# Azure Pipelines job for building and testing create-react-app on Linux, Windows, and macOS.
+#
+
+parameters:
+  name: ''
+  testScript: ''
+  configurations:
+    LinuxNode10: { vmImage: 'ubuntu-16.04', nodeVersion: 10.x }
+    LinuxNode12: { vmImage: 'ubuntu-16.04', nodeVersion: 12.x }
+
+jobs:
+  - job: ${{ parameters.name }}
+    strategy:
+      matrix:
+        ${{ insert }}: ${{ parameters.configurations }}
+    pool:
+      vmImage: $(vmImage)
+    steps:
+      - script: |
+          git config --global core.autocrlf false
+          git config --global user.name "Create React App"
+          git config --global user.email "[email protected]"
+        displayName: 'Initialize Git config'
+
+      - checkout: self
+        path: create-react-app
+
+      - task: NodeTool@0
+        inputs:
+          versionSpec: $(nodeVersion)
+        displayName: 'Install Node.js'
+
+      - script: yarn --frozen-lockfile
+        displayName: 'Run yarn'
+
+      - bash: ${{ parameters.testScript }}
+        displayName: 'Run tests'
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,77 +1,77 @@
-#
-# Azure Pipelines configuration for building and testing create-react-app on Linux, Windows, and macOS.
-#
-
-trigger:
-  - master
-
-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:
-        LinuxNode10: { vmImage: 'ubuntu-16.04', nodeVersion: 10.x }
-        LinuxNode12: { vmImage: 'ubuntu-16.04', nodeVersion: 12.x }
-        WindowsNode10: { vmImage: 'windows-2019', nodeVersion: 10.x }
-        WindowsNode12: { vmImage: 'windows-2019', nodeVersion: 12.x }
-        MacNode10: { vmImage: 'macOS-10.15', nodeVersion: 10.x }
-        MacNode12: { vmImage: 'macOS-10.15', nodeVersion: 12.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'
+#
+# Azure Pipelines configuration for building and testing create-react-app on Linux, Windows, and macOS.
+#
+
+trigger:
+  - master
+
+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:
+        LinuxNode10: { vmImage: 'ubuntu-16.04', nodeVersion: 10.x }
+        LinuxNode12: { vmImage: 'ubuntu-16.04', nodeVersion: 12.x }
+        WindowsNode10: { vmImage: 'windows-2019', nodeVersion: 10.x }
+        WindowsNode12: { vmImage: 'windows-2019', nodeVersion: 12.x }
+        MacNode10: { vmImage: 'macOS-10.15', nodeVersion: 10.x }
+        MacNode12: { vmImage: 'macOS-10.15', nodeVersion: 12.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
@@ -16,7 +16,7 @@
     "screencast:error": "svg-term --cast jyu19xGl88FQ3poMY8Hbmfw8y --out screencast-error.svg --window --at 12000 --no-cursor",
     "alex": "alex .",
     "test": "cd packages/react-scripts && node bin/react-scripts.js test",
-    "format": "prettier --trailing-comma es5 --single-quote --write 'packages/*/*.js' 'packages/*/!(node_modules)/**/*.js'",
+    "format": "prettier --write 'packages/*/*.js' 'packages/*/!(node_modules)/**/*.js'",
     "compile:lockfile": "node tasks/compile-lockfile.js"
   },
   "devDependencies": {
@@ -50,8 +50,8 @@
     }
   },
   "lint-staged": {
-    "*.{js,md,css,html}": [
-      "prettier --trailing-comma es5 --single-quote --write"
+    "*.{js,json,yml,yaml,css,scss,ts,tsx,md}": [
+      "prettier --write"
     ]
   }
 }