@distilled.cloud/cloudflare-rolldown-plugin 0.4.1 → 0.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/plugins/options.ts"],"names":[],"mappings":"AAkCA,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC;AAED,eAAO,MAAM,aAAa,kDAmIxB,CAAC"}
1
+ {"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/plugins/options.ts"],"names":[],"mappings":"AAwBA,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC;AAED,eAAO,MAAM,aAAa,kDAoIxB,CAAC"}
@@ -2,16 +2,8 @@ import path from "node:path";
2
2
  import { createPlugin } from "../factory.js";
3
3
  import { hasNodejsCompat } from "../utils.js";
4
4
  import { WORKER_ENTRY_PREFIX } from "./virtual-modules.js";
5
- function getConditions(options) {
6
- return hasNodejsCompat(options.compatibilityFlags)
7
- ? ["workerd", "worker", "node", "module"]
8
- : ["workerd", "worker", "module", "browser"];
9
- }
10
- function getMainFields(options) {
11
- return hasNodejsCompat(options.compatibilityFlags)
12
- ? ["module", "main", "jsnext:main", "jsnext"]
13
- : ["browser", "module", "jsnext:main", "jsnext"];
14
- }
5
+ const DEFAULT_RESOLVE_CONDITION_NAMES = ["workerd", "worker", "module", "browser"];
6
+ const DEFAULT_RESOLVE_MAIN_FIELDS = ["browser", "module", "jsnext:main", "jsnext"];
15
7
  const DEFAULT_RESOLVE_EXTENSIONS = [
16
8
  ".mjs",
17
9
  ".js",
@@ -40,8 +32,8 @@ export const optionsPlugin = createPlugin("options", (pluginOptions) => {
40
32
  options.preserveEntrySignatures ??= "strict";
41
33
  options.platform ??= "neutral";
42
34
  options.resolve ??= {};
43
- options.resolve.conditionNames ??= [...getConditions(pluginOptions), "production"];
44
- options.resolve.mainFields ??= getMainFields(pluginOptions);
35
+ options.resolve.conditionNames ??= [...DEFAULT_RESOLVE_CONDITION_NAMES, "production"];
36
+ options.resolve.mainFields ??= DEFAULT_RESOLVE_MAIN_FIELDS;
45
37
  options.resolve.extensions ??= DEFAULT_RESOLVE_EXTENSIONS;
46
38
  options.transform ??= {};
47
39
  options.transform.target ??= TARGET;
@@ -63,15 +55,13 @@ export const optionsPlugin = createPlugin("options", (pluginOptions) => {
63
55
  preserveEntrySignatures: "strict",
64
56
  };
65
57
  const define = getDefine(pluginOptions, process.env.NODE_ENV || userConfig.mode || "production");
66
- const conditions = getConditions(pluginOptions);
67
- const mainFields = getMainFields(pluginOptions);
68
58
  const appType = userConfig.appType ?? (Object.keys(input).length === 0 ? "spa" : "custom");
69
59
  return {
70
60
  appType,
71
61
  ssr: {
72
62
  noExternal: true,
73
63
  resolve: {
74
- conditions: [...conditions, "development|production"],
64
+ conditions: [...DEFAULT_RESOLVE_CONDITION_NAMES, "development|production"],
75
65
  },
76
66
  },
77
67
  builder: appType === "spa"
@@ -92,7 +82,7 @@ export const optionsPlugin = createPlugin("options", (pluginOptions) => {
92
82
  ssr: {
93
83
  resolve: {
94
84
  noExternal: true,
95
- conditions: [...conditions, "development|production"],
85
+ conditions: [...DEFAULT_RESOLVE_CONDITION_NAMES, "development|production"],
96
86
  },
97
87
  build: {
98
88
  ssr: true,
@@ -106,7 +96,7 @@ export const optionsPlugin = createPlugin("options", (pluginOptions) => {
106
96
  ...rollupOptions,
107
97
  platform: "neutral",
108
98
  resolve: {
109
- mainFields,
99
+ mainFields: DEFAULT_RESOLVE_MAIN_FIELDS,
110
100
  extensions: DEFAULT_RESOLVE_EXTENSIONS,
111
101
  },
112
102
  },
@@ -122,8 +112,11 @@ export const optionsPlugin = createPlugin("options", (pluginOptions) => {
122
112
  rolldownOptions: {
123
113
  platform: "neutral",
124
114
  resolve: {
125
- conditionNames: [...conditions, "development|production"],
126
- mainFields,
115
+ conditionNames: [
116
+ ...DEFAULT_RESOLVE_CONDITION_NAMES,
117
+ "development|production",
118
+ ],
119
+ mainFields: DEFAULT_RESOLVE_MAIN_FIELDS,
127
120
  extensions: DEFAULT_RESOLVE_EXTENSIONS,
128
121
  },
129
122
  transform: {
@@ -135,9 +128,9 @@ export const optionsPlugin = createPlugin("options", (pluginOptions) => {
135
128
  : {
136
129
  esbuildOptions: {
137
130
  platform: "neutral",
138
- conditions: [...conditions, "development|production"],
131
+ conditions: [...DEFAULT_RESOLVE_CONDITION_NAMES, "development|production"],
139
132
  resolveExtensions: DEFAULT_RESOLVE_EXTENSIONS,
140
- mainFields,
133
+ mainFields: DEFAULT_RESOLVE_MAIN_FIELDS,
141
134
  target: TARGET,
142
135
  define,
143
136
  },
@@ -1 +1 @@
1
- {"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/plugins/options.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE3D,SAAS,aAAa,CAAC,OAAgC;IACrD,OAAO,eAAe,CAAC,OAAO,CAAC,kBAAkB,CAAC;QAChD,CAAC,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC;QACzC,CAAC,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,aAAa,CAAC,OAAgC;IACrD,OAAO,eAAe,CAAC,OAAO,CAAC,kBAAkB,CAAC;QAChD,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC;QAC7C,CAAC,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,0BAA0B,GAAG;IACjC,MAAM;IACN,KAAK;IACL,MAAM;IACN,KAAK;IACL,MAAM;IACN,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;IACN,MAAM;CACP,CAAC;AAEF,MAAM,MAAM,GAAG,QAAQ,CAAC;AAMxB,MAAM,CAAC,MAAM,aAAa,GAAG,YAAY,CAAwB,SAAS,EAAE,CAAC,aAAa,EAAE,EAAE;IAC5F,IAAI,KAAK,GAA2B,EAAE,CAAC;IACvC,OAAO;QACL,MAAM,EAAE;YACN,GAAG,EAAE;gBACH,KAAK,EAAE,GAAG,EAAE,CAAC,KAAK;aACnB;SACF;QACD,QAAQ,EAAE;YACR,OAAO,CAAC,OAAO;gBACb,KAAK,GAAG,cAAc,CAAC,aAAa,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;gBAClE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;gBACjC,OAAO,CAAC,uBAAuB,KAAK,QAAQ,CAAC;gBAC7C,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC;gBAC/B,OAAO,CAAC,OAAO,KAAK,EAAE,CAAC;gBACvB,OAAO,CAAC,OAAO,CAAC,cAAc,KAAK,CAAC,GAAG,aAAa,CAAC,aAAa,CAAC,EAAE,YAAY,CAAC,CAAC;gBACnF,OAAO,CAAC,OAAO,CAAC,UAAU,KAAK,aAAa,CAAC,aAAa,CAAC,CAAC;gBAC5D,OAAO,CAAC,OAAO,CAAC,UAAU,KAAK,0BAA0B,CAAC;gBAC1D,OAAO,CAAC,SAAS,KAAK,EAAE,CAAC;gBACzB,OAAO,CAAC,SAAS,CAAC,MAAM,KAAK,MAAM,CAAC;gBACpC,OAAO,CAAC,SAAS,CAAC,MAAM,KAAK,EAAE,CAAC;gBAChC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC;gBAChF,OAAO,OAAO,CAAC;YACjB,CAAC;SACF;QACD,IAAI,EAAE;YACJ,KAAK,CAAC,MAAM,CAAC,UAAU;gBACrB,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;gBAClC,MAAM,UAAU,GAAG,iBAAiB,IAAI,IAAI,CAAC,IAAI,CAAC;gBAClD,KAAK,GAAG,cAAc,CACpB,aAAa,CAAC,IAAI;oBAChB,UAAU,CAAC,YAAY,EAAE,GAAG,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK;oBAC3D,UAAU,CAAC,YAAY,EAAE,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK;oBACzD,EAAE,CACL,CAAC;gBACF,MAAM,aAAa,GAA8B;oBAC/C,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC;oBACvB,uBAAuB,EAAE,QAAQ;iBAClC,CAAC;gBACF,MAAM,MAAM,GAAG,SAAS,CACtB,aAAa,EACb,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,UAAU,CAAC,IAAI,IAAI,YAAY,CACxD,CAAC;gBACF,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;gBAChD,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;gBAChD,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;gBAC3F,OAAO;oBACL,OAAO;oBACP,GAAG,EAAE;wBACH,UAAU,EAAE,IAAI;wBAChB,OAAO,EAAE;4BACP,UAAU,EAAE,CAAC,GAAG,UAAU,EAAE,wBAAwB,CAAC;yBACtD;qBACF;oBACD,OAAO,EACL,OAAO,KAAK,KAAK;wBACf,CAAC,CAAC,SAAS;wBACX,CAAC,CAAC;4BACE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;gCACtB,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;oCAC1D,MAAM,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;gCAC/B,CAAC;4BACH,CAAC;yBACF;oBACP,YAAY,EAAE;wBACZ,MAAM,EAAE;4BACN,KAAK,EAAE;gCACL,MAAM,EAAE,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC;6BACjD;yBACF;wBACD,GAAG,EAAE;4BACH,OAAO,EAAE;gCACP,UAAU,EAAE,IAAI;gCAChB,UAAU,EAAE,CAAC,GAAG,UAAU,EAAE,wBAAwB,CAAC;6BACtD;4BACD,KAAK,EAAE;gCACL,GAAG,EAAE,IAAI;gCACT,MAAM,EAAE,MAAM;gCACd,UAAU,EAAE,IAAI;gCAChB,aAAa,EAAE,KAAK;gCACpB,MAAM,EAAE,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC;gCAChD,GAAG,CAAC,UAAU;oCACZ,CAAC,CAAC;wCACE,eAAe,EAAE;4CACf,GAAG,aAAa;4CAChB,QAAQ,EAAE,SAAS;4CACnB,OAAO,EAAE;gDACP,UAAU;gDACV,UAAU,EAAE,0BAA0B;6CACvC;yCACF;qCACF;oCACH,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC;6BACvB;4BACD,YAAY,EAAE;gCACZ,WAAW,EAAE,KAAK;gCAClB,sBAAsB,EAAE,IAAI;gCAC5B,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;gCAChF,GAAG,CAAC,UAAU;oCACZ,CAAC,CAAC;wCACE,eAAe,EAAE;4CACf,QAAQ,EAAE,SAAS;4CACnB,OAAO,EAAE;gDACP,cAAc,EAAE,CAAC,GAAG,UAAU,EAAE,wBAAwB,CAAC;gDACzD,UAAU;gDACV,UAAU,EAAE,0BAA0B;6CACvC;4CACD,SAAS,EAAE;gDACT,MAAM,EAAE,MAAM;gDACd,MAAM;6CACP;yCACF;qCACF;oCACH,CAAC,CAAC;wCACE,cAAc,EAAE;4CACd,QAAQ,EAAE,SAAS;4CACnB,UAAU,EAAE,CAAC,GAAG,UAAU,EAAE,wBAAwB,CAAC;4CACrD,iBAAiB,EAAE,0BAA0B;4CAC7C,UAAU;4CACV,MAAM,EAAE,MAAM;4CACd,MAAM;yCACP;qCACF,CAAC;6BACP;4BACD,cAAc,EAAE,IAAI;yBACrB;qBACF;iBACF,CAAC;YACJ,CAAC;SACF;KACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,CACrB,KAAsD,EAC9B,EAAE;IAC1B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC;IACxD,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChC,OAAO,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC;SAAM,CAAC;QACN,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,KAA6B,EAAE,EAAE,CAClD,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,mBAAmB,GAAG,EAAE,EAAW,CAAC,CAAC,CACxF,CAAC;AAEJ,SAAS,SAAS,CAAC,OAAgC,EAAE,OAAe;IAClE,OAAO;QACL,sBAAsB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;QAC/C,6BAA6B,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;QACtD,iCAAiC,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;QAC1D,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,kBAAkB,CAAC;YAC7C,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC;gBACE,aAAa,EAAE,IAAI;gBACnB,oBAAoB,EAAE,IAAI;gBAC1B,wBAAwB,EAAE,IAAI;aAC/B,CAAC;QACN,GAAG,CAAC,OAAO,CAAC,iBAAiB,IAAI,OAAO,CAAC,iBAAiB,IAAI,YAAY;YACxE,CAAC,CAAC;gBACE,qBAAqB,EAAE,sBAAsB;aAC9C;YACH,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,OAAO,KAAK,YAAY;YAC1B,CAAC,CAAC;gBACE,iBAAiB,EAAE,OAAO;aAC3B;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,UAA2B,EAAE,eAAuB;IAC9E,MAAM,mBAAmB,GAAG,UAAU,CAAC,KAAK,EAAE,MAAM,IAAI,MAAM,CAAC;IAE/D,OAAO,CACL,UAAU,CAAC,YAAY,EAAE,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,MAAM;QACzD,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAChD,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/plugins/options.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@distilled.cloud/cloudflare-rolldown-plugin",
3
- "version": "0.4.1",
3
+ "version": "0.4.2",
4
4
  "description": "Rolldown plugin for Cloudflare Workers.",
5
5
  "keywords": [
6
6
  "cloudflare",
@@ -5,18 +5,8 @@ import type { CloudflarePluginOptions } from "../options.js";
5
5
  import { hasNodejsCompat } from "../utils.js";
6
6
  import { WORKER_ENTRY_PREFIX } from "./virtual-modules.js";
7
7
 
8
- function getConditions(options: CloudflarePluginOptions): Array<string> {
9
- return hasNodejsCompat(options.compatibilityFlags)
10
- ? ["workerd", "worker", "node", "module"]
11
- : ["workerd", "worker", "module", "browser"];
12
- }
13
-
14
- function getMainFields(options: CloudflarePluginOptions): Array<string> {
15
- return hasNodejsCompat(options.compatibilityFlags)
16
- ? ["module", "main", "jsnext:main", "jsnext"]
17
- : ["browser", "module", "jsnext:main", "jsnext"];
18
- }
19
-
8
+ const DEFAULT_RESOLVE_CONDITION_NAMES = ["workerd", "worker", "module", "browser"];
9
+ const DEFAULT_RESOLVE_MAIN_FIELDS = ["browser", "module", "jsnext:main", "jsnext"];
20
10
  const DEFAULT_RESOLVE_EXTENSIONS = [
21
11
  ".mjs",
22
12
  ".js",
@@ -51,8 +41,8 @@ export const optionsPlugin = createPlugin<"options", OptionsApi>("options", (plu
51
41
  options.preserveEntrySignatures ??= "strict";
52
42
  options.platform ??= "neutral";
53
43
  options.resolve ??= {};
54
- options.resolve.conditionNames ??= [...getConditions(pluginOptions), "production"];
55
- options.resolve.mainFields ??= getMainFields(pluginOptions);
44
+ options.resolve.conditionNames ??= [...DEFAULT_RESOLVE_CONDITION_NAMES, "production"];
45
+ options.resolve.mainFields ??= DEFAULT_RESOLVE_MAIN_FIELDS;
56
46
  options.resolve.extensions ??= DEFAULT_RESOLVE_EXTENSIONS;
57
47
  options.transform ??= {};
58
48
  options.transform.target ??= TARGET;
@@ -79,15 +69,13 @@ export const optionsPlugin = createPlugin<"options", OptionsApi>("options", (plu
79
69
  pluginOptions,
80
70
  process.env.NODE_ENV || userConfig.mode || "production",
81
71
  );
82
- const conditions = getConditions(pluginOptions);
83
- const mainFields = getMainFields(pluginOptions);
84
72
  const appType = userConfig.appType ?? (Object.keys(input).length === 0 ? "spa" : "custom");
85
73
  return {
86
74
  appType,
87
75
  ssr: {
88
76
  noExternal: true,
89
77
  resolve: {
90
- conditions: [...conditions, "development|production"],
78
+ conditions: [...DEFAULT_RESOLVE_CONDITION_NAMES, "development|production"],
91
79
  },
92
80
  },
93
81
  builder:
@@ -109,7 +97,7 @@ export const optionsPlugin = createPlugin<"options", OptionsApi>("options", (plu
109
97
  ssr: {
110
98
  resolve: {
111
99
  noExternal: true,
112
- conditions: [...conditions, "development|production"],
100
+ conditions: [...DEFAULT_RESOLVE_CONDITION_NAMES, "development|production"],
113
101
  },
114
102
  build: {
115
103
  ssr: true,
@@ -123,7 +111,7 @@ export const optionsPlugin = createPlugin<"options", OptionsApi>("options", (plu
123
111
  ...rollupOptions,
124
112
  platform: "neutral",
125
113
  resolve: {
126
- mainFields,
114
+ mainFields: DEFAULT_RESOLVE_MAIN_FIELDS,
127
115
  extensions: DEFAULT_RESOLVE_EXTENSIONS,
128
116
  },
129
117
  },
@@ -139,8 +127,11 @@ export const optionsPlugin = createPlugin<"options", OptionsApi>("options", (plu
139
127
  rolldownOptions: {
140
128
  platform: "neutral",
141
129
  resolve: {
142
- conditionNames: [...conditions, "development|production"],
143
- mainFields,
130
+ conditionNames: [
131
+ ...DEFAULT_RESOLVE_CONDITION_NAMES,
132
+ "development|production",
133
+ ],
134
+ mainFields: DEFAULT_RESOLVE_MAIN_FIELDS,
144
135
  extensions: DEFAULT_RESOLVE_EXTENSIONS,
145
136
  },
146
137
  transform: {
@@ -152,9 +143,9 @@ export const optionsPlugin = createPlugin<"options", OptionsApi>("options", (plu
152
143
  : {
153
144
  esbuildOptions: {
154
145
  platform: "neutral",
155
- conditions: [...conditions, "development|production"],
146
+ conditions: [...DEFAULT_RESOLVE_CONDITION_NAMES, "development|production"],
156
147
  resolveExtensions: DEFAULT_RESOLVE_EXTENSIONS,
157
- mainFields,
148
+ mainFields: DEFAULT_RESOLVE_MAIN_FIELDS,
158
149
  target: TARGET,
159
150
  define,
160
151
  },