create-expo-stack 2.7.0 → 2.7.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.
|
@@ -6,11 +6,8 @@
|
|
|
6
6
|
<% } %>
|
|
7
7
|
"scripts": {
|
|
8
8
|
"android": "expo start --android",
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
<% } else { %>
|
|
12
|
-
"format": "eslint \"**/*.{js,jsx,ts,tsx}\" --fix && prettier \"**/*.{js,jsx,ts,tsx,json}\" --write",
|
|
13
|
-
<% } %>
|
|
9
|
+
"lint": "eslint \"**/*.{js,jsx,ts,tsx}\" && prettier -c \"**/*.{js,jsx,ts,tsx,json}\"",
|
|
10
|
+
"format": "eslint \"**/*.{js,jsx,ts,tsx}\" --fix && prettier \"**/*.{js,jsx,ts,tsx,json}\" --write",
|
|
14
11
|
"ios": "expo start --ios",
|
|
15
12
|
"start": "expo start",
|
|
16
13
|
"web": "expo start --web"
|
|
@@ -147,10 +144,10 @@
|
|
|
147
144
|
<% } %>
|
|
148
145
|
"@babel/core": "^7.20.0",
|
|
149
146
|
"@types/react": "~18.2.14",
|
|
150
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
151
|
-
"@typescript-eslint/parser": "^
|
|
152
|
-
"eslint": "^8.
|
|
153
|
-
"eslint-config-universe": "^12.0.
|
|
147
|
+
"@typescript-eslint/eslint-plugin": "^7.7.0",
|
|
148
|
+
"@typescript-eslint/parser": "^7.7.0",
|
|
149
|
+
"eslint": "^8.57.0",
|
|
150
|
+
"eslint-config-universe": "^12.0.1",
|
|
154
151
|
"prettier": "^3.2.5",
|
|
155
152
|
<% if (props.stylingPackage?.name === "nativewind" || props.stylingPackage?.name === "nativewindui") { %>
|
|
156
153
|
"tailwindcss": "^3.4.0",
|
|
@@ -159,7 +156,7 @@
|
|
|
159
156
|
<% if (props.stylingPackage?.name === "tamagui") { %>
|
|
160
157
|
"@tamagui/babel-plugin": "1.74.8",
|
|
161
158
|
<% } %>
|
|
162
|
-
"typescript": "^5.
|
|
159
|
+
"typescript": "^5.4.5"
|
|
163
160
|
},
|
|
164
161
|
"eslintConfig": {
|
|
165
162
|
"extends": "universe/native"
|
|
@@ -61,7 +61,7 @@ function printOutput(cliResults, formattedFiles, toolbox, stylingPackage) {
|
|
|
61
61
|
_b.sent();
|
|
62
62
|
s.stop('Base assets copied!');
|
|
63
63
|
packageManager = cliResults.flags.packageManager || (0, getPackageManager_1.getPackageManager)(toolbox, cliResults);
|
|
64
|
-
if (!(!options.noInstall && !flags.noInstall)) return [3 /*break*/,
|
|
64
|
+
if (!(!options.noInstall && !flags.noInstall)) return [3 /*break*/, 7];
|
|
65
65
|
s.start("Installing dependencies using ".concat(packageManager, "..."));
|
|
66
66
|
// install with yarn or npm i
|
|
67
67
|
return [4 /*yield*/, system.spawn("cd ".concat(projectName, " && ").concat(packageManager, " install --silent"), {
|
|
@@ -72,46 +72,64 @@ function printOutput(cliResults, formattedFiles, toolbox, stylingPackage) {
|
|
|
72
72
|
// install with yarn or npm i
|
|
73
73
|
_b.sent();
|
|
74
74
|
s.stop('Dependencies installed!');
|
|
75
|
+
s.start('Updating Expo to latest version...');
|
|
76
|
+
return [4 /*yield*/, system.spawn("cd ".concat(projectName, " && ").concat(packageManager, " install --silent expo@latest"), {
|
|
77
|
+
shell: true,
|
|
78
|
+
stdio: ['ignore', 'ignore', 'inherit']
|
|
79
|
+
})];
|
|
80
|
+
case 4:
|
|
81
|
+
_b.sent();
|
|
82
|
+
s.stop('Latest version of Expo installed!');
|
|
83
|
+
s.start('Updating packages to expo compatible versions...');
|
|
84
|
+
return [4 /*yield*/, system.spawn("cd ".concat(projectName, " && ").concat(packageManager, " expo install --fix"), {
|
|
85
|
+
shell: true,
|
|
86
|
+
stdio: ['ignore', 'ignore', 'inherit']
|
|
87
|
+
})];
|
|
88
|
+
case 5:
|
|
89
|
+
_b.sent();
|
|
90
|
+
s.stop('Packages updated!');
|
|
75
91
|
s.start("Cleaning up your project...");
|
|
76
92
|
// format the files with prettier and eslint using installed packages.
|
|
77
93
|
return [4 /*yield*/, system.spawn("cd ".concat(projectName, " && ").concat(packageManager, " run format"), {
|
|
78
94
|
shell: true,
|
|
79
|
-
|
|
95
|
+
// To only show errors https://nodejs.org/api/child_process.html#optionsstdio
|
|
96
|
+
stdio: ['ignore', 'ignore', 'inherit']
|
|
80
97
|
})];
|
|
81
|
-
case
|
|
98
|
+
case 6:
|
|
82
99
|
// format the files with prettier and eslint using installed packages.
|
|
83
100
|
_b.sent();
|
|
84
101
|
s.stop('Project files formatted!');
|
|
85
|
-
return [3 /*break*/,
|
|
86
|
-
case
|
|
102
|
+
return [3 /*break*/, 9];
|
|
103
|
+
case 7:
|
|
87
104
|
runnerType = (0, getPackageManager_1.getPackageManagerRunnerX)(toolbox, cliResults);
|
|
88
105
|
s.start("No installation found.\nCleaning up your project using ".concat(runnerType, "..."));
|
|
89
106
|
// Running prettier using global runners against the template.
|
|
90
107
|
// Use --no-config to prevent using project's config (that may have plugins/dependencies)
|
|
91
108
|
return [4 /*yield*/, system.spawn("".concat(runnerType, " prettier \"").concat(projectName, "/**/*.{json,js,jsx,ts,tsx}\" --no-config --write"), {
|
|
92
109
|
shell: true,
|
|
93
|
-
|
|
110
|
+
// To only show errors https://nodejs.org/api/child_process.html#optionsstdio
|
|
111
|
+
stdio: ['ignore', 'ignore', 'inherit']
|
|
94
112
|
})];
|
|
95
|
-
case
|
|
113
|
+
case 8:
|
|
96
114
|
// Running prettier using global runners against the template.
|
|
97
115
|
// Use --no-config to prevent using project's config (that may have plugins/dependencies)
|
|
98
116
|
_b.sent();
|
|
99
117
|
s.stop('Project files formatted!');
|
|
100
|
-
_b.label =
|
|
101
|
-
case
|
|
102
|
-
if (!(!options.noGit && !flags.noGit)) return [3 /*break*/,
|
|
118
|
+
_b.label = 9;
|
|
119
|
+
case 9:
|
|
120
|
+
if (!(!options.noGit && !flags.noGit)) return [3 /*break*/, 11];
|
|
103
121
|
s.start("Initializing git...");
|
|
104
122
|
// initialize git repo and add first commit
|
|
105
123
|
return [4 /*yield*/, system.spawn("cd ".concat(projectName, " && git init --quiet && git add . && git commit -m \"Initial commit\" -m \"Generated by create-expo-stack 2.0.0.\" --quiet"), {
|
|
106
124
|
shell: true,
|
|
107
125
|
stdio: 'inherit'
|
|
108
126
|
})];
|
|
109
|
-
case
|
|
127
|
+
case 10:
|
|
110
128
|
// initialize git repo and add first commit
|
|
111
129
|
_b.sent();
|
|
112
130
|
s.stop("Git initialized!");
|
|
113
|
-
_b.label =
|
|
114
|
-
case
|
|
131
|
+
_b.label = 11;
|
|
132
|
+
case 11:
|
|
115
133
|
// check if packages includes package with name "supabase"
|
|
116
134
|
if (cliResults.packages.some(function (pkg) { return pkg.name === 'supabase'; })) {
|
|
117
135
|
success("\nSuccess! \uD83C\uDF89 Now, here's what's next:");
|
|
@@ -190,4 +208,4 @@ function printOutput(cliResults, formattedFiles, toolbox, stylingPackage) {
|
|
|
190
208
|
});
|
|
191
209
|
}
|
|
192
210
|
exports.printOutput = printOutput;
|
|
193
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
211
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpbnRPdXRwdXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbGl0aWVzL3ByaW50T3V0cHV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVBLHlEQUFrRjtBQUVsRixtREFBa0Q7QUFDbEQsMENBQWdEO0FBRWhELFNBQXNCLFdBQVcsQ0FDL0IsVUFBc0IsRUFDdEIsY0FBcUIsRUFDckIsT0FBZ0IsRUFDaEIsY0FBaUM7Ozs7OztvQkFHakIsT0FBTyxHQUduQixPQUFPLG1CQUhZLEVBQ3JCLEtBRUUsT0FBTyxNQUYwQixFQUExQixJQUFJLFVBQUEsRUFBRSxPQUFPLGFBQUEsRUFBRSxTQUFTLGVBQUEsRUFDakMsTUFBTSxHQUNKLE9BQU8sT0FESCxDQUNJO29CQUVKLFdBQVcsR0FBWSxVQUFVLFlBQXRCLEVBQUUsS0FBSyxHQUFLLFVBQVUsTUFBZixDQUFnQjtvQkFDcEMsQ0FBQyxHQUFHLElBQUEsaUJBQU8sR0FBRSxDQUFDO29CQUVwQixpQ0FBaUM7b0JBRWpDLENBQUMsQ0FBQyxLQUFLLENBQUMsOEJBQThCLENBQUMsQ0FBQztvQkFDeEMscUJBQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsRUFBQTs7b0JBQWpDLFNBQWlDLENBQUM7b0JBQ2xDLENBQUMsQ0FBQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsQ0FBQztvQkFFL0IsQ0FBQyxDQUFDLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO29CQUNsQyxxQkFBTSxJQUFBLCtCQUFjLEVBQUMsV0FBVyxFQUFFLE9BQU8sQ0FBQyxFQUFBOztvQkFBMUMsU0FBMEMsQ0FBQztvQkFDM0MsQ0FBQyxDQUFDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO29CQUd4QixjQUFjLEdBQUcsVUFBVSxDQUFDLEtBQUssQ0FBQyxjQUFjLElBQUksSUFBQSxxQ0FBaUIsRUFBQyxPQUFPLEVBQUUs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
|