@fto-consult/expo-ui 7.5.6 → 7.5.8
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/bin/init.js +9 -5
- package/package.json +1 -1
package/bin/init.js
CHANGED
|
@@ -6,7 +6,7 @@ const writeFile = require("../electron/utils/writeFile");
|
|
|
6
6
|
const copy = require("../electron/utils/copy");
|
|
7
7
|
const electronDir = path.resolve(__dirname,"..","electron");
|
|
8
8
|
const createIndexFile = require("../electron/create-index-file");
|
|
9
|
-
const appSuffix = "-
|
|
9
|
+
const appSuffix = "-desk";
|
|
10
10
|
const mainPackage = require("../package.json");
|
|
11
11
|
const mainPackageName = mainPackage.name;
|
|
12
12
|
|
|
@@ -16,19 +16,23 @@ module.exports = ({projectRoot,electronProjectRoot,paths,pathsJSON})=>{
|
|
|
16
16
|
if(!createDir(electronProjectRoot)){
|
|
17
17
|
throw "Unable to create electron project root directory at "+electronProjectRoot;
|
|
18
18
|
}
|
|
19
|
-
const
|
|
19
|
+
const mPackageJSON = Object.assign({},require(`${path.resolve(projectRoot,'package.json')}`));
|
|
20
|
+
const electronPackagePath = path.resolve(electronProjectRoot,"package.json");
|
|
21
|
+
const electronPackageJSON = Object.assign({},fs.existsSync(electronPackagePath)? require(electronPackagePath) : {});
|
|
22
|
+
const projectRootPackage = {...mPackageJSON,...electronPackageJSON};
|
|
20
23
|
const dependencies = require("../electron/dependencies");
|
|
21
24
|
const electronProjectRootPackage = path.resolve(electronProjectRoot,"package.json");
|
|
22
25
|
projectRootPackage.main = `node_modules/${mainPackageName}/electron/index.js`;
|
|
23
|
-
projectRootPackage.dependencies = dependencies.main;
|
|
24
|
-
projectRootPackage.
|
|
26
|
+
projectRootPackage.dependencies = {...dependencies.main,...Object.assign(electronPackageJSON.dependencies)};
|
|
27
|
+
projectRootPackage.dependencies[mainPackage.name] = mainPackage.version;
|
|
28
|
+
projectRootPackage.devDependencies = {...dependencies.dev,...Object.assign({},electronPackageJSON.devDependencies)};
|
|
25
29
|
projectRootPackage.scripts = {
|
|
26
30
|
"build" : `npx ${mainPackageName} electron build`,
|
|
27
31
|
"start" : `npx ${mainPackageName} electron start`,
|
|
28
32
|
"run-dev" : `npx ${mainPackageName} electron start`,
|
|
29
33
|
"compile2start" : `npx ${mainPackageName} electron start --build`,
|
|
30
34
|
}
|
|
31
|
-
projectRootPackage.name = projectRootPackage.name
|
|
35
|
+
projectRootPackage.name = projectRootPackage.name;
|
|
32
36
|
projectRootPackage.realAppName = typeof projectRootPackage.realAppName =="string" && projectRootPackage.realAppName || projectRootPackage.name;
|
|
33
37
|
if(!projectRootPackage.name.endsWith(appSuffix)){
|
|
34
38
|
projectRootPackage.name +=appSuffix;
|