Skip to content

Commit

Permalink
Rename the "js" directory to "home"
Browse files Browse the repository at this point in the history
This makes clear what the JS is and differentiates it from other JS that will land in the repo. Updated references to the "js" directory, and verified the generated Podfile can be compiled. Also verified Android compiles.

fbshipit-source-id: a15a3fb
  • Loading branch information
ide authored and expbot committed Aug 16, 2018
1 parent a75b455 commit 4ee5366
Show file tree
Hide file tree
Showing 117 changed files with 118 additions and 18 deletions.
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ allprojects {
jcenter()
maven {
// Local Maven repo containing AARs with JSC built for Android
url "$rootDir/../js/node_modules/jsc-android/android"
url "$rootDir/../home/node_modules/jsc-android/android"
}
flatDir {
dirs 'libs'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public void startJSKernel() {
public void run() {
// Hack to make this show up for a while. Can't use an Alert because LauncherActivity has a transparent theme. This should only be seen by internal developers.
for (int i = 0; i < 3; i++) {
Toast.makeText(mActivityContext, "Kernel manifest invalid. Make sure `expu start` is running inside of exponent/js and rebuild the app.", Toast.LENGTH_LONG).show();
Toast.makeText(mActivityContext, "Kernel manifest invalid. Make sure `expu start` is running inside of exponent/home and rebuild the app.", Toast.LENGTH_LONG).show();
}
}
});
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
47 changes: 47 additions & 0 deletions home/app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
expo: {
name: "expo-home",
description: "",
slug: "home",
privacy: "unlisted",

// When publishing the sdkVersion needs to be set to the target sdkVersion.
// The Exponent client will load it as UNVERSIONED, but the server uses this field
// to know which clients to serve the bundle to.
sdkVersion: "29.0.0",

// Update this each time you publish so you're able to relate published
// bundles to specific commits in the repo
version: "29.0.0",

orientation: "portrait",
platforms: [
"ios",
"android"
],
primaryColor: "#cccccc",
icon: "https://s3.amazonaws.com/exp-brand-assets/ExponentEmptyManifest_192.png",
updates: {
checkAutomatically: "ON_LOAD",
fallbackToCacheTimeout: 0
},
ios: {
supportsTablet: true,
bundleIdentifier: "host.exp.exponent",
publishBundlePath: "../ios/Exponent/Supporting/kernel.ios.bundle"
},
android: {
package: "host.exp.exponent",
publishBundlePath: "../android/app/src/main/assets/kernel.android.bundle"
},
scheme: "exp",
extra: {
amplitudeApiKey: "081e5ec53f869b440b225d5e40ec73f9"
},
isKernel: true,
kernel: {
iosManifestPath: "../ios/Exponent/Supporting/kernel-manifest.json",
androidManifestPath: "../android/app/src/main/assets/kernel-manifest.json"
}
}
}
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
56 changes: 56 additions & 0 deletions home/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"name": "@expo/home",
"main": "node_modules/expo/AppEntry.js",
"private": true,
"description": "The Expo client app",
"scripts": {
"test": "jest"
},
"author": "650 Industries",
"license": "MIT",
"jest": {
"preset": "jest-expo"
},
"powertools": {
"group": "client"
},
"dependencies": {
"@expo/react-native-action-sheet": "^0.3.0",
"@expo/react-native-fade-in-image": "^1.1.1",
"@expo/react-native-navigator": "0.5.2",
"@expo/react-native-responsive-image": "^1.2.1",
"@expo/react-native-touchable-native-feedback-safe": "^1.1.1",
"apollo-client": "~1.0.3",
"autobind-decorator": "^1.3.2",
"dedent": "^0.7.0",
"es6-error": "^4.0.1",
"expo": "29.0.0-rc.2",
"graphql-tag": "^1.2.1",
"immutable": "^3.8.1",
"jwt-decode": "^2.1.0",
"lodash": "^4.17.4",
"prop-types": "^15.5.10",
"querystring": "^0.2.0",
"react": "^16.3.1",
"react-apollo": "~1.0.1",
"react-mixin": "^3.0.4",
"react-native": "expo/react-native#sdk-29",
"react-native-deprecated-custom-components": "^0.1.0",
"react-native-infinite-scroll-view": "^0.4.2",
"react-navigation": "2.3.1",
"react-navigation-material-bottom-tabs": "^0.3.0",
"react-redux": "^5.0.1",
"react-timer-mixin": "^0.13.3",
"redux": "^3.5.1",
"redux-thunk": "^2.2.0",
"sha1": "^1.1.1",
"url": "^0.11.0"
},
"devDependencies": {
"hashids": "^1.1.1",
"jest-expo": "^27.0.0",
"jsc-android": "^216113.0.0",
"node-fetch": "^2.0.0",
"uuid": "^3.0.1"
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ target 'Exponent' do
:path => "../modules/expo-gl-cpp/cpp"

pod 'React',
:path => "../js/node_modules/react-native",
:path => "../home/node_modules/react-native",
:inhibit_warnings => true,
:subspecs => [
"Core",
Expand All @@ -78,16 +78,16 @@ target 'Exponent' do
"CxxBridge"
]
pod 'yoga',
:path => "../js/node_modules/react-native/ReactCommon/yoga",
:path => "../home/node_modules/react-native/ReactCommon/yoga",
:inhibit_warnings => true
pod 'DoubleConversion',
:podspec => "../js/node_modules/react-native/third-party-podspecs/DoubleConversion.podspec",
:podspec => "../home/node_modules/react-native/third-party-podspecs/DoubleConversion.podspec",
:inhibit_warnings => true
pod 'Folly',
:podspec => "../js/node_modules/react-native/third-party-podspecs/Folly.podspec",
:podspec => "../home/node_modules/react-native/third-party-podspecs/Folly.podspec",
:inhibit_warnings => true
pod 'glog',
:podspec => "../js/node_modules/react-native/third-party-podspecs/glog.podspec",
:podspec => "../home/node_modules/react-native/third-party-podspecs/glog.podspec",
:inhibit_warnings => true


Expand Down
7 changes: 2 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
{
"name": "@exponent/exponent",
"name": "@expo/expo",
"version": "1.4.0",
"exp": {
"sdkVersion": "29.0.0"
},
"private": true,
"scripts": {
"lint": "eslint js"
}
"private": true
}
2 changes: 1 addition & 1 deletion template-files/keys.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"GOOGLE_MAPS_IOS_API_KEY": "",
"AMPLITUDE_KEY": "1e246ef3dacaabe8648768d7c35fceb1",
"AMPLITUDE_DEV_KEY": "773a3e0a8a28b8b1c3497792df4a5271",
"REACT_NATIVE_PATH": "../js/node_modules/react-native",
"REACT_NATIVE_PATH": "../home/node_modules/react-native",
"UNIVERSAL_MODULES_PATH": "../modules",
"CERTIFICATE_HASH": "892B2B46907B26D3E729829AFCE15446B9947450"
}
6 changes: 3 additions & 3 deletions tools-public/generate-dynamic-macros.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,9 @@ const macrosFuncs = {

let projectRoot;
if (isInUniverse && useLegacyWorkflow) {
projectRoot = path.join(EXPONENT_DIR, 'js', '__internal__');
projectRoot = path.join(EXPONENT_DIR, 'home', '__internal__');
} else {
projectRoot = path.join(EXPONENT_DIR, 'js');
projectRoot = path.join(EXPONENT_DIR, 'home');
}

let manifest;
Expand Down Expand Up @@ -471,7 +471,7 @@ async function writeIOSTemplatesAsync(
path.join(EXPONENT_DIR, 'ios', '__github__', 'Podfile'),
{
TARGET_NAME: 'Exponent',
REACT_NATIVE_PATH: '../js/node_modules/react-native',
REACT_NATIVE_PATH: '../home/node_modules/react-native',
UNIVERSAL_MODULES: generateUniversalModulesConfig(
EXPO_CLIENT_UNIVERSAL_MODULES,
'../modules/'
Expand Down
4 changes: 2 additions & 2 deletions tools-public/react-native-tasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ exports.startReactNativeServer = function startReactNativeServer(callback) {
}

if (!isInUniverse) {
reactNativePath = path.join(rootPath, 'js/node_modules/react-native/');
reactNativePath = path.join(rootPath, 'home/node_modules/react-native/');
}

let cliPath = path.join(reactNativePath, 'local-cli/cli.js');

let exponentPath = rootPath;
let exponentReactPath = path.join(exponentPath, 'js');
let exponentReactPath = path.join(exponentPath, 'home');
let exponentAssetsPath = path.join(
exponentPath,
'ios/Exponent/Images.xcassets'
Expand Down

0 comments on commit 4ee5366

Please sign in to comment.