Fixed exports field order (#3703, #3755).

src.ts/_admin/update-version.ts

@@ -67,7 +67,14 @@ function writeVersion(version: string): void {
  pkgInfo.gitHead = gitHead;
 
  // Save the package.json
- saveJson(pkgPath, pkgInfo, true);
+ const check: Record<string, number> = { "require": 1, "import": 1, "types": 1 };
+ saveJson(pkgPath, pkgInfo, (path: string, a: string, b: string) => {
+ if (path.startsWith("./") && check[a] && check[b]) {
+ if (a === "types") { return -1; }
+ if (b === "types") { return 1; }
+ }
+ return a.localeCompare(b);
+ });
 
  // Save the src.ts/_version.ts
  writeVersion(pkgInfo.version);

src.ts/_admin/utils/json.ts

@@ -9,7 +9,9 @@ export function loadJson(path: string): any {
 
 type Replacer = (key: string, value: any) => any;
 
-export function saveJson(filename: string, data: any, sort?: boolean): any {
+export type SortFunc = (parent: string, a: string, b: string) => number;
+
+export function saveJson(filename: string, data: any, sort?: boolean | SortFunc): any {
 
  let replacer: (Replacer | undefined) = undefined;
  if (sort) {
@@ -18,7 +20,13 @@ export function saveJson(filename: string, data: any, sort?: boolean): any {
  // pass
  } else if (value && typeof(value) === "object") {
  const keys = Object.keys(value);
- keys.sort();
+ let sortFunc: undefined | ((a: string, b: string) => number);
+ if (typeof(sort) === "function") {
+ sortFunc = function(a: string, b: string) {
+ return sort(key, a, b);
+ }
+ }
+ keys.sort(sortFunc);
  return keys.reduce((accum, key) => {
  accum[key] = value[key];
  return accum;

tsconfig.commonjs.json

@@ -4,7 +4,6 @@
  ],
  "extends": "./tsconfig.base.json",
  "compilerOptions": {
- "declaration": true,
  "module": "commonjs",
  "outDir": "./lib.commonjs"
  }