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

Jump to bottom

Remove react-native-aztec-old-submodule #1861

Merged
merged 4 commits into from
Feb 18, 2020
Merged

Remove react-native-aztec-old-submodule #1861

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c972d0d
Remove react-native-aztec-old-submodule
ceyhun Feb 6, 2020
28782d3
Add Jitpack step to remove react-native-aztec-old-submodule folder
ceyhun Feb 13, 2020
7fc0552
Revert "Add Jitpack step to remove react-native-aztec-old-submodule f…
ceyhun Feb 13, 2020
e85de8b
Add step to Jitpack config removing react-native-aztec-old-submodule
ceyhun Feb 13, 2020
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
1 change: 0 additions & 1 deletion .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ symlinked-packages
symlinked-packages-in-parent
react-native-aztec
bundle
react-native-aztec-old-submodule
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "gutenberg"]
path = gutenberg
url = ../../WordPress/gutenberg.git
[submodule "react-native-aztec"]
path = react-native-aztec-old-submodule
url = ../react-native-aztec.git
5 changes: 1 addition & 4 deletions jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ module.exports = {
'/__device-tests__/',
],
testURL: 'http://localhost/',
modulePathIgnorePatterns: [
'<rootDir>/gutenberg/gutenberg-mobile',
'react-native-aztec-old-submodule',
],
modulePathIgnorePatterns: [ '<rootDir>/gutenberg/gutenberg-mobile' ],
moduleDirectories: [ 'node_modules', 'symlinked-packages' ],
moduleNameMapper: {
// Mock the CSS modules. See https://facebook.github.io/jest/docs/en/webpack.html#handling-static-assets
Expand Down
1 change: 0 additions & 1 deletion react-native-aztec-old-submodule
Open in desktop
Submodule react-native-aztec-old-submodule deleted from fe8e53
5 changes: 5 additions & 0 deletions react-native-gutenberg-bridge/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@ if (isJitPack) {
def assetsFolder = 'src/main/assets'
def aarFolder = 'src/main/assets'

task removeReactNativeAztecOldSubmodule(type: Delete) {
delete '../../react-native-aztec-old-submodule'
}

task buildJSBundle(type: YarnTask) {
args = ['bundle:android']
}
Expand Down Expand Up @@ -210,5 +214,6 @@ if (isJitPack) {
backupHermesReleaseAAR.dependsOn(copyJSBundle)
copyJSBundle.dependsOn(buildJSBundle)
buildJSBundle.dependsOn(yarn_install, ensureAssetsDirectory)
ensureAssetsDirectory.dependsOn(removeReactNativeAztecOldSubmodule)
ceyhun marked this conversation as resolved.
Show resolved Hide resolved
}
}
1 change: 0 additions & 1 deletion rn-cli.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ const blacklist = require( 'metro-config/src/defaults/blacklist' );
const blacklistElements = blacklist( [
new RegExp( path.basename( __dirname ) + '/gutenberg/node_modules/.*' ),
new RegExp( path.basename( __dirname ) + '/gutenberg/gutenberg-mobile/.*' ),
new RegExp( path.basename( __dirname ) + '/react-native-aztec-old-submodule/.*' ),
] );
const enm = require( './extra-node-modules.config.js' );

Expand Down