create-expo-stack 2.20.0-next.ff2bed4 → 2.20.1
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/README.md +1 -3
- package/build/cli.js +3 -2
- package/build/commands/create-expo-stack.js +9 -30
- package/build/constants.js +4 -4
- package/build/templates/base/App.tsx.ejs +12 -51
- package/build/templates/base/app.json.ejs +1 -0
- package/build/templates/base/babel.config.js.ejs +13 -16
- package/build/templates/base/components/Button.tsx.ejs +1 -0
- package/build/templates/base/components/Container.tsx.ejs +1 -0
- package/build/templates/base/package.json.ejs +34 -67
- package/build/templates/base/tsconfig.json.ejs +12 -7
- package/build/templates/packages/expo-router/drawer/app/+not-found.tsx.ejs +19 -60
- package/build/templates/packages/expo-router/drawer/app/_layout.tsx.ejs +2 -41
- package/build/templates/packages/expo-router/stack/app/+not-found.tsx.ejs +34 -66
- package/build/templates/packages/expo-router/stack/app/_layout.tsx.ejs +15 -51
- package/build/templates/packages/expo-router/stack/app/details.tsx.ejs +37 -5
- package/build/templates/packages/expo-router/stack/app/index.tsx.ejs +34 -11
- package/build/templates/packages/expo-router/tabs/app/+not-found.tsx.ejs +21 -60
- package/build/templates/packages/expo-router/tabs/app/_layout.tsx.ejs +8 -48
- package/build/templates/packages/nativewind/global.css +3 -2
- package/build/templates/packages/nativewind/metro.config.js +3 -4
- package/build/templates/packages/nativewind/nativewind-env.d.ts +1 -3
- package/build/templates/packages/nativewind/tailwind.config.js.ejs +15 -0
- package/build/templates/packages/nativewindui/components/Container.tsx.ejs +1 -0
- package/build/templates/packages/nativewindui/components/EditScreenInfo.tsx.ejs +1 -1
- package/build/templates/packages/nativewindui/components/ScreenContent.tsx.ejs +1 -1
- package/build/templates/packages/nativewindui/components/nativewindui/Icon/Icon.ios.tsx.ejs +52 -0
- package/build/templates/packages/nativewindui/components/nativewindui/Icon/Icon.tsx.ejs +58 -0
- package/build/templates/packages/nativewindui/components/nativewindui/Icon/index.ts.ejs +16 -0
- package/build/templates/packages/nativewindui/components/nativewindui/Icon/types.ts.ejs +18 -0
- package/build/templates/packages/nativewindui/components/{ThemeToggle.tsx.ejs → nativewindui/ThemeToggle.tsx.ejs} +8 -10
- package/build/templates/packages/nativewindui/drawer/app/(drawer)/index.tsx.ejs +17 -19
- package/build/templates/packages/nativewindui/drawer/app/+not-found.tsx.ejs +4 -44
- package/build/templates/packages/nativewindui/drawer/app/_layout.tsx.ejs +2 -2
- package/build/templates/packages/nativewindui/drawer/app/modal.tsx.ejs +4 -4
- package/build/templates/packages/nativewindui/lib/useColorScheme.tsx.ejs +3 -37
- package/build/templates/packages/nativewindui/stack/app/+not-found.tsx.ejs +1 -1
- package/build/templates/packages/nativewindui/stack/app/_layout.tsx.ejs +17 -34
- package/build/templates/packages/nativewindui/stack/app/index.tsx.ejs +230 -275
- package/build/templates/packages/nativewindui/stack/app/modal.tsx.ejs +7 -7
- package/build/templates/packages/nativewindui/tabs/app/(tabs)/index.tsx.ejs +6 -7
- package/build/templates/packages/nativewindui/tabs/app/+not-found.tsx.ejs +0 -40
- package/build/templates/packages/nativewindui/theme/colors.ts.ejs +52 -0
- package/build/templates/packages/nativewindui/theme/index.ts.ejs +2 -2
- package/build/templates/packages/nativewindui/theme/with-opacity.ts.ejs +155 -0
- package/build/templates/packages/react-navigation/App.tsx.ejs +2 -42
- package/build/types/constants.d.ts +1 -1
- package/build/types/types.d.ts +3 -3
- package/build/types/utilities/configAnalytics.d.ts +2 -2
- package/build/types/utilities/validateProjectName.d.ts +2 -1
- package/build/types.js +1 -3
- package/build/utilities/clearNavigationPackages.js +2 -2
- package/build/utilities/clearStylingPackages.js +2 -2
- package/build/utilities/configAnalytics.js +5 -4
- package/build/utilities/configureProjectFiles.js +31 -68
- package/build/utilities/copyBaseAssets.js +3 -2
- package/build/utilities/generateNWUI.js +8 -7
- package/build/utilities/generateProjectFiles.js +4 -9
- package/build/utilities/getPackageManager.js +6 -5
- package/build/utilities/printOutput.js +5 -16
- package/build/utilities/renderTitle.js +3 -2
- package/build/utilities/runCLI.js +15 -17
- package/build/utilities/runEasConfigure.js +3 -2
- package/build/utilities/runIgnite.js +3 -2
- package/build/utilities/showHelp.js +3 -4
- package/build/utilities/systemCommand.js +3 -3
- package/build/utilities/usePackage.js +3 -2
- package/build/utilities/validateProjectName.js +3 -2
- package/package.json +74 -71
- package/build/templates/packages/nativewind/postcss.config.mjs +0 -5
- package/build/templates/packages/nativewindui/components/BackButton.tsx.ejs +0 -23
- package/build/templates/packages/nativewindui/components/Button.tsx.ejs +0 -41
- package/build/templates/packages/nativewindui/lib/useHeaderSearchBar.tsx.ejs +0 -31
- package/build/templates/packages/restyle/components/BackButton.tsx.ejs +0 -15
- package/build/templates/packages/restyle/components/Button.tsx.ejs +0 -40
- package/build/templates/packages/restyle/components/Container.tsx.ejs +0 -6
- package/build/templates/packages/restyle/components/EditScreenInfo.tsx.ejs +0 -29
- package/build/templates/packages/restyle/components/ScreenContent.tsx.ejs +0 -21
- package/build/templates/packages/restyle/theme/Box.tsx.ejs +0 -6
- package/build/templates/packages/restyle/theme/Text.tsx.ejs +0 -6
- package/build/templates/packages/restyle/theme/index.ts.ejs +0 -6
- package/build/templates/packages/restyle/theme/theme.ts.ejs +0 -67
- package/build/templates/packages/tamagui/components/BackButton.tsx.ejs +0 -19
- package/build/templates/packages/tamagui/components/Button.tsx.ejs +0 -18
- package/build/templates/packages/tamagui/components/Container.tsx.ejs +0 -6
- package/build/templates/packages/tamagui/components/EditScreenInfo.tsx.ejs +0 -29
- package/build/templates/packages/tamagui/components/ScreenContent.tsx.ejs +0 -23
- package/build/templates/packages/tamagui/tamagui.config.ts.ejs +0 -130
package/README.md
CHANGED
|
@@ -39,7 +39,7 @@ Support this project by <a href="https://github.com/sponsors/roninoss" target="_
|
|
|
39
39
|
|
|
40
40
|
## Description
|
|
41
41
|
|
|
42
|
-
This CLI tool is designed to help you get started with React Native and Expo as quickly as possible. The CLI options allow you to configure your project with Typescript, file-based routing with Expo Router, configuration-based navigation via React-Navigation, styling with NativeWind,
|
|
42
|
+
This CLI tool is designed to help you get started with React Native and Expo as quickly as possible. The CLI options allow you to configure your project with Typescript, file-based routing with Expo Router, configuration-based navigation via React-Navigation, styling with NativeWind, Unistyles, or StyleSheets and authentication via Supabase or Firebase.
|
|
43
43
|
|
|
44
44
|
You can also use flags such as `--noInstall`, `--noGit`, and `--default` in order to customize your project. The CLI will attempt to automatically determine your package manager of choice but you can also pass in your preferred package manager via `--npm`, `--yarn`, `--pnpm`, or `--bun`. Roadmap coming soon...
|
|
45
45
|
|
|
@@ -72,8 +72,6 @@ Each project is generated based on the results of the CLI, on a per-file basis.
|
|
|
72
72
|
| Expo System UI | System UI Library | v5 | System UI support |
|
|
73
73
|
| Expo Web Browser | Web Browser Library | v14 | Open links in the browser |
|
|
74
74
|
| NativeWind | UI Framework | v4.1 | Tailwind CSS for React Native |
|
|
75
|
-
| Restyle | UI Framework | v2 | Theme-based styling library for React Native |
|
|
76
|
-
| Tamagui | UI Framework | v1 | Universal UI with a smart optimizing compiler |
|
|
77
75
|
| Unistyles | UI Framework | v3 | Superset of StyleSheet |
|
|
78
76
|
| Safe Area Context | Safe Area Library | v5 | Safe area support |
|
|
79
77
|
| React Native Web | Web Support | v0.20 | React Native for Web |
|
package/build/cli.js
CHANGED
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.run =
|
|
12
|
+
exports.run = void 0;
|
|
13
13
|
const gluegun_1 = require("gluegun");
|
|
14
14
|
/**
|
|
15
15
|
* Create the cli and kick it off
|
|
@@ -45,4 +45,5 @@ function run() {
|
|
|
45
45
|
return toolbox;
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
|
-
|
|
48
|
+
exports.run = run;
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NsaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxxQ0FBZ0M7QUFFaEM7O0dBRUc7QUFDSCxTQUFzQixHQUFHOztRQUN2QixNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDO1FBQzFCLHVCQUF1QjtRQUN2QixNQUFNLEdBQUcsR0FBRyxJQUFBLGVBQUssR0FBRTthQUNoQixLQUFLLENBQUMsbUJBQW1CLENBQUM7YUFDMUIsR0FBRyxDQUFDLFNBQVMsQ0FBQzthQUNkLE9BQU8sQ0FBQyxnQkFBZ0IsRUFBRTtZQUN6QixRQUFRLEVBQUUscUJBQXFCO1lBQy9CLE1BQU0sRUFBRSxJQUFJO1NBQ2IsQ0FBQzthQUNELE9BQU8sRUFBRSxDQUFDLGlEQUFpRDthQUMzRCxNQUFNLEVBQUUsQ0FBQztRQUVaLHFCQUFxQjtRQUNyQixNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLENBQUMsR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzVFLE1BQU0sV0FBVyxHQUFHLEtBQUssR0FBRyxFQUFFLElBQUksQ0FBQyxLQUFLLEtBQUssRUFBRSxJQUFJLEtBQUssSUFBSSxFQUFFLENBQUMsQ0FBQztRQUVoRSxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDakIsT0FBTyxDQUFDLEtBQUssQ0FBQyx3RkFBd0YsQ0FBQyxDQUFDO1lBQ3hHLE9BQU8sQ0FBQyxLQUFLLENBQUMscUNBQXFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSSxHQUFHLENBQUMsQ0FBQztZQUM3RSxPQUFPLENBQUMsS0FBSyxDQUFDLGtDQUFrQyxDQUFDLENBQUM7WUFDbEQsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNsQixDQUFDO1FBRUQseUZBQXlGO1FBQ3pGLDBFQUEwRTtRQUMxRSx3SUFBd0k7UUFDeEksYUFBYTtRQUNiLE1BQU0sT0FBTyxHQUFHLE1BQU0sR0FBRyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUVwQyxxQ0FBcUM7UUFDckMsT0FBTyxPQUFPLENBQUM7SUFDakIsQ0FBQztDQUFBO0FBaENELGtCQWdDQyJ9
|
|
@@ -195,10 +195,10 @@ const command = {
|
|
|
195
195
|
else if (isNativewindUI) {
|
|
196
196
|
cliResults = (0, clearStylingPackages_1.default)(cliResults);
|
|
197
197
|
cliResults = (0, clearNavigationPackages_1.default)(cliResults);
|
|
198
|
-
const parsedComponents = (_d = (_c = (_b = (_a = options === null || options === void 0 ? void 0 : options.selectedComponents) === null || _a === void 0 ? void 0 : _a.split(',')) === null || _b === void 0 ? void 0 : _b.map((c) => c.trim())) === null || _c === void 0 ? void 0 : _c.filter((item) => constants_1.
|
|
198
|
+
const parsedComponents = (_d = (_c = (_b = (_a = options === null || options === void 0 ? void 0 : options.selectedComponents) === null || _a === void 0 ? void 0 : _a.split(',')) === null || _b === void 0 ? void 0 : _b.map((c) => c.trim())) === null || _c === void 0 ? void 0 : _c.filter((item) => constants_1.nativewindUIOptions.includes(item))) !== null && _d !== void 0 ? _d : [];
|
|
199
199
|
const selectedComponents = parsedComponents.length
|
|
200
|
-
? Array.from(new Set([...parsedComponents, 'text']))
|
|
201
|
-
: constants_1.
|
|
200
|
+
? Array.from(new Set([...parsedComponents, 'text', 'button']))
|
|
201
|
+
: constants_1.nativewindUIOptions;
|
|
202
202
|
cliResults.packages.push({
|
|
203
203
|
name: 'nativewindui',
|
|
204
204
|
type: 'styling',
|
|
@@ -214,14 +214,6 @@ const command = {
|
|
|
214
214
|
}
|
|
215
215
|
});
|
|
216
216
|
}
|
|
217
|
-
else if (options.tamagui) {
|
|
218
|
-
cliResults = (0, clearStylingPackages_1.default)(cliResults);
|
|
219
|
-
// Add tamagui package
|
|
220
|
-
cliResults.packages.push({
|
|
221
|
-
name: 'tamagui',
|
|
222
|
-
type: 'styling'
|
|
223
|
-
});
|
|
224
|
-
}
|
|
225
217
|
else if (options.unistyles) {
|
|
226
218
|
cliResults = (0, clearStylingPackages_1.default)(cliResults);
|
|
227
219
|
// Add unistyles package
|
|
@@ -238,19 +230,6 @@ const command = {
|
|
|
238
230
|
type: 'styling'
|
|
239
231
|
});
|
|
240
232
|
}
|
|
241
|
-
else if (options.restyle) {
|
|
242
|
-
try {
|
|
243
|
-
cliResults = (0, clearStylingPackages_1.default)(cliResults);
|
|
244
|
-
// Add stylesheet package
|
|
245
|
-
cliResults.packages.push({
|
|
246
|
-
name: 'restyle',
|
|
247
|
-
type: 'styling'
|
|
248
|
-
});
|
|
249
|
-
}
|
|
250
|
-
catch (error) {
|
|
251
|
-
console.log({ error });
|
|
252
|
-
}
|
|
253
|
-
}
|
|
254
233
|
// if there is no style package, add stylesheet
|
|
255
234
|
else if (cliResults.packages.find((p) => p.type === 'styling') === undefined) {
|
|
256
235
|
cliResults.packages.push({
|
|
@@ -302,17 +281,17 @@ const command = {
|
|
|
302
281
|
const generateRerunScript = (cliResults) => {
|
|
303
282
|
var _a, _b;
|
|
304
283
|
let script = `npx rn-new@latest ${cliResults.projectName} `;
|
|
305
|
-
const
|
|
306
|
-
if (
|
|
284
|
+
const isNativewindUISelected = cliResults.packages.some((p) => p.name === 'nativewindui');
|
|
285
|
+
if (isNativewindUISelected) {
|
|
307
286
|
const flagToUse = options.nwui ? 'nwui' : 'nativewindui';
|
|
308
287
|
script += `--${flagToUse} `;
|
|
309
|
-
const
|
|
288
|
+
const nativewindUIComponents = (_b = (_a = cliResults.packages.find((p) => p.name === 'nativewindui')) === null || _a === void 0 ? void 0 : _a.options.selectedComponents) !== null && _b !== void 0 ? _b : [];
|
|
310
289
|
// we do this to account for older stored config e.g that has selectable text in it
|
|
311
|
-
const onlyValidComponents =
|
|
290
|
+
const onlyValidComponents = nativewindUIComponents.filter((c) => constants_1.nativewindUIOptions.includes(c));
|
|
312
291
|
if (onlyValidComponents.length === 0) {
|
|
313
292
|
script += '--blank ';
|
|
314
293
|
}
|
|
315
|
-
else if (onlyValidComponents.length !== constants_1.
|
|
294
|
+
else if (onlyValidComponents.length !== constants_1.nativewindUIOptions.length) {
|
|
316
295
|
script += `--selected-components=${onlyValidComponents.join(',')} `;
|
|
317
296
|
}
|
|
318
297
|
// this should always be expo router for nwui
|
|
@@ -421,4 +400,4 @@ const command = {
|
|
|
421
400
|
})
|
|
422
401
|
};
|
|
423
402
|
exports.default = command;
|
|
424
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create-expo-stack.js","sourceRoot":"","sources":["../../src/commands/create-expo-stack.ts"],"names":[],"mappings":"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"}
|
|
403
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create-expo-stack.js","sourceRoot":"","sources":["../../src/commands/create-expo-stack.ts"],"names":[],"mappings":"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"}
|
package/build/constants.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var _a;
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.bunInstallationError = exports.projectNameValidationError = exports.navigationValidationError = exports.
|
|
4
|
+
exports.bunInstallationError = exports.projectNameValidationError = exports.navigationValidationError = exports.nativewindUIOptions = exports.defaultOptions = exports.DEFAULT_APP_NAME = exports.TITLE_TEXT = exports.RN_NEW_TITLE = exports.CES_TITLE = void 0;
|
|
5
5
|
exports.CES_TITLE = 'create expo stack';
|
|
6
6
|
exports.RN_NEW_TITLE = 'rn new';
|
|
7
7
|
exports.TITLE_TEXT = ((_a = process.argv[1]) === null || _a === void 0 ? void 0 : _a.includes('rn-new')) ? exports.RN_NEW_TITLE : exports.CES_TITLE;
|
|
@@ -19,12 +19,12 @@ exports.defaultOptions = {
|
|
|
19
19
|
publish: false
|
|
20
20
|
}
|
|
21
21
|
};
|
|
22
|
-
exports.
|
|
22
|
+
exports.nativewindUIOptions = [
|
|
23
23
|
'action-sheet',
|
|
24
24
|
'activity-indicator',
|
|
25
25
|
'activity-view',
|
|
26
26
|
'avatar',
|
|
27
|
-
'
|
|
27
|
+
'button',
|
|
28
28
|
'date-picker',
|
|
29
29
|
'picker',
|
|
30
30
|
'progress-indicator',
|
|
@@ -36,4 +36,4 @@ exports.nativeWindUIOptions = [
|
|
|
36
36
|
exports.navigationValidationError = `You must pass in either --react-navigation or --expo-router if you want to use the --tabs or --drawer+tabs options`;
|
|
37
37
|
exports.projectNameValidationError = `A project with the name`;
|
|
38
38
|
exports.bunInstallationError = 'Cancelled to install recommended version of Bun.';
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbnN0YW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBRWEsUUFBQSxTQUFTLEdBQUcsbUJBQW1CLENBQUM7QUFDaEMsUUFBQSxZQUFZLEdBQUcsU0FBUyxDQUFDO0FBQ3pCLFFBQUEsVUFBVSxHQUFHLENBQUEsTUFBQSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQywwQ0FBRSxRQUFRLENBQUMsUUFBUSxDQUFDLEVBQUMsQ0FBQyxDQUFDLG9CQUFZLENBQUMsQ0FBQyxDQUFDLGlCQUFTLENBQUM7QUFFNUUsUUFBQSxnQkFBZ0IsR0FBRyxhQUFhLENBQUM7QUFFakMsUUFBQSxjQUFjLEdBQWU7SUFDeEMsV0FBVyxFQUFFLHdCQUFnQjtJQUM3QixRQUFRLEVBQUUsRUFBRTtJQUNaLEtBQUssRUFBRTtRQUNMLEtBQUssRUFBRSxLQUFLO1FBQ1osU0FBUyxFQUFFLEtBQUs7UUFDaEIsU0FBUyxFQUFFLEtBQUs7UUFDaEIsV0FBVyxFQUFFLElBQUk7UUFDakIsY0FBYyxFQUFFLFNBQVM7UUFDekIsR0FBRyxFQUFFLEtBQUs7UUFDVixPQUFPLEVBQUUsS0FBSztLQUNmO0NBQ0YsQ0FBQztBQUVXLFFBQUEsbUJBQW1CLEdBQXlCO0lBQ3ZELGNBQWM7SUFDZCxvQkFBb0I7SUFDcEIsZUFBZTtJQUNmLFFBQVE7SUFDUixRQUFRO0lBQ1IsYUFBYTtJQUNiLFFBQVE7SUFDUixvQkFBb0I7SUFDcEIsbUJBQW1CO0lBQ25CLFFBQVE7SUFDUixNQUFNO0lBQ04sUUFBUTtDQUNULENBQUM7QUFFVyxRQUFBLHlCQUF5QixHQUFHLG9IQUFvSCxDQUFDO0FBQ2pKLFFBQUEsMEJBQTBCLEdBQUcseUJBQXlCLENBQUM7QUFDdkQsUUFBQSxvQkFBb0IsR0FBRyxrREFBa0QsQ0FBQyJ9
|
|
@@ -14,15 +14,6 @@ import { StatusBar } from 'expo-status-bar';
|
|
|
14
14
|
<% } else if (props.stylingPackage?.name === "nativewinui") { %>
|
|
15
15
|
import './global.css';
|
|
16
16
|
import 'expo-dev-client';
|
|
17
|
-
<% } else if (props.stylingPackage?.name === "restyle") { %>
|
|
18
|
-
import { ThemeProvider } from '@shopify/restyle';
|
|
19
|
-
import { theme } from 'theme';
|
|
20
|
-
<% } else if (props.stylingPackage?.name === "tamagui") { %>
|
|
21
|
-
<% if (!props.internalizationPackage) { %>
|
|
22
|
-
import { Text } from 'react-native';
|
|
23
|
-
<% } %>
|
|
24
|
-
import { TamaguiProvider } from 'tamagui';
|
|
25
|
-
import config from './tamagui.config';
|
|
26
17
|
<% } %>
|
|
27
18
|
|
|
28
19
|
<% if (props.analyticsPackage?.name === "vexo-analytics") { %>
|
|
@@ -31,46 +22,16 @@ import { StatusBar } from 'expo-status-bar';
|
|
|
31
22
|
vexo(process.env.EXPO_PUBLIC_VEXO_API_KEY);
|
|
32
23
|
<% } %>
|
|
33
24
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
<
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
}
|
|
47
|
-
<% } else if (props.stylingPackage?.name === "tamagui") {%>
|
|
48
|
-
export default function App() {
|
|
49
|
-
return (
|
|
50
|
-
<TamaguiProvider config={config}>
|
|
51
|
-
<ScreenContent title="Home" path="App.tsx">
|
|
52
|
-
<% if (props.internalizationPackage?.name === "i18next") { %>
|
|
53
|
-
<InternalizationExample />
|
|
54
|
-
<% } else { %>
|
|
55
|
-
<Text>Open up App.tsx to start working on your app!</Text>
|
|
56
|
-
<% } %>
|
|
57
|
-
</ScreenContent>
|
|
58
|
-
<StatusBar style="auto" />
|
|
59
|
-
</TamaguiProvider>
|
|
60
|
-
);
|
|
61
|
-
}
|
|
62
|
-
<% } else { %>
|
|
63
|
-
export default function App() {
|
|
64
|
-
return (
|
|
65
|
-
<>
|
|
66
|
-
<ScreenContent title="Home" path="App.tsx">
|
|
67
|
-
<% if (props.internalizationPackage?.name === "i18next") { %>
|
|
68
|
-
<InternalizationExample />
|
|
69
|
-
<% } %>
|
|
70
|
-
</ScreenContent>
|
|
71
|
-
<StatusBar style="auto" />
|
|
72
|
-
</>
|
|
73
|
-
);
|
|
74
|
-
}
|
|
75
|
-
<% } %>
|
|
25
|
+
export default function App() {
|
|
26
|
+
return (
|
|
27
|
+
<>
|
|
28
|
+
<ScreenContent title="Home" path="App.tsx">
|
|
29
|
+
<% if (props.internalizationPackage?.name === "i18next") { %>
|
|
30
|
+
<InternalizationExample />
|
|
31
|
+
<% } %>
|
|
32
|
+
</ScreenContent>
|
|
33
|
+
<StatusBar style="auto" />
|
|
34
|
+
</>
|
|
35
|
+
);
|
|
36
|
+
}
|
|
76
37
|
|
|
@@ -2,30 +2,27 @@ module.exports = function(api) {
|
|
|
2
2
|
api.cache(true);
|
|
3
3
|
let plugins = [];
|
|
4
4
|
|
|
5
|
-
<% if (props.stylingPackage?.name === "
|
|
5
|
+
<% if (props.stylingPackage?.name === "unistyles") { %>
|
|
6
6
|
plugins.push([
|
|
7
|
-
'
|
|
7
|
+
'react-native-unistyles/plugin',
|
|
8
8
|
{
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
}
|
|
9
|
+
autoProcessRoot: 'app',
|
|
10
|
+
autoProcessImports: ['~/components']
|
|
11
|
+
}
|
|
12
12
|
]);
|
|
13
13
|
<% } %>
|
|
14
14
|
|
|
15
|
-
<% if (props.stylingPackage?.name === "unistyles") { %>
|
|
16
|
-
plugins.push([
|
|
17
|
-
'react-native-unistyles/plugin',
|
|
18
|
-
{
|
|
19
|
-
autoProcessRoot: 'app',
|
|
20
|
-
autoProcessImports: ['~/components']
|
|
21
|
-
}
|
|
22
|
-
]);
|
|
23
|
-
<% } %>
|
|
24
|
-
|
|
25
15
|
plugins.push('react-native-worklets/plugin');
|
|
26
16
|
|
|
27
17
|
return {
|
|
28
|
-
|
|
18
|
+
<% if (props.stylingPackage?.name === "nativewind" || props.stylingPackage?.name === "nativewindui") { %>
|
|
19
|
+
presets: [
|
|
20
|
+
['babel-preset-expo', { jsxImportSource: 'nativewind' }],
|
|
21
|
+
'nativewind/babel',
|
|
22
|
+
],
|
|
23
|
+
<% } else { %>
|
|
24
|
+
presets: ['babel-preset-expo'],
|
|
25
|
+
<% } %>
|
|
29
26
|
plugins,
|
|
30
27
|
};
|
|
31
28
|
};
|
|
@@ -31,34 +31,28 @@
|
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
33
|
<% if (props.stylingPackage?.name === "nativewind" || props.stylingPackage?.name === "nativewindui") { %>
|
|
34
|
-
"
|
|
35
|
-
"nativewind": "preview",
|
|
36
|
-
"postcss": "^8.5.6",
|
|
37
|
-
"react-native-css": "latest",
|
|
34
|
+
"nativewind": "latest",
|
|
38
35
|
<% } %>
|
|
39
36
|
<% if (props.stylingPackage?.name === "nativewindui") { %>
|
|
40
|
-
"@
|
|
41
|
-
"@legendapp/list": "^2.0.4",
|
|
37
|
+
"@shopify/flash-list": "2.0.2",
|
|
42
38
|
"class-variance-authority": "^0.7.0",
|
|
43
|
-
"clsx": "^2.1.
|
|
44
|
-
"
|
|
45
|
-
"
|
|
46
|
-
"
|
|
47
|
-
"
|
|
39
|
+
"clsx": "^2.1.0",
|
|
40
|
+
"tailwind-merge": "^2.2.1",
|
|
41
|
+
"react-native-uitextview": "^1.1.4",
|
|
42
|
+
"rn-icon-mapper": "^0.0.1",
|
|
43
|
+
"expo-haptics": "~15.0.7",
|
|
44
|
+
"expo-symbols": "~1.0.7",
|
|
48
45
|
<% if (props.stylingPackage?.options.selectedComponents.includes('date-picker')) { %>
|
|
49
46
|
"@react-native-community/datetimepicker": "8.4.4",
|
|
50
47
|
<% } %>
|
|
51
48
|
<% if (props.stylingPackage?.options.selectedComponents.includes('picker')) { %>
|
|
52
49
|
"@react-native-picker/picker": "2.11.1",
|
|
53
50
|
<% } %>
|
|
54
|
-
<% if (props.stylingPackage?.options.selectedComponents.includes('bottom-sheet')) { %>
|
|
55
|
-
"@gorhom/bottom-sheet": "^5",
|
|
56
|
-
<% } %>
|
|
57
51
|
<% if (props.stylingPackage?.options.selectedComponents.includes('action-sheet')) { %>
|
|
58
|
-
"@expo/react-native-action-sheet": "^4.
|
|
52
|
+
"@expo/react-native-action-sheet": "^4.0.1",
|
|
59
53
|
<% } %>
|
|
60
54
|
<% if (props.stylingPackage?.options.selectedComponents.includes('ratings-indicator')) { %>
|
|
61
|
-
"expo-store-review": "~9.0.
|
|
55
|
+
"expo-store-review": "~9.0.8",
|
|
62
56
|
<% } %>
|
|
63
57
|
<% if (props.stylingPackage?.options.selectedComponents.includes('slider')) { %>
|
|
64
58
|
"@react-native-community/slider": "5.0.1",
|
|
@@ -66,31 +60,17 @@
|
|
|
66
60
|
<% } %>
|
|
67
61
|
|
|
68
62
|
<% if (props.stateManagementPackage?.name === "zustand") { %>
|
|
69
|
-
"zustand": "^5.
|
|
70
|
-
<% } %>
|
|
71
|
-
|
|
72
|
-
<% if (props.stylingPackage?.name === "restyle") { %>
|
|
73
|
-
"@shopify/restyle": "^2.4.5",
|
|
74
|
-
<% } %>
|
|
75
|
-
|
|
76
|
-
<% if (props.stylingPackage?.name === "tamagui") { %>
|
|
77
|
-
"@tamagui/font-inter": "^1.132.23",
|
|
78
|
-
"@tamagui/react-native-media-driver": "^1.132.23",
|
|
79
|
-
"@tamagui/shorthands": "^1.132.23",
|
|
80
|
-
"@tamagui/themes": "^1.132.23",
|
|
81
|
-
"tamagui": "^1.132.23",
|
|
82
|
-
"@tamagui/animations-react-native": "^1.132.23",
|
|
83
|
-
"expo-font": "~14.0.8",
|
|
63
|
+
"zustand": "^4.5.1",
|
|
84
64
|
<% } %>
|
|
85
65
|
|
|
86
66
|
<% if (props.stylingPackage?.name === "unistyles") { %>
|
|
87
|
-
"react-native-unistyles": "3.0.
|
|
88
|
-
"react-native-nitro-modules": "0.
|
|
89
|
-
"react-native-edge-to-edge": "1.
|
|
67
|
+
"react-native-unistyles": "3.0.0-rc.4",
|
|
68
|
+
"react-native-nitro-modules": "0.25.2",
|
|
69
|
+
"react-native-edge-to-edge": "1.6.0",
|
|
90
70
|
<% } %>
|
|
91
71
|
|
|
92
72
|
<% if (props.navigationPackage?.type === "navigation") { %>
|
|
93
|
-
"@react-navigation/native": "^7.
|
|
73
|
+
"@react-navigation/native": "^7.1.6",
|
|
94
74
|
"react-native-gesture-handler": "~2.28.0",
|
|
95
75
|
"react-native-screens": "~4.16.0",
|
|
96
76
|
<% } %>
|
|
@@ -101,30 +81,26 @@
|
|
|
101
81
|
<% } %>
|
|
102
82
|
|
|
103
83
|
<% if (props.analyticsPackage?.name === "vexo-analytics") { %>
|
|
104
|
-
"vexo-analytics": "^1.
|
|
105
|
-
<% } %>
|
|
106
|
-
|
|
107
|
-
<% if ((props.navigationPackage?.name === "react-navigation") && (props.stylingPackage?.name === "tamagui")) { %>
|
|
108
|
-
"expo-splash-screen": "~31.0.9",
|
|
84
|
+
"vexo-analytics": "^1.3.15",
|
|
109
85
|
<% } %>
|
|
110
86
|
|
|
111
87
|
<% if (props.navigationPackage?.options.type === "tabs" && props.navigationPackage?.name === "react-navigation") { %>
|
|
112
|
-
"@react-navigation/bottom-tabs": "^7.
|
|
88
|
+
"@react-navigation/bottom-tabs": "^7.0.5",
|
|
113
89
|
<% } %>
|
|
114
90
|
|
|
115
91
|
<% if ((props.navigationPackage?.options.type === "drawer + tabs") && (props.navigationPackage?.name === "react-navigation")) { %>
|
|
116
|
-
"@react-navigation/drawer": "^7.
|
|
117
|
-
"@react-navigation/bottom-tabs": "^7.
|
|
92
|
+
"@react-navigation/drawer": "^7.0.0",
|
|
93
|
+
"@react-navigation/bottom-tabs": "^7.0.5",
|
|
118
94
|
<% } else if (props.navigationPackage?.options.type === "drawer + tabs") { %>
|
|
119
|
-
"@react-navigation/drawer": "^7.
|
|
120
|
-
"@react-navigation/bottom-tabs": "^7.
|
|
95
|
+
"@react-navigation/drawer": "^7.0.0",
|
|
96
|
+
"@react-navigation/bottom-tabs": "^7.0.5",
|
|
121
97
|
<% } %>
|
|
122
98
|
|
|
123
99
|
<% if (props.navigationPackage?.name === "expo-router") { %>
|
|
124
100
|
"@expo/vector-icons": "^15.0.2",
|
|
125
101
|
"expo-linking": "~8.0.8",
|
|
126
|
-
"expo-router": "~6.0.
|
|
127
|
-
"expo-constants": "~18.0.
|
|
102
|
+
"expo-router": "~6.0.10",
|
|
103
|
+
"expo-constants": "~18.0.9",
|
|
128
104
|
"expo-system-ui": "~6.0.7",
|
|
129
105
|
"expo-web-browser": "~15.0.7",
|
|
130
106
|
"react-dom": "19.1.0",
|
|
@@ -132,40 +108,34 @@
|
|
|
132
108
|
<% } %>
|
|
133
109
|
|
|
134
110
|
<% if (props.authenticationPackage?.name === "supabase") { %>
|
|
135
|
-
|
|
136
|
-
"@supabase/supabase-js": "^2.
|
|
111
|
+
"@react-native-async-storage/async-storage": "1.21.0",
|
|
112
|
+
"@supabase/supabase-js": "^2.38.4",
|
|
137
113
|
<% } %>
|
|
138
114
|
|
|
139
115
|
<% if (props.authenticationPackage?.name === "firebase") { %>
|
|
140
|
-
"firebase": "^
|
|
116
|
+
"firebase": "^10.5.2",
|
|
141
117
|
<% } %>
|
|
142
118
|
|
|
143
119
|
<% if (props.internalizationPackage?.name === "i18next") { %>
|
|
144
|
-
"i18next": "^
|
|
145
|
-
"react-i18next": "^
|
|
146
|
-
"expo-localization": "~
|
|
120
|
+
"i18next": "^23.7.20",
|
|
121
|
+
"react-i18next": "^14.0.1",
|
|
122
|
+
"expo-localization": "~14.8.3",
|
|
147
123
|
<% } %>
|
|
148
124
|
<% if (props.flags?.eas || props.stylingPackage?.name === "nativewindui") { %>
|
|
149
|
-
"expo-dev-client": "~6.0.
|
|
150
|
-
"expo-
|
|
125
|
+
"expo-dev-client": "~6.0.13",
|
|
126
|
+
"expo-device": "~8.0.9",
|
|
151
127
|
<% } %>
|
|
152
128
|
|
|
153
|
-
|
|
154
129
|
"react-native-reanimated": "~4.1.1",
|
|
155
130
|
"react-native-worklets": "0.5.1",
|
|
156
131
|
|
|
157
|
-
|
|
158
132
|
"react-native-safe-area-context": "~5.6.0",
|
|
159
|
-
"expo": "
|
|
133
|
+
"expo": "^54.0.0",
|
|
160
134
|
"expo-status-bar": "~3.0.8",
|
|
161
135
|
"react": "19.1.0",
|
|
162
136
|
"react-native": "0.81.4"
|
|
163
137
|
},
|
|
164
138
|
"devDependencies": {
|
|
165
|
-
<%# patch for this issue : https://github.com/expo/expo/issues/26641 %>
|
|
166
|
-
<% if ((props.packageManager === "bun" || props.packageManager === "npm") && props.navigationPackage?.name === "expo-router") { %>
|
|
167
|
-
"ajv": "^8.17.1",
|
|
168
|
-
<% } %>
|
|
169
139
|
"@babel/core": "^7.20.0",
|
|
170
140
|
"@types/react": "~19.1.10",
|
|
171
141
|
"eslint": "^9.25.1",
|
|
@@ -173,11 +143,8 @@
|
|
|
173
143
|
"eslint-config-prettier": "^10.1.2",
|
|
174
144
|
"prettier": "^3.2.5",
|
|
175
145
|
<% if (props.stylingPackage?.name === "nativewind" || props.stylingPackage?.name === "nativewindui") { %>
|
|
176
|
-
"tailwindcss": "^4.
|
|
177
|
-
"prettier-plugin-tailwindcss": "^0.
|
|
178
|
-
<% } %>
|
|
179
|
-
<% if (props.stylingPackage?.name === "tamagui") { %>
|
|
180
|
-
"@tamagui/babel-plugin": "^1.132.23",
|
|
146
|
+
"tailwindcss": "^3.4.0",
|
|
147
|
+
"prettier-plugin-tailwindcss": "^0.5.11",
|
|
181
148
|
<% } %>
|
|
182
149
|
"typescript": "~5.9.2"
|
|
183
150
|
},
|
|
@@ -1,24 +1,24 @@
|
|
|
1
1
|
{
|
|
2
2
|
"extends": "expo/tsconfig.base",
|
|
3
3
|
"compilerOptions": {
|
|
4
|
-
"strict": true,
|
|
5
|
-
"jsx": "react-jsx"
|
|
6
4
|
<% if (props.flags.importAlias) { %>
|
|
7
|
-
|
|
5
|
+
"strict": true,
|
|
8
6
|
"baseUrl": ".",
|
|
9
7
|
"paths": {
|
|
10
8
|
<% if (props.stylingPackage?.name === 'nativewindui') { %>
|
|
11
|
-
"
|
|
9
|
+
"@/*": [ "./*" ]
|
|
12
10
|
<% } else { %>
|
|
13
11
|
<% if (props.navigationPackage?.name === "expo-router" && props.flags.importAlias === true) { %>
|
|
14
|
-
"
|
|
12
|
+
"@/*": ["*"]
|
|
15
13
|
<% } else if (props.flags.importAlias === true) { %>
|
|
16
|
-
"
|
|
14
|
+
"@/*": ["src/*"]
|
|
17
15
|
<% } else { %>
|
|
18
16
|
"<%= props.flags.importAlias %>": ["src/*"]
|
|
19
17
|
<% } %>
|
|
20
18
|
<% } %>
|
|
21
19
|
}
|
|
20
|
+
<% } else { %>
|
|
21
|
+
"strict": true
|
|
22
22
|
<% } %>
|
|
23
23
|
<% if (props.navigationPackage?.name === 'expo-router') { %>
|
|
24
24
|
},
|
|
@@ -26,7 +26,12 @@
|
|
|
26
26
|
"**/*.ts",
|
|
27
27
|
"**/*.tsx",
|
|
28
28
|
".expo/types/**/*.ts",
|
|
29
|
-
|
|
29
|
+
<% if (props.stylingPackage?.name === 'nativewind' || props.stylingPackage?.name === 'nativewindui') { %>
|
|
30
|
+
"expo-env.d.ts",
|
|
31
|
+
"nativewind-env.d.ts"
|
|
32
|
+
<% } else { %>
|
|
33
|
+
"expo-env.d.ts"
|
|
34
|
+
<% } %>
|
|
30
35
|
]
|
|
31
36
|
<% } else { %>
|
|
32
37
|
}
|