Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tsconfig/bases
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8fee7129ada13c7c779472ebb29130fa9581cf1c
Choose a base ref
...
head repository: tsconfig/bases
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: be6b3bb160889347b8614e8d18e1e88c40f8ecc9
Choose a head ref
  • 13 commits
  • 19 files changed
  • 3 contributors

Commits on Mar 22, 2024

  1. Set recommended target to es2016

    zanminkian committed Mar 22, 2024
    Copy the full SHA
    f5c8ff2 View commit details
  2. Remove forceConsistentCasingInFileNames

    zanminkian committed Mar 22, 2024
    Copy the full SHA
    ebe629c View commit details

Commits on Mar 23, 2024

  1. Merge pull request #260 from zanminkian/zmj/forceConsistentCasingInFi…

    …leNames
    
    Remove `forceConsistentCasingInFileNames`
    orta authored Mar 23, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    4ace9bf View commit details
  2. Merge pull request #259 from zanminkian/zmj/recommended

    Set recommended target to `es2016`
    orta authored Mar 23, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    b02260d View commit details

Commits on Mar 25, 2024

  1. Drop display field

    yinm committed Mar 25, 2024
    Copy the full SHA
    7fa77da View commit details
  2. Copy the full SHA
    caec0fe View commit details
  3. Fix error that 'readLines' does not exist

    Use a version that is same version at `deploy-changed-npm-packages.ts`
    yinm committed Mar 25, 2024
    Copy the full SHA
    a4353d8 View commit details
  4. deno run --allow-read --allow-run --allow-env --allow-write --allow-n…

    …et scripts/generate-recommend.ts
    yinm committed Mar 25, 2024
    Copy the full SHA
    8264879 View commit details
  5. Copy the full SHA
    2b4aacf View commit details
  6. deno run --allow-read --allow-run --allow-env --allow-write --allow-n…

    …et scripts/generate-recommend.ts
    yinm committed Mar 25, 2024
    Copy the full SHA
    7ca1d5c View commit details

Commits on Mar 26, 2024

  1. Remove unnecessary override

    yinm committed Mar 26, 2024
    Copy the full SHA
    11277a3 View commit details
  2. deno run --allow-read --allow-run --allow-env --allow-write --allow-n…

    …et scripts/generate-recommend.ts
    yinm committed Mar 26, 2024
    Copy the full SHA
    15ede8e View commit details

Commits on Mar 27, 2024

  1. Merge pull request #258 from yinm/remove-display-field

    Drop `display` field
    orta authored Mar 27, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    be6b3bb View commit details
1 change: 0 additions & 1 deletion bases/create-react-app.json
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@
"allowJs": true,
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"isolatedModules": true,
"jsx": "react-jsx",
"noEmit": true,
1 change: 0 additions & 1 deletion bases/next.json
Original file line number Diff line number Diff line change
@@ -8,7 +8,6 @@
"allowJs": true,
"skipLibCheck": true,
"strict": true,
"forceConsistentCasingInFileNames": true,
"noEmit": true,
"esModuleInterop": true,
"module": "esnext",
1 change: 0 additions & 1 deletion bases/node-lts.json
Original file line number Diff line number Diff line change
@@ -13,7 +13,6 @@
"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"moduleResolution": "node16"
}
}
1 change: 0 additions & 1 deletion bases/node10.json
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@
"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"moduleResolution": "node"
}
}
1 change: 0 additions & 1 deletion bases/node12.json
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@
"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"moduleResolution": "node16"
}
}
1 change: 0 additions & 1 deletion bases/node14.json
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@
"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"moduleResolution": "node16"
}
}
1 change: 0 additions & 1 deletion bases/node16.json
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@
"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"moduleResolution": "node16"
}
}
1 change: 0 additions & 1 deletion bases/node17.json
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@
"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"useDefineForClassFields": true,
"moduleResolution": "node16"
}
1 change: 0 additions & 1 deletion bases/node18.json
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@
"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"moduleResolution": "node16"
}
}
1 change: 0 additions & 1 deletion bases/node19.json
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@
"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"moduleResolution": "node16"
}
}
1 change: 0 additions & 1 deletion bases/node20.json
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@
"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"moduleResolution": "node16"
}
}
1 change: 0 additions & 1 deletion bases/node21.json
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@
"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"moduleResolution": "node16"
}
}
1 change: 0 additions & 1 deletion bases/react-native.json
Original file line number Diff line number Diff line change
@@ -29,7 +29,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"allowSyntheticDefaultImports": true,
"forceConsistentCasingInFileNames": false,
"esModuleInterop": true,
"skipLibCheck": true
}
12 changes: 6 additions & 6 deletions bases/recommended.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"compilerOptions": {
"target": "es2015",
"target": "es2016",
"module": "commonjs",
"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true
"forceConsistentCasingInFileNames": true,
"strict": true,
"skipLibCheck": true
},
"$schema": "https://json.schemastore.org/tsconfig",
"display": "Recommended"
"display": "Recommended",
"$schema": "https://json.schemastore.org/tsconfig"
}
1 change: 0 additions & 1 deletion bases/remix.json
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@
"target": "es2019",
"strict": true,
"allowJs": true,
"forceConsistentCasingInFileNames": true,
"baseUrl": ".",
"paths": {
"~/*": ["./app/*"]
3 changes: 1 addition & 2 deletions bases/strictest.json
Original file line number Diff line number Diff line change
@@ -17,8 +17,7 @@
"checkJs": true,

"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true
"skipLibCheck": true
},
"$schema": "https://json.schemastore.org/tsconfig",
"display": "Strictest",
3 changes: 1 addition & 2 deletions bases/svelte.json
Original file line number Diff line number Diff line change
@@ -20,7 +20,6 @@

"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true
"skipLibCheck": true
}
}
5 changes: 4 additions & 1 deletion scripts/create-npm-packages.ts
Original file line number Diff line number Diff line change
@@ -26,6 +26,9 @@ for await (const tsconfigEntry of Deno.readDir("bases")) {
const tsconfigText = await Deno.readTextFile(newPackageTSConfigPath)
const tsconfigJSON = JSON.parse(stripJsonComments(tsconfigText))

// Drop `display` field in tsconfig.json for npm package
await Deno.writeTextFile(newPackageTSConfigPath, tsconfigText.replace(/\s*"display.*/,''))

// Edit the package.json
const packageText = await Deno.readTextFile(path.join(packagePath, "package.json"))
const packageJSON = JSON.parse(packageText)
@@ -44,7 +47,7 @@ for await (const tsconfigEntry of Deno.readDir("bases")) {
let packageText = await Deno.readTextFile(fileToEdit)
packageText = packageText.replace(/\[filename\]/g, name)
.replace(/\[display_title\]/g, title)
.replace(/\[tsconfig\]/g, Deno.readTextFileSync(tsconfigFilePath))
.replace(/\[tsconfig\]/g, Deno.readTextFileSync(newPackageTSConfigPath))

// Inject readme-extra if any
try {
6 changes: 3 additions & 3 deletions scripts/generate-recommend.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import stripJsonComments from "https://esm.sh/strip-json-comments";
import * as bufio from "https://deno.land/std/io/buffer.ts";
import * as bufio from "https://deno.land/std@0.164.0/io/buffer.ts";
import * as path from "https://deno.land/std/path/mod.ts";

const tsconfigStorage = await Deno.makeTempDir({ prefix: "tsconfig" });
@@ -14,9 +14,9 @@ let packageText = await Deno.readTextFile(path.join(tsconfigStorage, "tsconfig.j
// This will strip comments
const parsed = JSON.parse(stripJsonComments(packageText));

parsed["$schema"] = "https://json.schemastore.org/tsconfig";
// `display` field will be dropped at generating npm package, so prevent the order from being last in the JSON file
parsed.display = "Recommended";
parsed.compilerOptions.target = "ES2015";
parsed["$schema"] = "https://json.schemastore.org/tsconfig";

const result = JSON.stringify(parsed, null, " ");