Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: move public into iOS target directory #4002

Merged
merged 6 commits into from
Jan 8, 2021
Merged

fix: move public into iOS target directory #4002

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
846463d
fix: move public into target directory, not project
imhoffd Dec 31, 2020
7d96868
fix tests
imhoffd Dec 31, 2020
de17a15
Merge branch 'main' into move-public
imhoffd Jan 7, 2021
4b9b419
Merge branch 'main' into move-public
imhoffd Jan 8, 2021
74c1d2b
support both, check pbxproj and warn
imhoffd Jan 8, 2021
112604a
add fragment to section
imhoffd Jan 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ async function loadIOSConfig(
const platformDirAbs = resolve(rootDir, platformDir);
const nativeProjectDir = 'App';
const nativeTargetDir = `${nativeProjectDir}/App`;
const webDir = `${nativeProjectDir}/public`;
const webDir = `${nativeTargetDir}/public`;
const cordovaPluginsDir = 'capacitor-cordova-ios-plugins';

return {
Expand Down
2 changes: 1 addition & 1 deletion cli/test/update.ios.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ describe.each([false, true])('Update: iOS (monoRepoLike: %p)', monoRepoLike => {

it('Should install Cordova plugin JS', async () => {
const cordovaPluginJSContent = await FS.read(
'ios/App/public/cordova_plugins.js',
'ios/App/App/public/cordova_plugins.js',
);
const regex = new RegExp(CORDOVA_PLUGIN_ID);
expect(regex.test(cordovaPluginJSContent)).toBe(true);
Expand Down
2 changes: 1 addition & 1 deletion ios-template/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
App/build
App/Pods
App/public
App/Podfile.lock
App/App/public
DerivedData
xcuserdata

Expand Down
2 changes: 1 addition & 1 deletion ios-template/App/App.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
504EC30E1FED79650016851F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = SOURCE_ROOT; };
50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
Expand Down
0 ios-template/App/public/.gitkeep → ios-template/App/App/public/.gitkeep
View file
Open in desktop
File renamed without changes.