rollipop 0.1.0-alpha.19 → 0.1.0-alpha.20
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.
- package/CHANGELOG.md +7 -0
- package/dist/commands.cjs +28 -8
- package/dist/commands.js +28 -8
- package/dist/hmr-runtime.iife.js +4 -3
- package/dist/index.d.ts +2 -2
- package/dist/index.js +30 -10
- package/package.json +3 -3
- package/src/runtime/hmr-runtime.ts +1 -1
package/CHANGELOG.md
CHANGED
package/dist/commands.cjs
CHANGED
|
@@ -1059,6 +1059,22 @@ function printPluginLog(level, log, pluginName = "unknown") {
|
|
|
1059
1059
|
else pluginLogger[level](pluginLabel, log.stack ?? log.message);
|
|
1060
1060
|
}
|
|
1061
1061
|
//#endregion
|
|
1062
|
+
//#region src/config/compose-override.ts
|
|
1063
|
+
async function applyOverrideRolldownOptions(override, rolldownOptions) {
|
|
1064
|
+
if (typeof override === "function") return await override(rolldownOptions);
|
|
1065
|
+
return {
|
|
1066
|
+
input: (0, es_toolkit.merge)(rolldownOptions.input ?? {}, override.input ?? {}),
|
|
1067
|
+
output: (0, es_toolkit.merge)(rolldownOptions.output ?? {}, override.output ?? {})
|
|
1068
|
+
};
|
|
1069
|
+
}
|
|
1070
|
+
function composeOverrideRolldownOptions(target, source) {
|
|
1071
|
+
if (source == null) return target;
|
|
1072
|
+
if (target == null) return source;
|
|
1073
|
+
return async (rolldownOptions) => {
|
|
1074
|
+
return await applyOverrideRolldownOptions(source, await applyOverrideRolldownOptions(target, rolldownOptions));
|
|
1075
|
+
};
|
|
1076
|
+
}
|
|
1077
|
+
//#endregion
|
|
1062
1078
|
//#region src/config/merge-config.ts
|
|
1063
1079
|
function mergeConfig(baseConfig, ...overrideConfigs) {
|
|
1064
1080
|
let mergedConfig = baseConfig;
|
|
@@ -1071,6 +1087,7 @@ function mergeConfig(baseConfig, ...overrideConfigs) {
|
|
|
1071
1087
|
"plugins"
|
|
1072
1088
|
].includes(key)) return Array.from(new Set([...target ?? [], ...source ?? []]));
|
|
1073
1089
|
if (key === "reporter") return source ?? target;
|
|
1090
|
+
if (key === "dangerously_overrideRolldownOptions") return composeOverrideRolldownOptions(target, source);
|
|
1074
1091
|
});
|
|
1075
1092
|
return mergedConfig;
|
|
1076
1093
|
}
|
|
@@ -1102,8 +1119,7 @@ async function loadConfig(options = {}) {
|
|
|
1102
1119
|
...userConfig,
|
|
1103
1120
|
plugins
|
|
1104
1121
|
}), plugins),
|
|
1105
|
-
plugins
|
|
1106
|
-
dangerously_overrideRolldownOptions: userConfig.dangerously_overrideRolldownOptions
|
|
1122
|
+
plugins
|
|
1107
1123
|
};
|
|
1108
1124
|
await invokeConfigResolved(resolvedConfig, plugins);
|
|
1109
1125
|
return resolvedConfig;
|
|
@@ -1115,13 +1131,16 @@ async function flattenPluginOption(pluginOption) {
|
|
|
1115
1131
|
return [awaitedPluginOption];
|
|
1116
1132
|
}
|
|
1117
1133
|
async function resolvePluginConfig(baseConfig, plugins) {
|
|
1118
|
-
let mergedConfig = (0, es_toolkit.omit)(baseConfig, ["plugins"
|
|
1134
|
+
let mergedConfig = (0, es_toolkit.omit)(baseConfig, ["plugins"]);
|
|
1119
1135
|
for (const plugin of plugins) {
|
|
1120
1136
|
const context = createPluginContext(plugin.name);
|
|
1137
|
+
const overrideBefore = mergedConfig.dangerously_overrideRolldownOptions;
|
|
1121
1138
|
if (typeof plugin.config === "function") {
|
|
1122
1139
|
const config = await plugin.config.call(context, mergedConfig);
|
|
1123
1140
|
if (config != null) mergedConfig = mergeConfig(mergedConfig, config);
|
|
1124
1141
|
} else if (typeof plugin.config === "object") mergedConfig = mergeConfig(mergedConfig, plugin.config);
|
|
1142
|
+
const overrideAfter = mergedConfig.dangerously_overrideRolldownOptions;
|
|
1143
|
+
if (overrideAfter != null && overrideAfter !== overrideBefore) context.debug({ message: `set 'dangerously_overrideRolldownOptions'` });
|
|
1125
1144
|
}
|
|
1126
1145
|
return mergedConfig;
|
|
1127
1146
|
}
|
|
@@ -3556,14 +3575,15 @@ function loadPolyfills(polyfills) {
|
|
|
3556
3575
|
});
|
|
3557
3576
|
}
|
|
3558
3577
|
async function applyDangerouslyOverrideOptionsFinalizer(config, inputOptions, outputOptions) {
|
|
3559
|
-
|
|
3578
|
+
const override = config.dangerously_overrideRolldownOptions;
|
|
3579
|
+
if (override == null) return {
|
|
3560
3580
|
input: inputOptions,
|
|
3561
3581
|
output: outputOptions
|
|
3562
|
-
});
|
|
3563
|
-
return {
|
|
3564
|
-
input: (0, es_toolkit.merge)(inputOptions, config.dangerously_overrideRolldownOptions?.input ?? {}),
|
|
3565
|
-
output: (0, es_toolkit.merge)(outputOptions, config.dangerously_overrideRolldownOptions?.output ?? {})
|
|
3566
3582
|
};
|
|
3583
|
+
return await applyOverrideRolldownOptions(override, {
|
|
3584
|
+
input: inputOptions,
|
|
3585
|
+
output: outputOptions
|
|
3586
|
+
});
|
|
3567
3587
|
}
|
|
3568
3588
|
function getOverrideOptionsForDevServer(buildOptions) {
|
|
3569
3589
|
return {
|
package/dist/commands.js
CHANGED
|
@@ -1013,6 +1013,22 @@ function printPluginLog(level, log, pluginName = "unknown") {
|
|
|
1013
1013
|
else pluginLogger[level](pluginLabel, log.stack ?? log.message);
|
|
1014
1014
|
}
|
|
1015
1015
|
//#endregion
|
|
1016
|
+
//#region src/config/compose-override.ts
|
|
1017
|
+
async function applyOverrideRolldownOptions(override, rolldownOptions) {
|
|
1018
|
+
if (typeof override === "function") return await override(rolldownOptions);
|
|
1019
|
+
return {
|
|
1020
|
+
input: merge(rolldownOptions.input ?? {}, override.input ?? {}),
|
|
1021
|
+
output: merge(rolldownOptions.output ?? {}, override.output ?? {})
|
|
1022
|
+
};
|
|
1023
|
+
}
|
|
1024
|
+
function composeOverrideRolldownOptions(target, source) {
|
|
1025
|
+
if (source == null) return target;
|
|
1026
|
+
if (target == null) return source;
|
|
1027
|
+
return async (rolldownOptions) => {
|
|
1028
|
+
return await applyOverrideRolldownOptions(source, await applyOverrideRolldownOptions(target, rolldownOptions));
|
|
1029
|
+
};
|
|
1030
|
+
}
|
|
1031
|
+
//#endregion
|
|
1016
1032
|
//#region src/config/merge-config.ts
|
|
1017
1033
|
function mergeConfig(baseConfig, ...overrideConfigs) {
|
|
1018
1034
|
let mergedConfig = baseConfig;
|
|
@@ -1025,6 +1041,7 @@ function mergeConfig(baseConfig, ...overrideConfigs) {
|
|
|
1025
1041
|
"plugins"
|
|
1026
1042
|
].includes(key)) return Array.from(new Set([...target ?? [], ...source ?? []]));
|
|
1027
1043
|
if (key === "reporter") return source ?? target;
|
|
1044
|
+
if (key === "dangerously_overrideRolldownOptions") return composeOverrideRolldownOptions(target, source);
|
|
1028
1045
|
});
|
|
1029
1046
|
return mergedConfig;
|
|
1030
1047
|
}
|
|
@@ -1056,8 +1073,7 @@ async function loadConfig(options = {}) {
|
|
|
1056
1073
|
...userConfig,
|
|
1057
1074
|
plugins
|
|
1058
1075
|
}), plugins),
|
|
1059
|
-
plugins
|
|
1060
|
-
dangerously_overrideRolldownOptions: userConfig.dangerously_overrideRolldownOptions
|
|
1076
|
+
plugins
|
|
1061
1077
|
};
|
|
1062
1078
|
await invokeConfigResolved(resolvedConfig, plugins);
|
|
1063
1079
|
return resolvedConfig;
|
|
@@ -1069,13 +1085,16 @@ async function flattenPluginOption(pluginOption) {
|
|
|
1069
1085
|
return [awaitedPluginOption];
|
|
1070
1086
|
}
|
|
1071
1087
|
async function resolvePluginConfig(baseConfig, plugins) {
|
|
1072
|
-
let mergedConfig = omit(baseConfig, ["plugins"
|
|
1088
|
+
let mergedConfig = omit(baseConfig, ["plugins"]);
|
|
1073
1089
|
for (const plugin of plugins) {
|
|
1074
1090
|
const context = createPluginContext(plugin.name);
|
|
1091
|
+
const overrideBefore = mergedConfig.dangerously_overrideRolldownOptions;
|
|
1075
1092
|
if (typeof plugin.config === "function") {
|
|
1076
1093
|
const config = await plugin.config.call(context, mergedConfig);
|
|
1077
1094
|
if (config != null) mergedConfig = mergeConfig(mergedConfig, config);
|
|
1078
1095
|
} else if (typeof plugin.config === "object") mergedConfig = mergeConfig(mergedConfig, plugin.config);
|
|
1096
|
+
const overrideAfter = mergedConfig.dangerously_overrideRolldownOptions;
|
|
1097
|
+
if (overrideAfter != null && overrideAfter !== overrideBefore) context.debug({ message: `set 'dangerously_overrideRolldownOptions'` });
|
|
1079
1098
|
}
|
|
1080
1099
|
return mergedConfig;
|
|
1081
1100
|
}
|
|
@@ -3510,14 +3529,15 @@ function loadPolyfills(polyfills) {
|
|
|
3510
3529
|
});
|
|
3511
3530
|
}
|
|
3512
3531
|
async function applyDangerouslyOverrideOptionsFinalizer(config, inputOptions, outputOptions) {
|
|
3513
|
-
|
|
3532
|
+
const override = config.dangerously_overrideRolldownOptions;
|
|
3533
|
+
if (override == null) return {
|
|
3514
3534
|
input: inputOptions,
|
|
3515
3535
|
output: outputOptions
|
|
3516
|
-
});
|
|
3517
|
-
return {
|
|
3518
|
-
input: merge(inputOptions, config.dangerously_overrideRolldownOptions?.input ?? {}),
|
|
3519
|
-
output: merge(outputOptions, config.dangerously_overrideRolldownOptions?.output ?? {})
|
|
3520
3536
|
};
|
|
3537
|
+
return await applyOverrideRolldownOptions(override, {
|
|
3538
|
+
input: inputOptions,
|
|
3539
|
+
output: outputOptions
|
|
3540
|
+
});
|
|
3521
3541
|
}
|
|
3522
3542
|
function getOverrideOptionsForDevServer(buildOptions) {
|
|
3523
3543
|
return {
|
package/dist/hmr-runtime.iife.js
CHANGED
|
@@ -268,6 +268,7 @@
|
|
|
268
268
|
return !!e;
|
|
269
269
|
})();
|
|
270
270
|
}
|
|
271
|
+
var _globalThis, ___rolldown_runtime__;
|
|
271
272
|
var BaseDevRuntime = DevRuntime;
|
|
272
273
|
var ModuleHotContext = /* @__PURE__ */ function() {
|
|
273
274
|
"use strict";
|
|
@@ -493,7 +494,7 @@
|
|
|
493
494
|
var r = true, n = false, o = void 0;
|
|
494
495
|
try {
|
|
495
496
|
var i, u = function() {
|
|
496
|
-
var e = _sliced_to_array(
|
|
497
|
+
var e = _sliced_to_array(l.value, 2), r = e[0], n = e[1];
|
|
497
498
|
var o = i.moduleHotContexts.get(r);
|
|
498
499
|
if (o) {
|
|
499
500
|
o.acceptCallbacks.filter(function(e) {
|
|
@@ -502,7 +503,7 @@
|
|
|
502
503
|
o.cleanup();
|
|
503
504
|
}
|
|
504
505
|
};
|
|
505
|
-
for (var a = e[Symbol.iterator](),
|
|
506
|
+
for (var a = e[Symbol.iterator](), l; !(r = (l = a.next()).done); r = true) i = this, u();
|
|
506
507
|
} catch (e) {
|
|
507
508
|
n = true;
|
|
508
509
|
o = e;
|
|
@@ -579,6 +580,6 @@
|
|
|
579
580
|
if ("type" in e && typeof e.type === "string" && e.type.startsWith("hmr:")) return false;
|
|
580
581
|
return true;
|
|
581
582
|
}
|
|
582
|
-
global.__rolldown_runtime__ = new ReactNativeDevRuntime();
|
|
583
|
+
(___rolldown_runtime__ = (_globalThis = global).__rolldown_runtime__) !== null && ___rolldown_runtime__ !== void 0 || (_globalThis.__rolldown_runtime__ = new ReactNativeDevRuntime());
|
|
583
584
|
//#endregion
|
|
584
585
|
})();
|
package/dist/index.d.ts
CHANGED
|
@@ -304,8 +304,8 @@ interface PluginContext {
|
|
|
304
304
|
}
|
|
305
305
|
//#endregion
|
|
306
306
|
//#region src/core/plugins/types.d.ts
|
|
307
|
-
type PluginConfig = Omit<Config, 'plugins'
|
|
308
|
-
type ResolvedPluginConfig = Omit<ResolvedConfig, 'plugins'
|
|
307
|
+
type PluginConfig = Omit<Config, 'plugins'>;
|
|
308
|
+
type ResolvedPluginConfig = Omit<ResolvedConfig, 'plugins'>;
|
|
309
309
|
type Plugin = rolldown.Plugin & {
|
|
310
310
|
config?: PluginConfig | ((this: PluginContext, config: PluginConfig) => AsyncResult<PluginConfig | null | void>);
|
|
311
311
|
configResolved?: (this: PluginContext, config: ResolvedConfig) => AsyncResult<void>;
|
package/dist/index.js
CHANGED
|
@@ -88,7 +88,7 @@ async function stripFlowTypes(id, code) {
|
|
|
88
88
|
}
|
|
89
89
|
//#endregion
|
|
90
90
|
//#region src/constants.ts
|
|
91
|
-
const ROLLIPOP_VERSION = "0.1.0-alpha.
|
|
91
|
+
const ROLLIPOP_VERSION = "0.1.0-alpha.20";
|
|
92
92
|
const GLOBAL_IDENTIFIER = "global";
|
|
93
93
|
/**
|
|
94
94
|
* @see {@link https://github.com/facebook/metro/blob/0.81.x/docs/Configuration.md#resolvermainfields}
|
|
@@ -749,6 +749,22 @@ function printPluginLog(level, log, pluginName = "unknown") {
|
|
|
749
749
|
else pluginLogger[level](pluginLabel, log.stack ?? log.message);
|
|
750
750
|
}
|
|
751
751
|
//#endregion
|
|
752
|
+
//#region src/config/compose-override.ts
|
|
753
|
+
async function applyOverrideRolldownOptions(override, rolldownOptions) {
|
|
754
|
+
if (typeof override === "function") return await override(rolldownOptions);
|
|
755
|
+
return {
|
|
756
|
+
input: merge(rolldownOptions.input ?? {}, override.input ?? {}),
|
|
757
|
+
output: merge(rolldownOptions.output ?? {}, override.output ?? {})
|
|
758
|
+
};
|
|
759
|
+
}
|
|
760
|
+
function composeOverrideRolldownOptions(target, source) {
|
|
761
|
+
if (source == null) return target;
|
|
762
|
+
if (target == null) return source;
|
|
763
|
+
return async (rolldownOptions) => {
|
|
764
|
+
return await applyOverrideRolldownOptions(source, await applyOverrideRolldownOptions(target, rolldownOptions));
|
|
765
|
+
};
|
|
766
|
+
}
|
|
767
|
+
//#endregion
|
|
752
768
|
//#region src/config/merge-config.ts
|
|
753
769
|
function mergeConfig(baseConfig, ...overrideConfigs) {
|
|
754
770
|
let mergedConfig = baseConfig;
|
|
@@ -761,6 +777,7 @@ function mergeConfig(baseConfig, ...overrideConfigs) {
|
|
|
761
777
|
"plugins"
|
|
762
778
|
].includes(key)) return Array.from(new Set([...target ?? [], ...source ?? []]));
|
|
763
779
|
if (key === "reporter") return source ?? target;
|
|
780
|
+
if (key === "dangerously_overrideRolldownOptions") return composeOverrideRolldownOptions(target, source);
|
|
764
781
|
});
|
|
765
782
|
return mergedConfig;
|
|
766
783
|
}
|
|
@@ -792,8 +809,7 @@ async function loadConfig(options = {}) {
|
|
|
792
809
|
...userConfig,
|
|
793
810
|
plugins
|
|
794
811
|
}), plugins),
|
|
795
|
-
plugins
|
|
796
|
-
dangerously_overrideRolldownOptions: userConfig.dangerously_overrideRolldownOptions
|
|
812
|
+
plugins
|
|
797
813
|
};
|
|
798
814
|
await invokeConfigResolved(resolvedConfig, plugins);
|
|
799
815
|
return resolvedConfig;
|
|
@@ -805,13 +821,16 @@ async function flattenPluginOption(pluginOption) {
|
|
|
805
821
|
return [awaitedPluginOption];
|
|
806
822
|
}
|
|
807
823
|
async function resolvePluginConfig(baseConfig, plugins) {
|
|
808
|
-
let mergedConfig = omit(baseConfig, ["plugins"
|
|
824
|
+
let mergedConfig = omit(baseConfig, ["plugins"]);
|
|
809
825
|
for (const plugin of plugins) {
|
|
810
826
|
const context = createPluginContext(plugin.name);
|
|
827
|
+
const overrideBefore = mergedConfig.dangerously_overrideRolldownOptions;
|
|
811
828
|
if (typeof plugin.config === "function") {
|
|
812
829
|
const config = await plugin.config.call(context, mergedConfig);
|
|
813
830
|
if (config != null) mergedConfig = mergeConfig(mergedConfig, config);
|
|
814
831
|
} else if (typeof plugin.config === "object") mergedConfig = mergeConfig(mergedConfig, plugin.config);
|
|
832
|
+
const overrideAfter = mergedConfig.dangerously_overrideRolldownOptions;
|
|
833
|
+
if (overrideAfter != null && overrideAfter !== overrideBefore) context.debug({ message: `set 'dangerously_overrideRolldownOptions'` });
|
|
815
834
|
}
|
|
816
835
|
return mergedConfig;
|
|
817
836
|
}
|
|
@@ -3323,14 +3342,15 @@ function loadPolyfills(polyfills) {
|
|
|
3323
3342
|
});
|
|
3324
3343
|
}
|
|
3325
3344
|
async function applyDangerouslyOverrideOptionsFinalizer(config, inputOptions, outputOptions) {
|
|
3326
|
-
|
|
3345
|
+
const override = config.dangerously_overrideRolldownOptions;
|
|
3346
|
+
if (override == null) return {
|
|
3327
3347
|
input: inputOptions,
|
|
3328
3348
|
output: outputOptions
|
|
3329
|
-
});
|
|
3330
|
-
return {
|
|
3331
|
-
input: merge(inputOptions, config.dangerously_overrideRolldownOptions?.input ?? {}),
|
|
3332
|
-
output: merge(outputOptions, config.dangerously_overrideRolldownOptions?.output ?? {})
|
|
3333
3349
|
};
|
|
3350
|
+
return await applyOverrideRolldownOptions(override, {
|
|
3351
|
+
input: inputOptions,
|
|
3352
|
+
output: outputOptions
|
|
3353
|
+
});
|
|
3334
3354
|
}
|
|
3335
3355
|
function getOverrideOptionsForDevServer(buildOptions) {
|
|
3336
3356
|
return {
|
|
@@ -3432,7 +3452,7 @@ async function runServer(config, options) {
|
|
|
3432
3452
|
}
|
|
3433
3453
|
//#endregion
|
|
3434
3454
|
//#region package.json
|
|
3435
|
-
var version = "0.1.0-alpha.
|
|
3455
|
+
var version = "0.1.0-alpha.20";
|
|
3436
3456
|
//#endregion
|
|
3437
3457
|
//#region src/node/logger.ts
|
|
3438
3458
|
const logger = new Logger("cli");
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "rollipop",
|
|
3
|
-
"version": "0.1.0-alpha.
|
|
3
|
+
"version": "0.1.0-alpha.20",
|
|
4
4
|
"homepage": "https://github.com/leegeunhyeok/rollipop#readme",
|
|
5
5
|
"bugs": {
|
|
6
6
|
"url": "https://github.com/leegeunhyeok/rollipop/issues"
|
|
@@ -79,8 +79,8 @@
|
|
|
79
79
|
"@react-native-community/cli-types": "^20.1.2",
|
|
80
80
|
"@react-native/babel-plugin-codegen": "^0.84.1",
|
|
81
81
|
"@react-native/dev-middleware": "^0.84.1",
|
|
82
|
-
"@rollipop/rolldown": "1.0.
|
|
83
|
-
"@rollipop/rolldown-pluginutils": "1.0.
|
|
82
|
+
"@rollipop/rolldown": "1.0.2",
|
|
83
|
+
"@rollipop/rolldown-pluginutils": "1.0.2",
|
|
84
84
|
"@swc/core": "^1.15.18",
|
|
85
85
|
"@swc/helpers": "^0.5.19",
|
|
86
86
|
"@types/ws": "^8",
|
|
@@ -266,6 +266,6 @@ function isCustomHMRMessage(message: unknown): message is HMRCustomMessage {
|
|
|
266
266
|
return true;
|
|
267
267
|
}
|
|
268
268
|
|
|
269
|
-
globalThis.__rolldown_runtime__
|
|
269
|
+
globalThis.__rolldown_runtime__ ??= new ReactNativeDevRuntime();
|
|
270
270
|
|
|
271
271
|
export type { DevRuntime };
|