normalize line endings to prevent UNIX & Mac OSs to fail tests

2026-06-28 19:27:11 -04:00 · 2026-04-10 08:26:09 +00:00
parent ee856068e9
commit 0f2f84737d
3 changed files with 102 additions and 114 deletions
@@ -116,6 +116,7 @@
      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
      "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@babel/code-frame": "^7.29.0",
        "@babel/generator": "^7.29.0",
@@ -2863,6 +2864,7 @@
      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-7.0.6.tgz",
      "integrity": "sha512-DhGl4xMVFGVIyMwswXeyzdL4uXD5OGILGX5N8Y+f6W7LhC1Ze2poSNrkF/fedpVDHEEZ+PHFW0vL14I+mm8K3Q==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@octokit/auth-token": "^6.0.0",
        "@octokit/graphql": "^9.0.3",
@@ -3272,6 +3274,7 @@
      "integrity": "sha512-5Hj8aNasue7yusUt8LGCUe/AjM7RMAce8ZoyDyiFwx7Al+GbYKL+yE7g4sJk8vEr1dKIkTRARkNIJENc4CjkBQ==",
      "hasInstallScript": true,
      "license": "Apache-2.0",
+      "peer": true,
      "dependencies": {
        "@swc/counter": "^0.1.3",
        "@swc/types": "^0.1.26"
@@ -3361,9 +3364,6 @@
      "cpu": [
        "arm64"
      ],
-      "libc": [
-        "glibc"
-      ],
      "license": "Apache-2.0 AND MIT",
      "optional": true,
      "os": [
@@ -3380,9 +3380,6 @@
      "cpu": [
        "arm64"
      ],
-      "libc": [
-        "musl"
-      ],
      "license": "Apache-2.0 AND MIT",
      "optional": true,
      "os": [
@@ -3399,9 +3396,6 @@
      "cpu": [
        "ppc64"
      ],
-      "libc": [
-        "glibc"
-      ],
      "license": "Apache-2.0 AND MIT",
      "optional": true,
      "os": [
@@ -3418,9 +3412,6 @@
      "cpu": [
        "s390x"
      ],
-      "libc": [
-        "glibc"
-      ],
      "license": "Apache-2.0 AND MIT",
      "optional": true,
      "os": [
@@ -3437,9 +3428,6 @@
      "cpu": [
        "x64"
      ],
-      "libc": [
-        "glibc"
-      ],
      "license": "Apache-2.0 AND MIT",
      "optional": true,
      "os": [
@@ -3456,9 +3444,6 @@
      "cpu": [
        "x64"
      ],
-      "libc": [
-        "musl"
-      ],
      "license": "Apache-2.0 AND MIT",
      "optional": true,
      "os": [
@@ -3850,6 +3835,7 @@
      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.58.1.tgz",
      "integrity": "sha512-gGkiNMPqerb2cJSVcruigx9eHBlLG14fSdPdqMoOcBfh+vvn4iCq2C8MzUB89PrxOXk0y3GZ1yIWb9aOzL93bw==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@typescript-eslint/scope-manager": "8.58.1",
        "@typescript-eslint/types": "8.58.1",
@@ -4259,9 +4245,6 @@
      "cpu": [
        "arm64"
      ],
-      "libc": [
-        "glibc"
-      ],
      "license": "MIT",
      "optional": true,
      "os": [
@@ -4275,9 +4258,6 @@
      "cpu": [
        "arm64"
      ],
-      "libc": [
-        "musl"
-      ],
      "license": "MIT",
      "optional": true,
      "os": [
@@ -4291,9 +4271,6 @@
      "cpu": [
        "ppc64"
      ],
-      "libc": [
-        "glibc"
-      ],
      "license": "MIT",
      "optional": true,
      "os": [
@@ -4307,9 +4284,6 @@
      "cpu": [
        "riscv64"
      ],
-      "libc": [
-        "glibc"
-      ],
      "license": "MIT",
      "optional": true,
      "os": [
@@ -4323,9 +4297,6 @@
      "cpu": [
        "riscv64"
      ],
-      "libc": [
-        "musl"
-      ],
      "license": "MIT",
      "optional": true,
      "os": [
@@ -4339,9 +4310,6 @@
      "cpu": [
        "s390x"
      ],
-      "libc": [
-        "glibc"
-      ],
      "license": "MIT",
      "optional": true,
      "os": [
@@ -4355,9 +4323,6 @@
      "cpu": [
        "x64"
      ],
-      "libc": [
-        "glibc"
-      ],
      "license": "MIT",
      "optional": true,
      "os": [
@@ -4371,9 +4336,6 @@
      "cpu": [
        "x64"
      ],
-      "libc": [
-        "musl"
-      ],
      "license": "MIT",
      "optional": true,
      "os": [
@@ -4445,6 +4407,7 @@
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
      "license": "MIT",
+      "peer": true,
      "bin": {
        "acorn": "bin/acorn"
      },
@@ -4632,6 +4595,7 @@
      "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.0.tgz",
      "integrity": "sha512-wWyJDlAatxk30ZJer+GeCWS209sA42X+N5jU2jy6oHTp7ufw8uzUTVFBX9+wTfAlhiJXGS0Bq7X6efruWjuK9Q==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "follow-redirects": "^1.15.11",
        "form-data": "^4.0.5",
@@ -5005,6 +4969,7 @@
        }
      ],
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "baseline-browser-mapping": "^2.10.12",
        "caniuse-lite": "^1.0.30001782",
@@ -6145,6 +6110,7 @@
      "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.2.0.tgz",
      "integrity": "sha512-+L0vBFYGIpSNIt/KWTpFonPrqYvgKw1eUI5Vn7mEogrQcWtWYtNQ7dNqC+px/J0idT3BAkiWrhfS7k+Tum8TUA==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.8.0",
        "@eslint-community/regexpp": "^4.12.2",
@@ -11260,6 +11226,7 @@
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -11420,6 +11387,7 @@
      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.2.tgz",
      "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==",
      "license": "Apache-2.0",
+      "peer": true,
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
@@ -11928,6 +11896,7 @@
      "version": "7.29.0",
      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
      "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
+      "peer": true,
      "requires": {
        "@babel/code-frame": "^7.29.0",
        "@babel/generator": "^7.29.0",
@@ -13614,6 +13583,7 @@
      "version": "7.0.6",
      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-7.0.6.tgz",
      "integrity": "sha512-DhGl4xMVFGVIyMwswXeyzdL4uXD5OGILGX5N8Y+f6W7LhC1Ze2poSNrkF/fedpVDHEEZ+PHFW0vL14I+mm8K3Q==",
+      "peer": true,
      "requires": {
        "@octokit/auth-token": "^6.0.0",
        "@octokit/graphql": "^9.0.3",
@@ -13915,6 +13885,7 @@
      "version": "1.15.24",
      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.15.24.tgz",
      "integrity": "sha512-5Hj8aNasue7yusUt8LGCUe/AjM7RMAce8ZoyDyiFwx7Al+GbYKL+yE7g4sJk8vEr1dKIkTRARkNIJENc4CjkBQ==",
+      "peer": true,
      "requires": {
        "@swc/core-darwin-arm64": "1.15.24",
        "@swc/core-darwin-x64": "1.15.24",
@@ -14290,6 +14261,7 @@
      "version": "8.58.1",
      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.58.1.tgz",
      "integrity": "sha512-gGkiNMPqerb2cJSVcruigx9eHBlLG14fSdPdqMoOcBfh+vvn4iCq2C8MzUB89PrxOXk0y3GZ1yIWb9aOzL93bw==",
+      "peer": true,
      "requires": {
        "@typescript-eslint/scope-manager": "8.58.1",
        "@typescript-eslint/types": "8.58.1",
@@ -14579,7 +14551,8 @@
    "acorn": {
      "version": "8.16.0",
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
-      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="
+      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
+      "peer": true
    },
    "acorn-jsx": {
      "version": "5.3.2",
@@ -14701,6 +14674,7 @@
      "version": "1.15.0",
      "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.0.tgz",
      "integrity": "sha512-wWyJDlAatxk30ZJer+GeCWS209sA42X+N5jU2jy6oHTp7ufw8uzUTVFBX9+wTfAlhiJXGS0Bq7X6efruWjuK9Q==",
+      "peer": true,
      "requires": {
        "follow-redirects": "^1.15.11",
        "form-data": "^4.0.5",
@@ -14942,6 +14916,7 @@
      "version": "4.28.2",
      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz",
      "integrity": "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==",
+      "peer": true,
      "requires": {
        "baseline-browser-mapping": "^2.10.12",
        "caniuse-lite": "^1.0.30001782",
@@ -15735,6 +15710,7 @@
      "version": "10.2.0",
      "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.2.0.tgz",
      "integrity": "sha512-+L0vBFYGIpSNIt/KWTpFonPrqYvgKw1eUI5Vn7mEogrQcWtWYtNQ7dNqC+px/J0idT3BAkiWrhfS7k+Tum8TUA==",
+      "peer": true,
      "requires": {
        "@eslint-community/eslint-utils": "^4.8.0",
        "@eslint-community/regexpp": "^4.12.2",
@@ -19166,7 +19142,8 @@
        "picomatch": {
          "version": "4.0.4",
          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-          "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A=="
+          "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+          "peer": true
        }
      }
    },
@@ -19270,7 +19247,8 @@
    "typescript": {
      "version": "6.0.2",
      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.2.tgz",
-      "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ=="
+      "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==",
+      "peer": true
    },
    "undici": {
      "version": "7.24.7",
@@ -1,41 +1,47 @@
-import { execSync } from 'child_process'
-import fs from 'fs-extra'
-import { pathToFileURL } from 'node:url'
-
-const ENV_VAR = 'cross-env SITES_DIR=tests/__data__/output/sites'
-
-beforeEach(() => {
-  fs.emptyDirSync('tests/__data__/output')
-  fs.mkdirSync('tests/__data__/output/sites')
-})
-
-it('can create new site config from template', () => {
-  const cmd = `${ENV_VAR} npm run sites:init --- example.com`
-
-  const stdout = execSync(cmd, { encoding: 'utf8' })
-  if (process.env.DEBUG === 'true') console.log(cmd, stdout)
-
-  expect(exists('tests/__data__/output/sites/example.com')).toBe(true)
-  expect(exists('tests/__data__/output/sites/example.com/example.com.test.js')).toBe(true)
-  expect(exists('tests/__data__/output/sites/example.com/example.com.config.js')).toBe(true)
-  expect(exists('tests/__data__/output/sites/example.com/readme.md')).toBe(true)
-  expect(content('tests/__data__/output/sites/example.com/example.com.test.js')).toEqual(
-    content('tests/__data__/expected/sites_init/example.com.test.js')
-  )
-  expect(content('tests/__data__/output/sites/example.com/example.com.config.js')).toEqual(
-    content('tests/__data__/expected/sites_init/example.com.config.js')
-  )
-  expect(content('tests/__data__/output/sites/example.com/readme.md')).toEqual(
-    content('tests/__data__/expected/sites_init/readme.md')
-  )
-})
-
-function content(filepath: string) {
-  return fs.readFileSync(pathToFileURL(filepath), {
-    encoding: 'utf8'
-  })
-}
-
-function exists(filepath: string) {
-  return fs.existsSync(pathToFileURL(filepath))
-}
+import { execSync } from 'child_process'
+import fs from 'fs-extra'
+import { pathToFileURL } from 'node:url'
+
+const ENV_VAR = 'cross-env SITES_DIR=tests/__data__/output/sites'
+
+beforeEach(() => {
+  fs.emptyDirSync('tests/__data__/output')
+  fs.mkdirSync('tests/__data__/output/sites')
+})
+
+it('can create new site config from template', () => {
+  const cmd = `${ENV_VAR} npm run sites:init --- example.com`
+
+  const stdout = execSync(cmd, { encoding: 'utf8' })
+  if (process.env.DEBUG === 'true') console.log(cmd, stdout)
+
+  expect(exists('tests/__data__/output/sites/example.com')).toBe(true)
+  expect(exists('tests/__data__/output/sites/example.com/example.com.test.js')).toBe(true)
+  expect(exists('tests/__data__/output/sites/example.com/example.com.config.js')).toBe(true)
+  expect(exists('tests/__data__/output/sites/example.com/readme.md')).toBe(true)
+  expect(content('tests/__data__/output/sites/example.com/example.com.test.js')).toEqual(
+    content('tests/__data__/expected/sites_init/example.com.test.js')
+  )
+  expect(content('tests/__data__/output/sites/example.com/example.com.config.js')).toEqual(
+    content('tests/__data__/expected/sites_init/example.com.config.js')
+  )
+  expect(content('tests/__data__/output/sites/example.com/readme.md')).toEqual(
+    content('tests/__data__/expected/sites_init/readme.md')
+  )
+})
+
+function content(filepath: string) {
+  return normalizeLineEndings(
+    fs.readFileSync(pathToFileURL(filepath), {
+      encoding: 'utf8'
+    })
+  )
+}
+
+function normalizeLineEndings(data: string) {
+  return data.replace(/\r\n/g, '\n').replace(/\r/g, '\n')
+}
+
+function exists(filepath: string) {
+  return fs.existsSync(pathToFileURL(filepath))
+}
@@ -1,28 +1,32 @@
-import { execSync } from 'child_process'
-import fs from 'fs-extra'
-import { pathToFileURL } from 'node:url'
-
-const ENV_VAR = 'cross-env SITES_DIR=tests/__data__/input/sites_update/sites ROOT_DIR=tests/__data__/output'
-
-beforeEach(() => {
-  fs.emptyDirSync('tests/__data__/output')
-})
-
-it('can update SITES.md', () => {
-  const cmd = `${ENV_VAR} npm run sites:update`
-
-  const stdout = execSync(cmd, { encoding: 'utf8' })
-  if (process.env.DEBUG === 'true') console.log(cmd, stdout)
-
-  expect(content('tests/__data__/output/SITES.md')).toEqual(
-    content('tests/__data__/expected/sites_update/SITES.md')
-  )
-})
-
-function content(filepath: string) {
-  const data = fs.readFileSync(pathToFileURL(filepath), {
-    encoding: 'utf8'
-  })
-
-  return JSON.stringify(data)
-}
+import { execSync } from 'child_process'
+import fs from 'fs-extra'
+import { pathToFileURL } from 'node:url'
+
+const ENV_VAR = 'cross-env SITES_DIR=tests/__data__/input/sites_update/sites ROOT_DIR=tests/__data__/output'
+
+beforeEach(() => {
+  fs.emptyDirSync('tests/__data__/output')
+})
+
+it('can update SITES.md', () => {
+  const cmd = `${ENV_VAR} npm run sites:update`
+
+  const stdout = execSync(cmd, { encoding: 'utf8' })
+  if (process.env.DEBUG === 'true') console.log(cmd, stdout)
+
+  expect(content('tests/__data__/output/SITES.md')).toEqual(
+    content('tests/__data__/expected/sites_update/SITES.md')
+  )
+})
+
+function content(filepath: string) {
+  const data = fs.readFileSync(pathToFileURL(filepath), {
+    encoding: 'utf8'
+  })
+
+  return JSON.stringify(normalizeLineEndings(data))
+}
+
+function normalizeLineEndings(data: string) {
+  return data.replace(/\r\n/g, '\n').replace(/\r/g, '\n')
+}