Skip to content

Commit

Permalink
Merge pull request #1263 from flexn-io/fix/dep-cleanup-fixes
Browse files Browse the repository at this point in the history 
Dependency cleanup fixes
  • Loading branch information
@pavjacko
pavjacko committed Nov 30, 2023
2 parents 7aa79d8 + d4db76c commit 4605736
Show file tree
Hide file tree
Showing 20 changed files with 52 additions and 255 deletions.
8 changes: 2 additions & 6 deletions packages/app-harness/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
},
"dependencies": {
"@lightningjs/sdk": "^5.4.1",
"@react-native-community/cli": "^11.3.8",
"@rnv/renative": "1.0.0-rc.0",
"next": "13.5.2",
"raf": "3.4.1",
Expand All @@ -46,7 +45,6 @@
"devDependencies": {
"@flexn/assets-renative-outline": "0.3.2",
"@flexn/graybox": "0.21.1",
"@flexn/typescript-config": "1.0.0",
"@rnv/core": "1.0.0-rc.0",
"@rnv/engine-lightning": "1.0.0-rc.0",
"@rnv/engine-rn": "1.0.0-rc.0",
Expand All @@ -61,10 +59,8 @@
"babel-jest": "29.2.1",
"babel-loader": "9.1.3",
"detox": "18.20.2",
"jetifier": "1.6.5",
"metro-react-native-babel-preset": "0.76.8",
"rnv": "1.0.0-rc.0",
"xcode": "2.1.0"
"jetifier": "2.0.0",
"rnv": "1.0.0-rc.0"
},
"private": true
}
3 changes: 0 additions & 3 deletions packages/app-harness/renative.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,5 @@
"projectName": "@rnv/app-harness",
"crypto": {
"path": "./secrets/privateConfigs.enc"
},
"plugins": {
"@react-native-community/cli": "^11.3.8"
}
}
7 changes: 0 additions & 7 deletions packages/cli/src/logger/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,6 @@ export const logSummary = (header = 'SUMMARY') => {
str += printArrIntoBox(plats, 'Supported Platforms: ');
}

if (ctx.files?.project?.config?.defaults) {
const currentTemplate = ctx.files.project.config?.currentTemplate;
if (currentTemplate) {
str += printIntoBox(`Master Template: ${_highlightColor(currentTemplate)}`);
}
}

if (ctx.process) {
const envString = `${ctx.process.platform} | ${ctx.process.arch} | node v${ctx.process.versions?.node}`;
str += printIntoBox(`Env Info: ${currentChalk.gray(envString)}`);
Expand Down
1 change: 1 addition & 0 deletions packages/engine-rn-electron/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"@rnv/sdk-react-native": "1.0.0-rc.0",
"@rnv/sdk-utils": "1.0.0-feat-pin-cli.6",
"@rnv/sdk-webpack": "1.0.0-rc.0",
"metro-react-native-babel-preset": "0.76.8",
"electron": "26.3.0",
"electron-builder": "24.6.4",
"electron-notarize": "1.2.2"
Expand Down
3 changes: 1 addition & 2 deletions packages/engine-rn-electron/renative.engine.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
"react-art": "source:rnv",
"react-dom": "source:rnv",
"react-native": "source:rnv",
"react-native-web": "source:rnv",
"@react-native-community/cli": "^11.3.8"
"react-native-web": "source:rnv"
},
"npm": {
"devDependencies": {}
Expand Down
3 changes: 2 additions & 1 deletion packages/engine-rn-macos/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
},
"dependencies": {
"@rnv/sdk-apple": "1.0.0-rc.0",
"@rnv/sdk-react-native": "1.0.0-rc.0"
"@rnv/sdk-react-native": "1.0.0-rc.0",
"metro-react-native-babel-preset": "0.76.8"
},
"peerDependencies": {
"@rnv/core": "^1.0.0-rc.0"
Expand Down
3 changes: 1 addition & 2 deletions packages/engine-rn-macos/renative.engine.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
"react-art": "source:rnv",
"react-dom": "source:rnv",
"react-native": "source:rnv",
"react-native-macos": "source:rnv",
"@react-native-community/cli": "^11.3.8"
"react-native-macos": "source:rnv"
},
"npm": {
"devDependencies": {}
Expand Down
12 changes: 11 additions & 1 deletion packages/engine-rn-next/src/adapters/babelAdapter.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,17 @@ export const withRNVBabel = (cnf: BabelConfig): BabelConfig => {

return {
retainLines: true,
presets: ['module:babel-preset-expo'],
presets: [
[
'module:babel-preset-expo',
{
// @ts-ignore TODO: this is to supress babel-preset-expo error. this config override does work
web: {
disableImportExportTransform: false,
},
},
],
],
...cnf,
plugins: [
[
Expand Down
3 changes: 2 additions & 1 deletion packages/engine-rn-tvos/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"dependencies": {
"@rnv/sdk-android": "1.0.0-rc.0",
"@rnv/sdk-apple": "1.0.0-rc.0",
"@rnv/sdk-react-native": "1.0.0-rc.0"
"@rnv/sdk-react-native": "1.0.0-rc.0",
"metro-react-native-babel-preset": "0.76.8"
},
"peerDependencies": {
"@rnv/core": "^1.0.0-rc.0",
Expand Down
9 changes: 3 additions & 6 deletions packages/engine-rn-tvos/renative.engine.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
"react-dom": "source:rnv",
"react-native": "source:rnv",
"react-native-tvos": "source:rnv",
"react-native-web": "source:rnv",
"@react-native-community/cli": "^11.3.8"
"react-native-web": "source:rnv"
},
"npm": {
"devDependencies": {}
Expand All @@ -20,10 +19,8 @@
"tvos": {
"engine": "engine-rn-tvos",
"npm": {
"devDependencies": {
"xcode": "2.1.0"
}
"devDependencies": {}
}
}
}
}
}
3 changes: 2 additions & 1 deletion packages/engine-rn-web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"@rnv/sdk-tizen": "1.0.0-rc.0",
"@rnv/sdk-utils": "1.0.0-feat-pin-cli.6",
"@rnv/sdk-webos": "1.0.0-rc.0",
"@rnv/sdk-webpack": "1.0.0-rc.0"
"@rnv/sdk-webpack": "1.0.0-rc.0",
"metro-react-native-babel-preset": "0.76.8"
},
"peerDependencies": {
"@rnv/core": "^1.0.0-rc.0"
Expand Down
3 changes: 1 addition & 2 deletions packages/engine-rn-web/renative.engine.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"react-art": "source:rnv",
"react-dom": "source:rnv",
"react-native": "source:rnv",
"react-native-web": "source:rnv",
"@react-native-community/cli": "^11.3.8"
"react-native-web": "source:rnv"
},
"npm": {
"devDependencies": {}
Expand Down
1 change: 1 addition & 0 deletions packages/engine-rn-windows/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"peerDependencies": {
"@react-native-community/cli": "*",
"@rnv/core": "^1.0.0-rc.0",
"metro-react-native-babel-preset": "0.76.8",
"react-native": "*"
},
"private": false,
Expand Down
3 changes: 2 additions & 1 deletion packages/engine-rn/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"dependencies": {
"@rnv/sdk-android": "1.0.0-rc.0",
"@rnv/sdk-apple": "1.0.0-rc.0",
"@rnv/sdk-react-native": "1.0.0-rc.0"
"@rnv/sdk-react-native": "1.0.0-rc.0",
"metro-react-native-babel-preset": "0.76.8"
},
"peerDependencies": {
"@rnv/core": "^1.0.0-rc.0"
Expand Down
19 changes: 7 additions & 12 deletions packages/engine-rn/renative.engine.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"react": "source:rnv",
"react-art": "source:rnv",
"react-dom": "source:rnv",
"react-native": "source:rnv",
"@react-native-community/cli": "^11.3.8"
"react-native": "source:rnv"
},
"npm": {
"devDependencies": {}
Expand All @@ -17,45 +16,41 @@
"ios": {
"engine": "engine-rn",
"npm": {
"devDependencies": {
"xcode": "2.1.0"
}
"devDependencies": {}
}
},
"macos": {
"engine": "engine-rn",
"npm": {
"devDependencies": {
"xcode": "2.1.0"
}
"devDependencies": {}
}
},
"android": {
"engine": "engine-rn",
"npm": {
"devDependencies": {
"jetifier": "1.6.5"
"jetifier": "2.0.0"
}
}
},
"androidwear": {
"npm": {
"devDependencies": {
"jetifier": "1.6.5"
"jetifier": "2.0.0"
}
}
},
"androidtv": {
"npm": {
"devDependencies": {
"jetifier": "1.6.5"
"jetifier": "2.0.0"
}
}
},
"firetv": {
"npm": {
"devDependencies": {
"jetifier": "1.6.5"
"jetifier": "2.0.0"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/sdk-android/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
"watch": "tsc --watch --preserveWatchOutput"
},
"dependencies": {
"@react-native-community/cli": "^11.3.8",
"@react-native-community/cli-platform-android": "^11.3.8",
"@rnv/sdk-react-native": "1.0.0-rc.0"
},
"peerDependencies": {
"@react-native-community/cli": "^11.3.8",
"@react-native-community/cli-platform-android": "^11.3.8",
"@rnv/core": "^1.0.0-rc.0"
},
"private": false,
Expand Down
6 changes: 3 additions & 3 deletions packages/sdk-apple/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
"watch": "tsc --watch --preserveWatchOutput"
},
"dependencies": {
"@react-native-community/cli": "^11.3.8",
"@react-native-community/cli-platform-ios": "^11.3.8",
"@rnv/sdk-react-native": "1.0.0-rc.0",
"compare-versions": "3.6.0",
"ios-mobileprovision-finder": "1.1.0",
"xcode": "2.1.0"
},
"peerDependencies": {
"@rnv/core": "^1.0.0-rc.0"
"@rnv/core": "^1.0.0-rc.0",
"@react-native-community/cli": "^11.3.8",
"@react-native-community/cli-platform-ios": "^11.3.8"
},
"private": false,
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk-tizen/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"dependencies": {
"@rnv/sdk-utils": "1.0.0-feat-pin-cli.6",
"@rnv/sdk-webpack": "1.0.0-rc.0",
"xml2js": "0.6.0"
"xml2js": "0.6.2"
},
"peerDependencies": {
"@rnv/core": "^1.0.0-rc.0"
Expand Down
7 changes: 2 additions & 5 deletions packages/template-starter/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
"devDependencies": {
"@flexn/assets-renative-outline": "0.3.2",
"@flexn/graybox": "0.21.1",
"@flexn/typescript-config": "1.0.0",
"@lightningjs/sdk": "^5.4.1",
"@rnv/core": "1.0.0-rc.0",
"@rnv/engine-lightning": "1.0.0-rc.0",
Expand All @@ -105,8 +104,7 @@
"babel-jest": "29.2.1",
"babel-loader": "9.1.3",
"detox": "18.20.2",
"jetifier": "1.6.5",
"metro-react-native-babel-preset": "0.76.8",
"jetifier": "2.0.0",
"next": "13.5.2",
"raf": "3.4.1",
"react": "18.2.0",
Expand All @@ -116,8 +114,7 @@
"react-native-gesture-handler": "2.13.1",
"react-native-tvos": "0.72.4-0",
"react-native-web": "0.19.9",
"rnv": "1.0.0-rc.0",
"xcode": "2.1.0"
"rnv": "1.0.0-rc.0"
},
"private": false,
"publishConfig": {
Expand Down

0 comments on commit 4605736

Please sign in to comment.