one 1.1.513 → 1.1.515

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.
Files changed (28) hide show
  1. package/dist/cjs/metro-config/getViteMetroPluginOptions.cjs +37 -33
  2. package/dist/cjs/metro-config/getViteMetroPluginOptions.js +42 -38
  3. package/dist/cjs/metro-config/getViteMetroPluginOptions.js.map +1 -1
  4. package/dist/cjs/metro-config/getViteMetroPluginOptions.native.js +3 -3
  5. package/dist/cjs/metro-config/getViteMetroPluginOptions.native.js.map +2 -2
  6. package/dist/cjs/vite/one.cjs +4 -2
  7. package/dist/cjs/vite/one.js +4 -2
  8. package/dist/cjs/vite/one.js.map +1 -1
  9. package/dist/cjs/vite/one.native.js +6 -4
  10. package/dist/cjs/vite/one.native.js.map +2 -2
  11. package/dist/esm/metro-config/getViteMetroPluginOptions.js +42 -38
  12. package/dist/esm/metro-config/getViteMetroPluginOptions.js.map +1 -1
  13. package/dist/esm/metro-config/getViteMetroPluginOptions.mjs +37 -33
  14. package/dist/esm/metro-config/getViteMetroPluginOptions.mjs.map +1 -1
  15. package/dist/esm/metro-config/getViteMetroPluginOptions.native.js +45 -41
  16. package/dist/esm/metro-config/getViteMetroPluginOptions.native.js.map +1 -1
  17. package/dist/esm/vite/one.js +4 -2
  18. package/dist/esm/vite/one.js.map +1 -1
  19. package/dist/esm/vite/one.mjs +4 -2
  20. package/dist/esm/vite/one.mjs.map +1 -1
  21. package/dist/esm/vite/one.native.js +6 -4
  22. package/dist/esm/vite/one.native.js.map +1 -1
  23. package/package.json +10 -10
  24. package/src/metro-config/getViteMetroPluginOptions.ts +11 -1
  25. package/src/vite/one.ts +2 -1
  26. package/types/metro-config/getViteMetroPluginOptions.d.ts +2 -1
  27. package/types/metro-config/getViteMetroPluginOptions.d.ts.map +1 -1
  28. package/types/vite/one.d.ts.map +1 -1
package/src/vite/one.ts CHANGED
@@ -64,6 +64,7 @@ export function one(options: One.PluginOptions = {}): PluginOption {
64
64
  projectRoot: process.cwd(), // TODO: hard-coded process.cwd(), we should make this optional since the plugin can have a default to vite's `config.root`.
65
65
  relativeRouterRoot: routerRoot,
66
66
  ignoredRouteFiles: options.router?.ignoredRouteFiles,
67
+ userDefaultConfigOverrides: (options.native?.bundlerOptions as any)?.defaultConfigOverrides,
67
68
  })
68
69
 
69
70
  const userMetroOptions = options.native?.bundlerOptions as typeof defaultMetroOptions
@@ -72,6 +73,7 @@ export function one(options: One.PluginOptions = {}): PluginOption {
72
73
  return {
73
74
  ...defaultMetroOptions,
74
75
  ...userMetroOptions,
76
+ defaultConfigOverrides: defaultMetroOptions?.defaultConfigOverrides, // defaultConfigOverrides is merged by getViteMetroPluginOptions, so we need to set it here again.
75
77
  argv: {
76
78
  ...defaultMetroOptions?.argv,
77
79
  ...userMetroOptions?.argv,
@@ -80,7 +82,6 @@ export function one(options: One.PluginOptions = {}): PluginOption {
80
82
  ...defaultMetroOptions?.babelConfig,
81
83
  ...userMetroOptions?.babelConfig,
82
84
  },
83
- // TODO: merge defaultConfigOverrides
84
85
  mainModuleName: 'one/metro-entry', // So users won't need to write `"main": "one/metro-entry"` in their `package.json` like ordinary Expo apps.
85
86
  }
86
87
  })()
@@ -1,7 +1,8 @@
1
1
  import type { metroPlugin } from '@vxrn/vite-plugin-metro';
2
- export declare function getViteMetroPluginOptions({ projectRoot, relativeRouterRoot, ignoredRouteFiles, }: {
2
+ export declare function getViteMetroPluginOptions({ projectRoot, relativeRouterRoot, ignoredRouteFiles, userDefaultConfigOverrides, }: {
3
3
  projectRoot: string;
4
4
  relativeRouterRoot: string;
5
5
  ignoredRouteFiles?: Array<`**/*${string}`>;
6
+ userDefaultConfigOverrides?: NonNullable<Parameters<typeof metroPlugin>[0]>['defaultConfigOverrides'];
6
7
  }): Parameters<typeof metroPlugin>[0];
7
8
  //# sourceMappingURL=getViteMetroPluginOptions.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"getViteMetroPluginOptions.d.ts","sourceRoot":"","sources":["../../src/metro-config/getViteMetroPluginOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAU1D,wBAAgB,yBAAyB,CAAC,EACxC,WAAW,EACX,kBAAkB,EAClB,iBAAiB,GAClB,EAAE;IACD,WAAW,EAAE,MAAM,CAAA;IACnB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,iBAAiB,CAAC,EAAE,KAAK,CAAC,OAAO,MAAM,EAAE,CAAC,CAAA;CAC3C,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAuKpC"}
1
+ {"version":3,"file":"getViteMetroPluginOptions.d.ts","sourceRoot":"","sources":["../../src/metro-config/getViteMetroPluginOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAU1D,wBAAgB,yBAAyB,CAAC,EACxC,WAAW,EACX,kBAAkB,EAClB,iBAAiB,EACjB,0BAA0B,GAC3B,EAAE;IACD,WAAW,EAAE,MAAM,CAAA;IACnB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,iBAAiB,CAAC,EAAE,KAAK,CAAC,OAAO,MAAM,EAAE,CAAC,CAAA;IAC1C,0BAA0B,CAAC,EAAE,WAAW,CACtC,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAClC,CAAC,wBAAwB,CAAC,CAAA;CAC5B,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CA6KpC"}
@@ -1 +1 @@
1
- {"version":3,"file":"one.d.ts","sourceRoot":"","sources":["../../src/vite/one.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAU,YAAY,EAAc,MAAM,MAAM,CAAA;AAM5D,OAAO,qBAAqB,CAAA;AAW5B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAyBlC,wBAAgB,GAAG,CAAC,OAAO,GAAE,GAAG,CAAC,aAAkB,GAAG,YAAY,CA0fjE"}
1
+ {"version":3,"file":"one.d.ts","sourceRoot":"","sources":["../../src/vite/one.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAU,YAAY,EAAc,MAAM,MAAM,CAAA;AAM5D,OAAO,qBAAqB,CAAA;AAW5B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAyBlC,wBAAgB,GAAG,CAAC,OAAO,GAAE,GAAG,CAAC,aAAkB,GAAG,YAAY,CA2fjE"}