Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@pavjacko
pavjacko committed Apr 1, 2019
1 parent 10724ad commit 728ebd8
Show file tree
Hide file tree
Showing 21 changed files with 78 additions and 57 deletions.
1 change: 0 additions & 1 deletion README.md
View file
Expand Up @@ -352,7 +352,6 @@ Folder Structure (Generated Project)
│ └── helloWorld # Example application flavour
│ ├── assets # Cross platform assets
│ └── config.json # Application flavour config
├── entry # Entry point index files
├── platformAssets # Generated cross-platform assets
├── platformBuilds # Generated platform app projects
├── projectConfigs # Project configuration files/assets
Expand Down
6 changes: 3 additions & 3 deletions entry/index.android.js → index.android.js
View file
@@ -1,7 +1,7 @@
import { AppRegistry, Platform } from 'react-native';
import App from '../src/app';
import Api from '../src/api';
import { ANDROID, FORM_FACTOR_MOBILE } from '../src/constants';
import App from './src/app';
import Api from './src/api';
import { ANDROID, FORM_FACTOR_MOBILE } from './src/constants';

Api.platform = ANDROID;
Api.formFactor = FORM_FACTOR_MOBILE;
Expand Down
6 changes: 3 additions & 3 deletions entry/index.androidtv.js → index.androidtv.js
View file
@@ -1,7 +1,7 @@
import { AppRegistry, Platform } from 'react-native';
import App from '../src/app';
import Api from '../src/api';
import { ANDROID, FORM_FACTOR_TV } from '../src/constants';
import App from './src/app';
import Api from './src/api';
import { ANDROID, FORM_FACTOR_TV } from './src/constants';

Api.platform = ANDROID;
Api.formFactor = FORM_FACTOR_TV;
Expand Down
6 changes: 3 additions & 3 deletions entry/index.androidwear.js → index.androidwear.js
View file
@@ -1,7 +1,7 @@
import { AppRegistry, Platform } from 'react-native';
import App from '../src/app';
import Api from '../src/api';
import { ANDROID_WEAR, FORM_FACTOR_WATCH } from '../src/constants';
import App from './src/app';
import Api from './src/api';
import { ANDROID_WEAR, FORM_FACTOR_WATCH } from './src/constants';

Api.platform = ANDROID_WEAR;
Api.formFactor = FORM_FACTOR_WATCH;
Expand Down
6 changes: 3 additions & 3 deletions entry/index.ios.js → index.ios.js 100755 → 100644
View file
@@ -1,7 +1,7 @@
import { AppRegistry, Platform } from 'react-native';
import App from '../src/app';
import Api from '../src/api';
import { IOS, FORM_FACTOR_MOBILE } from '../src/constants';
import App from './src/app';
import Api from './src/api';
import { IOS, FORM_FACTOR_MOBILE } from './src/constants';

Api.platform = IOS;
Api.formFactor = FORM_FACTOR_MOBILE;
Expand Down
8 changes: 4 additions & 4 deletions entry/index.kaios.js → index.kaios.js
View file
@@ -1,9 +1,9 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from '../src/app';
import Api from '../src/api';
import registerServiceWorker from '../src/registerServiceWorker';
import { KAIOS, FORM_FACTOR_MOBILE } from '../src/constants';
import App from './src/app';
import Api from './src/api';
import registerServiceWorker from './src/registerServiceWorker';
import { KAIOS, FORM_FACTOR_MOBILE } from './src/constants';

Api.platform = KAIOS;
Api.formFactor = FORM_FACTOR_MOBILE;
Expand Down
8 changes: 4 additions & 4 deletions entry/index.macos.js → index.macos.js
View file
@@ -1,9 +1,9 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from '../src/app';
import Api from '../src/api';
import registerServiceWorker from '../src/registerServiceWorker';
import { MACOS, FORM_FACTOR_DESKTOP } from '../src/constants';
import App from './src/app';
import Api from './src/api';
import registerServiceWorker from './src/registerServiceWorker';
import { MACOS, FORM_FACTOR_DESKTOP } from './src/constants';

Api.platform = MACOS;
Api.formFactor = FORM_FACTOR_DESKTOP;
Expand Down
8 changes: 4 additions & 4 deletions entry/index.tizen.js → index.tizen.js
View file
@@ -1,9 +1,9 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from '../src/app';
import Api from '../src/api';
import registerServiceWorker from '../src/registerServiceWorker';
import { TIZEN, FORM_FACTOR_TV, PLATFORM_GROUP_SMARTTV } from '../src/constants';
import App from './src/app';
import Api from './src/api';
import registerServiceWorker from './src/registerServiceWorker';
import { TIZEN, FORM_FACTOR_TV, PLATFORM_GROUP_SMARTTV } from './src/constants';

Api.platform = TIZEN;
Api.formFactor = FORM_FACTOR_TV;
Expand Down
8 changes: 4 additions & 4 deletions entry/index.tizenwatch.js → index.tizenwatch.js
View file
@@ -1,9 +1,9 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from '../src/app';
import Api from '../src/api';
import registerServiceWorker from '../src/registerServiceWorker';
import { TIZEN, FORM_FACTOR_WATCH } from '../src/constants';
import App from './src/app';
import Api from './src/api';
import registerServiceWorker from './src/registerServiceWorker';
import { TIZEN, FORM_FACTOR_WATCH } from './src/constants';

Api.platform = TIZEN;
Api.formFactor = FORM_FACTOR_WATCH;
Expand Down
6 changes: 3 additions & 3 deletions entry/index.tvos.js → index.tvos.js
View file
@@ -1,7 +1,7 @@
import { AppRegistry, Platform } from 'react-native';
import App from '../src/app';
import Api from '../src/api';
import { TVOS, FORM_FACTOR_TV } from '../src/constants';
import App from './src/app';
import Api from './src/api';
import { TVOS, FORM_FACTOR_TV } from './src/constants';

Api.platform = TVOS;
Api.formFactor = FORM_FACTOR_TV;
Expand Down
8 changes: 4 additions & 4 deletions entry/index.web.js → index.web.js
View file
@@ -1,9 +1,9 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from '../src/app';
import Api from '../src/api';
import registerServiceWorker from '../src/registerServiceWorker';
import { WEB, FORM_FACTOR_DESKTOP } from '../src/constants';
import App from './src/app';
import Api from './src/api';
import registerServiceWorker from './src/registerServiceWorker';
import { WEB, FORM_FACTOR_DESKTOP } from './src/constants';

Api.platform = WEB;
Api.formFactor = FORM_FACTOR_DESKTOP;
Expand Down
8 changes: 4 additions & 4 deletions entry/index.webos.js → index.webos.js
View file
@@ -1,9 +1,9 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from '../src/app';
import Api from '../src/api';
import registerServiceWorker from '../src/registerServiceWorker';
import { WEBOS, FORM_FACTOR_TV, PLATFORM_GROUP_SMARTTV } from '../src/constants';
import App from './src/app';
import Api from './src/api';
import registerServiceWorker from './src/registerServiceWorker';
import { WEBOS, FORM_FACTOR_TV, PLATFORM_GROUP_SMARTTV } from './src/constants';

Api.platform = WEBOS;
Api.formFactor = FORM_FACTOR_TV;
Expand Down
8 changes: 4 additions & 4 deletions entry/index.windows.js → index.windows.js
View file
@@ -1,9 +1,9 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from '../src/app';
import Api from '../src/api';
import registerServiceWorker from '../src/registerServiceWorker';
import { WINDOWS, FORM_FACTOR_DESKTOP } from '../src/constants';
import App from './src/app';
import Api from './src/api';
import registerServiceWorker from './src/registerServiceWorker';
import { WINDOWS, FORM_FACTOR_DESKTOP } from './src/constants';

Api.platform = WINDOWS;
Api.formFactor = FORM_FACTOR_DESKTOP;
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
@@ -1,7 +1,7 @@
{
"name": "react-native-vanilla",
"title": "React Native Vanilla",
"version": "0.15.0",
"version": "0.16.0-alpha1",
"codename": "Django Chained",
"keywords": [
"react",
Expand Down
2 changes: 1 addition & 1 deletion rn-cli.config.js
View file
@@ -1,7 +1,7 @@
const path = require('path');

const config = {
projectRoot: path.resolve(__dirname, 'entry'),
projectRoot: path.resolve(__dirname),
watchFolders: [
path.resolve(__dirname),
],
Expand Down
2 changes: 1 addition & 1 deletion rnv-cli/platformTemplates/macos/webpack.config.js
View file
Expand Up @@ -67,7 +67,7 @@ module.exports = {
entry: {
fetch: 'whatwg-fetch',
polyfill: 'babel-polyfill',
bundle: path.resolve(appDirectory, `./entry/index.${platform}.js`),
bundle: path.resolve(appDirectory, `./index.${platform}.js`),
},

devServer: config.devServer || {
Expand Down
2 changes: 1 addition & 1 deletion rnv-cli/platformTemplates/web/webpack.config.js
View file
Expand Up @@ -64,7 +64,7 @@ module.exports = {
entry: {
fetch: 'whatwg-fetch',
polyfill: 'babel-polyfill',
bundle: path.resolve(appDirectory, `./entry/index.${platform}.js`),
bundle: path.resolve(appDirectory, `./index.${platform}.js`),
},

devServer: config.devServer || {
Expand Down
2 changes: 1 addition & 1 deletion rnv-cli/platformTemplates/webos/webpack.config.js
View file
Expand Up @@ -68,7 +68,7 @@ module.exports = {
entry: {
fetch: 'whatwg-fetch',
polyfill: 'babel-polyfill',
bundle: path.resolve(appDirectory, `./entry/index.${platform}.js`),
bundle: path.resolve(appDirectory, `./index.${platform}.js`),
},

devServer: config.devServer || {
Expand Down
2 changes: 1 addition & 1 deletion rnv-cli/platformTemplates/windows/webpack.config.js
View file
Expand Up @@ -67,7 +67,7 @@ module.exports = {
entry: {
fetch: 'whatwg-fetch',
polyfill: 'babel-polyfill',
bundle: path.resolve(appDirectory, `./entry/index.${platform}.js`),
bundle: path.resolve(appDirectory, `./index.${platform}.js`),
},

devServer: config.devServer || {
Expand Down
34 changes: 28 additions & 6 deletions rnv-cli/src/common.js
View file
Expand Up @@ -121,7 +121,7 @@ const initializeBuilder = (cmd, subCmd, process, program) => new Promise((resolv
c.globalConfigFolder = _getPath(c, c.projectConfig.globalConfigFolder, 'globalConfigFolder', c.globalConfigFolder);
c.globalConfigPath = path.join(c.globalConfigFolder, RNV_GLOBAL_CONFIG_NAME);
c.appConfigsFolder = _getPath(c, c.projectConfig.appConfigsFolder, 'appConfigsFolder', c.appConfigsFolder);
c.entryFolder = _getPath(c, c.projectConfig.entryFolder, 'entryFolder', c.entryFolder);
// c.entryFolder = _getPath(c, c.projectConfig.entryFolder, 'entryFolder', c.entryFolder);
c.platformTemplatesFolder = _getPath(c, c.projectConfig.platformTemplatesFolder, 'platformTemplatesFolder', c.platformTemplatesFolder);
c.platformAssetsFolder = _getPath(c, c.projectConfig.platformAssetsFolder, 'platformAssetsFolder', c.platformAssetsFolder);
c.platformBuildsFolder = _getPath(c, c.projectConfig.platformBuildsFolder, 'platformBuildsFolder', c.platformBuildsFolder);
Expand Down Expand Up @@ -184,11 +184,12 @@ const configureProject = c => new Promise((resolve, reject) => {
}

// Check entry
logTask('configureProject:check entry');
if (!fs.existsSync(c.entryFolder)) {
logWarning(`Looks like your entry folder ${chalk.white(c.entryFolder)} is missing! Let's create one for you.`);
copyFolderContentsRecursiveSync(path.join(c.rnvRootFolder, 'entry'), c.entryFolder);
}
// TODO: RN bundle command fails if entry files are not at root
// logTask('configureProject:check entry');
// if (!fs.existsSync(c.entryFolder)) {
// logWarning(`Looks like your entry folder ${chalk.white(c.entryFolder)} is missing! Let's create one for you.`);
// copyFolderContentsRecursiveSync(path.join(c.rnvRootFolder, 'entry'), c.entryFolder);
// }

// Check src
logTask('configureProject:check src');
Expand Down Expand Up @@ -358,13 +359,33 @@ const configureRnvGlobal = c => new Promise((resolve, reject) => {
resolve();
});

const configureEntryPoints = (c) => { // Check entry
// TODO: RN bundle command fails if entry files are not at root
// logTask('configureProject:check entry');
// if (!fs.existsSync(c.entryFolder)) {
// logWarning(`Looks like your entry folder ${chalk.white(c.entryFolder)} is missing! Let's create one for you.`);
// copyFolderContentsRecursiveSync(path.join(c.rnvRootFolder, 'entry'), c.entryFolder);
// }
const p = c.appConfigFile.platforms;
for (const k in p) {
platform = p[k];
const source = path.join(c.rnvRootFolder, `${platform.entryFile}.js`);
const dest = path.join(c.projectRootFolder, `${platform.entryFile}.js`);
if (!fs.existsSync(dest)) {
logWarning(`You missing entry file ${chalk.white(platform.entryFile)} in your project. let's create one for you!`);
copyFileSync(source, dest);
}
}
};


const configureApp = c => new Promise((resolve, reject) => {
logTask('configureApp');

if (c.appID) {
// App ID specified
_getConfig(c, c.appID);
configureEntryPoints(c);
resolve(c);
} else {
// Use latest app from platformAssets
Expand All @@ -381,6 +402,7 @@ const configureApp = c => new Promise((resolve, reject) => {
try {
const assetConfig = JSON.parse(fs.readFileSync(c.runtimeConfigPath).toString());
_getConfig(c, assetConfig.id);
configureEntryPoints(c);
resolve(c);
} catch (e) {
reject(e);
Expand Down
2 changes: 1 addition & 1 deletion rnv-config.json
View file
Expand Up @@ -2,7 +2,7 @@
"globalConfigFolder": "~/.rnv",
"appConfigsFolder": "./appConfigs",
"platformTemplatesFolder": "RNV_HOME/platformTemplates",
"entryFolder": "./entry",
"entryFolder": "./",
"platformAssetsFolder": "./platformAssets",
"platformBuildsFolder": "./platformBuilds",
"projectPlugins": "./plugins",
Expand Down

0 comments on commit 728ebd8

Please sign in to comment.