From 896bb8a21e947fb7af1132d1e3da58785ed93099 Mon Sep 17 00:00:00 2001 From: Christoph Nakazawa Date: Fri, 7 Dec 2018 04:47:03 -0800 Subject: [PATCH] Move react-native template Summary: This diff moves the React Native template from `local-cli/templates/HelloWorld` to `template`. Keeping it in the react-native repo will allow us to make changes to the template and version it together with react-native, instead of moving it out into a separate repo and trying to keep the template in sync with RN. Reviewed By: TheSavior Differential Revision: D13372949 fbshipit-source-id: e68e267b4dcf6384535d7b48fc11e297a12e9676 --- .flowconfig | 2 +- .flowconfig.android | 2 +- ContainerShip/scripts/run-ci-e2e-tests.sh | 4 ++-- package.json | 4 ++-- scripts/run-ci-e2e-tests.js | 4 ++-- {local-cli/templates/HelloWorld => template}/App.js | 0 .../HelloWorld => template}/__tests__/App-test.js | 0 .../templates/HelloWorld => template}/_babelrc | 0 .../templates/HelloWorld => template}/_buckconfig | 0 .../templates/HelloWorld => template}/_flowconfig | 0 .../HelloWorld => template}/_gitattributes | 0 .../templates/HelloWorld => template}/_gitignore | 0 .../HelloWorld => template}/_watchmanconfig | 0 .../HelloWorld => template}/android/app/_BUCK | 0 .../android/app/build.gradle | 0 .../android/app/build_defs.bzl | 0 .../android/app/proguard-rules.pro | 0 .../android/app/src/main/AndroidManifest.xml | 0 .../src/main/java/com/helloworld/MainActivity.java | 0 .../main/java/com/helloworld/MainApplication.java | 0 .../app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin .../app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin .../app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher_round.png | Bin .../app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../app/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../android/app/src/main/res/values/strings.xml | 0 .../android/app/src/main/res/values/styles.xml | 0 .../HelloWorld => template}/android/build.gradle | 0 .../android/gradle.properties | 0 .../android/gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../HelloWorld => template}/android/gradlew | 0 .../HelloWorld => template}/android/gradlew.bat | 0 .../HelloWorld => template}/android/keystores/_BUCK | 0 .../android/keystores/debug.keystore.properties | 0 .../HelloWorld => template}/android/settings.gradle | 0 .../templates/HelloWorld => template}/app.json | 0 .../templates/HelloWorld => template}/index.js | 0 .../ios/HelloWorld-tvOS/Info.plist | 0 .../ios/HelloWorld-tvOSTests/Info.plist | 0 .../ios/HelloWorld.xcodeproj/project.pbxproj | 0 .../xcshareddata/xcschemes/HelloWorld-tvOS.xcscheme | 0 .../xcshareddata/xcschemes/HelloWorld.xcscheme | 0 .../ios/HelloWorld/AppDelegate.h | 0 .../ios/HelloWorld/AppDelegate.m | 0 .../ios/HelloWorld/Base.lproj/LaunchScreen.xib | 0 .../AppIcon.appiconset/Contents.json | 0 .../ios/HelloWorld/Images.xcassets/Contents.json | 0 .../ios/HelloWorld/Info.plist | 0 .../HelloWorld => template}/ios/HelloWorld/main.m | 0 .../ios/HelloWorldTests/HelloWorldTests.m | 0 .../ios/HelloWorldTests/Info.plist | 0 57 files changed, 8 insertions(+), 8 deletions(-) rename {local-cli/templates/HelloWorld => template}/App.js (100%) rename {local-cli/templates/HelloWorld => template}/__tests__/App-test.js (100%) rename {local-cli/templates/HelloWorld => template}/_babelrc (100%) rename {local-cli/templates/HelloWorld => template}/_buckconfig (100%) rename {local-cli/templates/HelloWorld => template}/_flowconfig (100%) rename {local-cli/templates/HelloWorld => template}/_gitattributes (100%) rename {local-cli/templates/HelloWorld => template}/_gitignore (100%) rename {local-cli/templates/HelloWorld => template}/_watchmanconfig (100%) rename {local-cli/templates/HelloWorld => template}/android/app/_BUCK (100%) rename {local-cli/templates/HelloWorld => template}/android/app/build.gradle (100%) rename {local-cli/templates/HelloWorld => template}/android/app/build_defs.bzl (100%) rename {local-cli/templates/HelloWorld => template}/android/app/proguard-rules.pro (100%) rename {local-cli/templates/HelloWorld => template}/android/app/src/main/AndroidManifest.xml (100%) rename {local-cli/templates/HelloWorld => template}/android/app/src/main/java/com/helloworld/MainActivity.java (100%) rename {local-cli/templates/HelloWorld => template}/android/app/src/main/java/com/helloworld/MainApplication.java (100%) rename {local-cli/templates/HelloWorld => template}/android/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {local-cli/templates/HelloWorld => template}/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%) rename {local-cli/templates/HelloWorld => template}/android/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {local-cli/templates/HelloWorld => template}/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%) rename {local-cli/templates/HelloWorld => template}/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {local-cli/templates/HelloWorld => template}/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename {local-cli/templates/HelloWorld => template}/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {local-cli/templates/HelloWorld => template}/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename {local-cli/templates/HelloWorld => template}/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {local-cli/templates/HelloWorld => template}/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename {local-cli/templates/HelloWorld => template}/android/app/src/main/res/values/strings.xml (100%) rename {local-cli/templates/HelloWorld => template}/android/app/src/main/res/values/styles.xml (100%) rename {local-cli/templates/HelloWorld => template}/android/build.gradle (100%) rename {local-cli/templates/HelloWorld => template}/android/gradle.properties (100%) rename {local-cli/templates/HelloWorld => template}/android/gradle/wrapper/gradle-wrapper.jar (100%) rename {local-cli/templates/HelloWorld => template}/android/gradle/wrapper/gradle-wrapper.properties (100%) rename {local-cli/templates/HelloWorld => template}/android/gradlew (100%) rename {local-cli/templates/HelloWorld => template}/android/gradlew.bat (100%) rename {local-cli/templates/HelloWorld => template}/android/keystores/_BUCK (100%) rename {local-cli/templates/HelloWorld => template}/android/keystores/debug.keystore.properties (100%) rename {local-cli/templates/HelloWorld => template}/android/settings.gradle (100%) rename {local-cli/templates/HelloWorld => template}/app.json (100%) rename {local-cli/templates/HelloWorld => template}/index.js (100%) rename {local-cli/templates/HelloWorld => template}/ios/HelloWorld-tvOS/Info.plist (100%) rename {local-cli/templates/HelloWorld => template}/ios/HelloWorld-tvOSTests/Info.plist (100%) rename {local-cli/templates/HelloWorld => template}/ios/HelloWorld.xcodeproj/project.pbxproj (100%) rename {local-cli/templates/HelloWorld => template}/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld-tvOS.xcscheme (100%) rename {local-cli/templates/HelloWorld => template}/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme (100%) rename {local-cli/templates/HelloWorld => template}/ios/HelloWorld/AppDelegate.h (100%) rename {local-cli/templates/HelloWorld => template}/ios/HelloWorld/AppDelegate.m (100%) rename {local-cli/templates/HelloWorld => template}/ios/HelloWorld/Base.lproj/LaunchScreen.xib (100%) rename {local-cli/templates/HelloWorld => template}/ios/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json (100%) rename {local-cli/templates/HelloWorld => template}/ios/HelloWorld/Images.xcassets/Contents.json (100%) rename {local-cli/templates/HelloWorld => template}/ios/HelloWorld/Info.plist (100%) rename {local-cli/templates/HelloWorld => template}/ios/HelloWorld/main.m (100%) rename {local-cli/templates/HelloWorld => template}/ios/HelloWorldTests/HelloWorldTests.m (100%) rename {local-cli/templates/HelloWorld => template}/ios/HelloWorldTests/Info.plist (100%) diff --git a/.flowconfig b/.flowconfig index aef9876f9..ec076e3b4 100644 --- a/.flowconfig +++ b/.flowconfig @@ -3,7 +3,7 @@ .*/*[.]android.js ; Ignore templates for 'react-native init' -.*/local-cli/templates/.* +/template/.* ; Ignore the Dangerfile /bots/dangerfile.js diff --git a/.flowconfig.android b/.flowconfig.android index addcdd1d0..1a6fda753 100644 --- a/.flowconfig.android +++ b/.flowconfig.android @@ -3,7 +3,7 @@ .*/*[.]ios.js ; Ignore templates for 'react-native init' -.*/local-cli/templates/.* +/template/.* ; Ignore the Dangerfile /bots/dangerfile.js diff --git a/ContainerShip/scripts/run-ci-e2e-tests.sh b/ContainerShip/scripts/run-ci-e2e-tests.sh index aead257ff..a979d3abc 100755 --- a/ContainerShip/scripts/run-ci-e2e-tests.sh +++ b/ContainerShip/scripts/run-ci-e2e-tests.sh @@ -95,8 +95,8 @@ function e2e_suite() { # To make sure we actually installed the local version # of react-native, we will create a temp file inside the template # and check that it exists after `react-native init - IOS_MARKER="$(mktemp "$ROOT"/local-cli/templates/HelloWorld/ios/HelloWorld/XXXXXXXX)" - ANDROID_MARKER="$(mktemp "$ROOT"/local-cli/templates/HelloWorld/android/XXXXXXXX)" + IOS_MARKER="$(mktemp "$ROOT"/template/ios/HelloWorld/XXXXXXXX)" + ANDROID_MARKER="$(mktemp "$ROOT"/template/android/XXXXXXXX)" # install CLI cd react-native-cli diff --git a/package.json b/package.json index ac8708210..d2a5c978f 100644 --- a/package.json +++ b/package.json @@ -32,9 +32,9 @@ }, "testRegex": "/__tests__/.*-test\\.js$", "testPathIgnorePatterns": [ - "Libraries/Renderer", "/node_modules/", - "local-cli/templates/", + "/template", + "Libraries/Renderer", "RNTester/e2e" ], "haste": { diff --git a/scripts/run-ci-e2e-tests.js b/scripts/run-ci-e2e-tests.js index e8949cb4d..556211ff5 100644 --- a/scripts/run-ci-e2e-tests.js +++ b/scripts/run-ci-e2e-tests.js @@ -35,10 +35,10 @@ const TEMP = exec('mktemp -d /tmp/react-native-XXXXXXXX').stdout.trim(); // of react-native, we will create a temp file inside the template // and check that it exists after `react-native init const MARKER_IOS = exec( - `mktemp ${ROOT}/local-cli/templates/HelloWorld/ios/HelloWorld/XXXXXXXX`, + `mktemp ${ROOT}/template/ios/HelloWorld/XXXXXXXX`, ).stdout.trim(); const MARKER_ANDROID = exec( - `mktemp ${ROOT}/local-cli/templates/HelloWorld/android/XXXXXXXX`, + `mktemp ${ROOT}/template/android/XXXXXXXX`, ).stdout.trim(); const numberOfRetries = argv.retries || 1; let SERVER_PID; diff --git a/local-cli/templates/HelloWorld/App.js b/template/App.js similarity index 100% rename from local-cli/templates/HelloWorld/App.js rename to template/App.js diff --git a/local-cli/templates/HelloWorld/__tests__/App-test.js b/template/__tests__/App-test.js similarity index 100% rename from local-cli/templates/HelloWorld/__tests__/App-test.js rename to template/__tests__/App-test.js diff --git a/local-cli/templates/HelloWorld/_babelrc b/template/_babelrc similarity index 100% rename from local-cli/templates/HelloWorld/_babelrc rename to template/_babelrc diff --git a/local-cli/templates/HelloWorld/_buckconfig b/template/_buckconfig similarity index 100% rename from local-cli/templates/HelloWorld/_buckconfig rename to template/_buckconfig diff --git a/local-cli/templates/HelloWorld/_flowconfig b/template/_flowconfig similarity index 100% rename from local-cli/templates/HelloWorld/_flowconfig rename to template/_flowconfig diff --git a/local-cli/templates/HelloWorld/_gitattributes b/template/_gitattributes similarity index 100% rename from local-cli/templates/HelloWorld/_gitattributes rename to template/_gitattributes diff --git a/local-cli/templates/HelloWorld/_gitignore b/template/_gitignore similarity index 100% rename from local-cli/templates/HelloWorld/_gitignore rename to template/_gitignore diff --git a/local-cli/templates/HelloWorld/_watchmanconfig b/template/_watchmanconfig similarity index 100% rename from local-cli/templates/HelloWorld/_watchmanconfig rename to template/_watchmanconfig diff --git a/local-cli/templates/HelloWorld/android/app/_BUCK b/template/android/app/_BUCK similarity index 100% rename from local-cli/templates/HelloWorld/android/app/_BUCK rename to template/android/app/_BUCK diff --git a/local-cli/templates/HelloWorld/android/app/build.gradle b/template/android/app/build.gradle similarity index 100% rename from local-cli/templates/HelloWorld/android/app/build.gradle rename to template/android/app/build.gradle diff --git a/local-cli/templates/HelloWorld/android/app/build_defs.bzl b/template/android/app/build_defs.bzl similarity index 100% rename from local-cli/templates/HelloWorld/android/app/build_defs.bzl rename to template/android/app/build_defs.bzl diff --git a/local-cli/templates/HelloWorld/android/app/proguard-rules.pro b/template/android/app/proguard-rules.pro similarity index 100% rename from local-cli/templates/HelloWorld/android/app/proguard-rules.pro rename to template/android/app/proguard-rules.pro diff --git a/local-cli/templates/HelloWorld/android/app/src/main/AndroidManifest.xml b/template/android/app/src/main/AndroidManifest.xml similarity index 100% rename from local-cli/templates/HelloWorld/android/app/src/main/AndroidManifest.xml rename to template/android/app/src/main/AndroidManifest.xml diff --git a/local-cli/templates/HelloWorld/android/app/src/main/java/com/helloworld/MainActivity.java b/template/android/app/src/main/java/com/helloworld/MainActivity.java similarity index 100% rename from local-cli/templates/HelloWorld/android/app/src/main/java/com/helloworld/MainActivity.java rename to template/android/app/src/main/java/com/helloworld/MainActivity.java diff --git a/local-cli/templates/HelloWorld/android/app/src/main/java/com/helloworld/MainApplication.java b/template/android/app/src/main/java/com/helloworld/MainApplication.java similarity index 100% rename from local-cli/templates/HelloWorld/android/app/src/main/java/com/helloworld/MainApplication.java rename to template/android/app/src/main/java/com/helloworld/MainApplication.java diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/template/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to template/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/template/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to template/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/template/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to template/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/template/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to template/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/template/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to template/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/template/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to template/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/template/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to template/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/template/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to template/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/template/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to template/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/template/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from local-cli/templates/HelloWorld/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to template/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values/strings.xml b/template/android/app/src/main/res/values/strings.xml similarity index 100% rename from local-cli/templates/HelloWorld/android/app/src/main/res/values/strings.xml rename to template/android/app/src/main/res/values/strings.xml diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values/styles.xml b/template/android/app/src/main/res/values/styles.xml similarity index 100% rename from local-cli/templates/HelloWorld/android/app/src/main/res/values/styles.xml rename to template/android/app/src/main/res/values/styles.xml diff --git a/local-cli/templates/HelloWorld/android/build.gradle b/template/android/build.gradle similarity index 100% rename from local-cli/templates/HelloWorld/android/build.gradle rename to template/android/build.gradle diff --git a/local-cli/templates/HelloWorld/android/gradle.properties b/template/android/gradle.properties similarity index 100% rename from local-cli/templates/HelloWorld/android/gradle.properties rename to template/android/gradle.properties diff --git a/local-cli/templates/HelloWorld/android/gradle/wrapper/gradle-wrapper.jar b/template/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from local-cli/templates/HelloWorld/android/gradle/wrapper/gradle-wrapper.jar rename to template/android/gradle/wrapper/gradle-wrapper.jar diff --git a/local-cli/templates/HelloWorld/android/gradle/wrapper/gradle-wrapper.properties b/template/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from local-cli/templates/HelloWorld/android/gradle/wrapper/gradle-wrapper.properties rename to template/android/gradle/wrapper/gradle-wrapper.properties diff --git a/local-cli/templates/HelloWorld/android/gradlew b/template/android/gradlew similarity index 100% rename from local-cli/templates/HelloWorld/android/gradlew rename to template/android/gradlew diff --git a/local-cli/templates/HelloWorld/android/gradlew.bat b/template/android/gradlew.bat similarity index 100% rename from local-cli/templates/HelloWorld/android/gradlew.bat rename to template/android/gradlew.bat diff --git a/local-cli/templates/HelloWorld/android/keystores/_BUCK b/template/android/keystores/_BUCK similarity index 100% rename from local-cli/templates/HelloWorld/android/keystores/_BUCK rename to template/android/keystores/_BUCK diff --git a/local-cli/templates/HelloWorld/android/keystores/debug.keystore.properties b/template/android/keystores/debug.keystore.properties similarity index 100% rename from local-cli/templates/HelloWorld/android/keystores/debug.keystore.properties rename to template/android/keystores/debug.keystore.properties diff --git a/local-cli/templates/HelloWorld/android/settings.gradle b/template/android/settings.gradle similarity index 100% rename from local-cli/templates/HelloWorld/android/settings.gradle rename to template/android/settings.gradle diff --git a/local-cli/templates/HelloWorld/app.json b/template/app.json similarity index 100% rename from local-cli/templates/HelloWorld/app.json rename to template/app.json diff --git a/local-cli/templates/HelloWorld/index.js b/template/index.js similarity index 100% rename from local-cli/templates/HelloWorld/index.js rename to template/index.js diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld-tvOS/Info.plist b/template/ios/HelloWorld-tvOS/Info.plist similarity index 100% rename from local-cli/templates/HelloWorld/ios/HelloWorld-tvOS/Info.plist rename to template/ios/HelloWorld-tvOS/Info.plist diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld-tvOSTests/Info.plist b/template/ios/HelloWorld-tvOSTests/Info.plist similarity index 100% rename from local-cli/templates/HelloWorld/ios/HelloWorld-tvOSTests/Info.plist rename to template/ios/HelloWorld-tvOSTests/Info.plist diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj b/template/ios/HelloWorld.xcodeproj/project.pbxproj similarity index 100% rename from local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj rename to template/ios/HelloWorld.xcodeproj/project.pbxproj diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld-tvOS.xcscheme b/template/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld-tvOS.xcscheme similarity index 100% rename from local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld-tvOS.xcscheme rename to template/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld-tvOS.xcscheme diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme b/template/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme similarity index 100% rename from local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme rename to template/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.h b/template/ios/HelloWorld/AppDelegate.h similarity index 100% rename from local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.h rename to template/ios/HelloWorld/AppDelegate.h diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.m b/template/ios/HelloWorld/AppDelegate.m similarity index 100% rename from local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.m rename to template/ios/HelloWorld/AppDelegate.m diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld/Base.lproj/LaunchScreen.xib b/template/ios/HelloWorld/Base.lproj/LaunchScreen.xib similarity index 100% rename from local-cli/templates/HelloWorld/ios/HelloWorld/Base.lproj/LaunchScreen.xib rename to template/ios/HelloWorld/Base.lproj/LaunchScreen.xib diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json b/template/ios/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from local-cli/templates/HelloWorld/ios/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json rename to template/ios/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld/Images.xcassets/Contents.json b/template/ios/HelloWorld/Images.xcassets/Contents.json similarity index 100% rename from local-cli/templates/HelloWorld/ios/HelloWorld/Images.xcassets/Contents.json rename to template/ios/HelloWorld/Images.xcassets/Contents.json diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld/Info.plist b/template/ios/HelloWorld/Info.plist similarity index 100% rename from local-cli/templates/HelloWorld/ios/HelloWorld/Info.plist rename to template/ios/HelloWorld/Info.plist diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld/main.m b/template/ios/HelloWorld/main.m similarity index 100% rename from local-cli/templates/HelloWorld/ios/HelloWorld/main.m rename to template/ios/HelloWorld/main.m diff --git a/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m b/template/ios/HelloWorldTests/HelloWorldTests.m similarity index 100% rename from local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m rename to template/ios/HelloWorldTests/HelloWorldTests.m diff --git a/local-cli/templates/HelloWorld/ios/HelloWorldTests/Info.plist b/template/ios/HelloWorldTests/Info.plist similarity index 100% rename from local-cli/templates/HelloWorld/ios/HelloWorldTests/Info.plist rename to template/ios/HelloWorldTests/Info.plist