@fto-consult/expo-ui 6.20.4 → 6.20.6

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 (2) hide show
  1. package/bin/create-app.js +51 -45
  2. package/package.json +1 -1
package/bin/create-app.js CHANGED
@@ -6,61 +6,67 @@ module.exports = function(parsedArgs,{projectRoot}){
6
6
  const packageObj = require("../package.json");
7
7
  let root = process.cwd(), mainPackagePath = path.resolve(root,"package.json");
8
8
  let mainPackage = fs.existsSync(mainPackagePath) && require(`${mainPackagePath}`) || null;
9
- const name = argvName && argvName.trim() || String(mainPackage?.name).trim();
9
+ const name = argvName && argvName.trim() || mainPackage?.name && String(mainPackage?.name).trim();
10
10
  if(!name){
11
- return thowError(name," nom de l'application invalide, veuillez spécifier un nom d'application valide",argv);
11
+ return thowError(name," nom de l'application invalide, veuillez spécifier un nom d'application valide",argvName,process.argv);
12
12
  }
13
13
  const devDependencies = packageObj.devDependencies;
14
14
  let hasPackage = String(mainPackage?.name)?.toLowerCase() !== name?.toLowerCase() ? false : mainPackage && typeof mainPackage =='object';
15
+ const devDeps = {
16
+ ...defaultDevDependencies,
17
+ ...(devDependencies && typeof devDependencies ==='object'? devDependencies : {}),
18
+ };
19
+ const euModule = "@fto-consult/expo-ui";
20
+ let hasUpdateDeps = false;
15
21
  if(!hasPackage){
16
- mainPackage = {
17
- name,
18
- version : "1.0.0",
19
- "description": "",
20
- "main": "index.js",
21
- "scripts" : {
22
- start : "npx expo start -c",
23
- },
24
- "dependencies" : {
25
- "@fto-consult/expo-ui" : "latest",
26
- },
27
- devDependencies : {
28
- ...defaultDevDependencies,
29
- ...(devDependencies && typeof devDependencies ==='object'? devDependencies : {}),
30
- },
31
- }
22
+ mainPackage = {
23
+ name,
24
+ version : "1.0.0",
25
+ "description": "",
26
+ "main": "index.js",
27
+ "scripts" : {
28
+ start : "npx expo start -c",
29
+ },
30
+ "dependencies" : {
31
+ [euModule] : "latest",
32
+ },
33
+ devDependencies : devDeps
34
+ }
35
+ } else if(mainPackage){
36
+ mainPackage.devDependencies = typeof mainPackage.devDependencies =='object' && mainPackage.devDependencies || {};
37
+ mainPackage.dependencies = typeof mainPackage.dependencies ==="object" && mainPackage.dependencies || {};
38
+ for(let i in devDeps){
39
+ if(!(i in mainPackage.devDependencies)){
40
+ hasUpdateDeps = true;
41
+ mainPackage.devDependencies[i] = devDeps[i];
42
+ }
43
+ }
44
+ if(!(euModule in mainPackage.dependencies)){
45
+ hasUpdateDeps = true;
46
+ mainPackage.dependencies[euModule] = "latest";
47
+ }
32
48
  const newDir = createDirSync(path.resolve(root,name.trim()));
33
49
  projectRoot = newDir || projectRoot;
34
50
  mainPackagePath = path.resolve(projectRoot,"package.json");
35
51
  }
36
- const cb = ()=>{
37
- const deps = devDependencies && typeof devDependencies =="object" && Object.keys(devDependencies).join(" ") || "";
38
- new Promise((resolve,reject)=>{
39
- console.log("installing dev dependencies ....");
40
- return exec(`npm i -D ${Object.keys(defaultDevDependencies).join(" ")} ${typeof deps=="string" && deps||""}`,{projectRoot}).then(resolve).catch(reject);
41
- }).then(()=>{}).finally(()=>{
42
- console.log("creating application .....");
43
- createEntryFile(projectRoot);
44
- [path.join(projectRoot,"babel.config.js"),path.join(projectRoot,"metro.config.js"),path.join(projectRoot,"webpack.config.js")].map((p)=>{
45
- if(!fs.existsSync(p)){
46
- const file = path.basename(p);
47
- writeFile(p,fs.readFileSync(`${path.join(createAppDir,file)}`));
48
- }
49
- });
50
- createAPPJSONFile(projectRoot,{...mainPackage,name});
51
- copy(path.resolve(createAppDir,"src"),path.resolve(projectRoot,"src"),{recursive:true,overwrite:false});
52
- process.exit();
53
- });
52
+ if(hasUpdateDeps || !hasPackage){
53
+ writeFile(mainPackagePath,JSON.stringify(mainPackage,null,2));
54
54
  }
55
- if(!hasPackage){
56
- writeFile(mainPackagePath,JSON.stringify(mainPackage,null,2));
57
- process.on('unhandledRejection', err => {
58
- console.log(err," is thrown");
59
- });
60
- console.log("initializing application "+name+"...");
61
- exec("npm install",{projectRoot}).finally(cb);
62
- } else {
63
- return cb();
55
+ console.log("creating application .....");
56
+ createEntryFile(projectRoot);
57
+ [path.join(projectRoot,"babel.config.js"),path.join(projectRoot,"metro.config.js"),path.join(projectRoot,"webpack.config.js")].map((p)=>{
58
+ if(!fs.existsSync(p)){
59
+ const file = path.basename(p);
60
+ writeFile(p,fs.readFileSync(`${path.join(createAppDir,file)}`));
61
+ }
62
+ });
63
+ createAPPJSONFile(projectRoot,{...mainPackage,name});
64
+ copy(path.resolve(createAppDir,"src"),path.resolve(projectRoot,"src"),{recursive:true,overwrite:false});
65
+ console.log("intalling dependencies ...");
66
+ try {
67
+ exec.sync(`npm install`,{projectRoot})
68
+ } finally{
69
+ process.exit();
64
70
  }
65
71
  }
66
72
  const defaultDevDependencies = {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fto-consult/expo-ui",
3
- "version": "6.20.4",
3
+ "version": "6.20.6",
4
4
  "description": "Bibliothèque de composants UI Expo,react-native",
5
5
  "main": "index.js",
6
6
  "scripts": {