Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions ern-api-gen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
"lodash": "^4.17.21",
"minimatch": "^3.0.4",
"mustache": "^4.2.0",
"semver": "^7.3.5",
"semver": "^7.5.2",
"shelljs": "^0.8.4",
"swagger-methods": "^1.0.8",
"sway": "^1.0.0"
"ern-sway": "^2.0.8"
},
"devDependencies": {
"ern-util-dev": "1000.0.0"
Expand Down
10 changes: 5 additions & 5 deletions ern-api-gen/src/java/Swagger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
/* tslint:disable:max-classes-per-file */
import { newHashMap } from './javaUtil';
import factory from '../models/factory';
import Response from 'sway/lib/types/response';
import SwaggerApi from 'sway/lib/types/api';
import Path from 'sway/lib/types/path';
import Operation from 'sway/lib/types/operation';
import Response from 'ern-sway/lib/types/response';
import SwaggerApi from 'ern-sway/lib/types/api';
import Path from 'ern-sway/lib/types/path';
import Operation from 'ern-sway/lib/types/operation';
import parameterFactory from '../models/parameters';
import { apply, beanify } from './beanUtils';
import { Property } from '../models/properties';
import { toModel } from '../models/PropertyBuilder';
import authFactory from '../models/auth';
import Sway from 'sway';
import Sway from 'ern-sway';
import { upperFirst } from './StringUtils';
import supportedHttpMethods from 'swagger-methods';

Expand Down
2 changes: 1 addition & 1 deletion ern-api-impl-gen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"mustache": "^4.2.0",
"semver": "^7.5.2",
"xcode": "^3.0.1",
"xcode-ern": "^1.0.13"
"ern-xcode": "^1.0.14"
},
"devDependencies": {
"ern-util-dev": "1000.0.0"
Expand Down
2 changes: 1 addition & 1 deletion ern-api-impl-gen/src/generators/ios/ApiImplIosGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
import { ApiImplGeneratable } from '../../ApiImplGeneratable';
import fs from 'fs-extra';
import path from 'path';
import xcode from 'xcode-ern';
import xcode from 'ern-xcode';
import readDir from 'fs-readdir-recursive';

export const ROOT_DIR = shell.pwd();
Expand Down
2 changes: 1 addition & 1 deletion ern-api-impl-gen/typings/modules.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
declare module 'xcode-ern';
declare module 'ern-xcode';
2 changes: 1 addition & 1 deletion ern-cauldron-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"ern-core": "1000.0.0",
"fs-extra": "^10.0.0",
"lodash": "^4.17.21",
"semver": "^7.3.5",
"semver": "^7.5.2",
"uuid": "^8.3.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion ern-composite-gen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"fs-readdir-recursive": "^1.1.0",
"js-beautify": "^1.13.13",
"mustache": "^4.2.0",
"semver": "^7.3.5",
"semver": "^7.5.2",
"uuid": "^8.3.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion ern-container-gen-android/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"fs-readdir-recursive": "^1.1.0",
"glob": "^7.1.7",
"lodash": "^4.17.21",
"semver": "^7.3.5"
"semver": "^7.5.2"
},
"devDependencies": {
"copyfiles": "^2.4.1",
Expand Down
4 changes: 2 additions & 2 deletions ern-container-gen-ios/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"fs-extra": "^10.0.0",
"fs-readdir-recursive": "^1.1.0",
"lodash": "^4.17.21",
"semver": "^7.3.5",
"xcode-ern": "^1.0.13"
"semver": "^7.5.2",
"ern-xcode": "^1.0.14"
},
"devDependencies": {
"copyfiles": "^2.4.1",
Expand Down
2 changes: 1 addition & 1 deletion ern-container-gen-ios/src/IosGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {

import fs from 'fs-extra';
import path from 'path';
import xcode from 'xcode-ern';
import xcode from 'ern-xcode';
import _ from 'lodash';
import readDir from 'fs-readdir-recursive';
import { Composite } from 'ern-composite-gen';
Expand Down
2 changes: 1 addition & 1 deletion ern-container-gen-ios/typings/modules.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
declare module 'xcode-ern';
declare module 'ern-xcode';
4 changes: 2 additions & 2 deletions ern-container-gen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"fs-extra": "^10.0.0",
"fs-readdir-recursive": "^1.1.0",
"mustache": "^4.2.0",
"semver": "^7.3.5",
"xcode-ern": "^1.0.13"
"semver": "^7.5.2",
"ern-xcode": "^1.0.14"
},
"devDependencies": {
"copyfiles": "^2.3.0",
Expand Down
8 changes: 4 additions & 4 deletions ern-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
"@yarnpkg/lockfile": "^1.1.0",
"adm-zip": "^0.5.10",
"archiver": "^5.3.0",
"bugsnag-sourcemaps": "^1.3.0",
"@bugsnag/source-maps": "^2.3.3",
"chalk": "^4.1.1",
"cli-table": "^0.3.6",
"code-push": "4.0.5",
"code-push": "4.2.3",
"cross-spawn": "^7.0.3",
"form-data": "^4.0.0",
"fs-extra": "^10.0.0",
Expand All @@ -62,15 +62,15 @@
"node-fetch": "^2.6.1",
"node-ipc": "9.2.1",
"node-simctl": "^6.4.1",
"semver": "^7.3.5",
"semver": "^7.5.2",
"shelljs": "^0.8.4",
"simple-git": "^3.25.0",
"tmp": "^0.2.1",
"treeify": "^1.1.0",
"tunnel": "^0.0.6",
"untildify": "^4.0.0",
"uuid": "^8.3.2",
"xcode-ern": "^1.0.13",
"ern-xcode": "^1.0.14",
"yarn": "^1.22.10",
"yauzl": "^2.10.0",
"yazl": "^2.5.1"
Expand Down
20 changes: 11 additions & 9 deletions ern-core/src/bugsnagUpload.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { createProxyAgentFromErnConfig } from './createProxyAgent';
import log from './log';
import kax from './kax';
import * as bugsnag from 'bugsnag-sourcemaps';
import { reactNative } from '@bugsnag/source-maps';

export async function bugsnagUpload({
apiKey,
minifiedFile,
minifiedUrl,
platform,
projectRoot,
sourceMap,
uploadNodeModules,
Expand All @@ -15,31 +16,32 @@ export async function bugsnagUpload({
apiKey: string;
minifiedFile: string;
minifiedUrl: string;
platform?: 'ios' | 'android';
projectRoot: string;
sourceMap: string;
uploadNodeModules?: boolean;
uploadSources: boolean;
}) {
const agent = createProxyAgentFromErnConfig('bugsnagProxy', { https: true });
const proxyAgent = createProxyAgentFromErnConfig('bugsnagProxy', {
https: true,
});
const codeBundleId = process.env.ERN_BUGSNAG_CODE_BUNDLE_ID;
const bugsnagOptions = {
addWildcardPrefix: true,
agent,
apiKey,
bundle: minifiedFile,
codeBundleId,
minifiedFile,
minifiedUrl,
dev: false,
platform: platform || ('android' as const),
projectRoot,
requestOpts: proxyAgent ? { agent: proxyAgent.agent } : undefined,
sourceMap,
uploadNodeModules,
uploadSources,
};
log.trace(
`[bugsnagUpload] options: ${JSON.stringify(bugsnagOptions, null, 2)}`,
);
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
await kax
.task(`Uploading source map to Bugsnag (codeBundleId: ${codeBundleId})`)
.run(bugsnag.upload(bugsnagOptions));
.run(reactNative.uploadOne(bugsnagOptions));
delete process.env.NODE_TLS_REJECT_UNAUTHORIZED;
}
4 changes: 2 additions & 2 deletions ern-core/src/iosUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import log from './log';
import { isDependencyOfType, isDependencyPathNativeApiImpl } from './utils';
import { JS_API_IMPL } from './ModuleTypes';
import path from 'path';
import xcode from 'xcode-ern';
import xcode from 'ern-xcode';
import fs from 'fs-extra';
import _ from 'lodash';
import kax from './kax';
Expand Down Expand Up @@ -177,7 +177,7 @@ export async function fillProjectHull(
const pathToPbxProj = path.join(pathSpec.outputDir, s.path);
// Add any missing section in the target pbxproj
// This is necessary for proper parsing and modification of
// the pbxproj with the xcode-ern library
// the pbxproj with the ern-xcode library
xcode.pbxProjFileUtils().addMissingSectionsToPbxProj(pathToPbxProj);
const iosProj = await getIosProject(pathToPbxProj);
const buildSettings =
Expand Down
3 changes: 1 addition & 2 deletions ern-core/typings/modules.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
declare module 'node-ipc';
declare module 'code-push';
declare module 'node-simctl';
declare module 'xcode-ern';
declare module 'ern-xcode';
declare module 'gradle-to-js/lib/parser';
declare module 'bugsnag-sourcemaps';
2 changes: 1 addition & 1 deletion ern-local-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"kax": "^3.0.0",
"lodash": "^4.17.21",
"node-ipc": "9.2.1",
"semver": "^7.3.5",
"semver": "^7.5.2",
"treeify": "^1.1.0",
"untildify": "^4.0.0",
"validate-npm-package-name": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion ern-orchestrator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"got": "^11.8.2",
"kax": "^3.0.0",
"lodash": "^4.17.21",
"semver": "^7.3.5",
"semver": "^7.5.2",
"treeify": "^1.1.0",
"validate-npm-package-name": "^3.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion ern-runner-gen-ios/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"fs-extra": "^10.0.0",
"fs-readdir-recursive": "^1.1.0",
"mustache": "^4.2.0",
"semver": "^7.3.5"
"semver": "^7.5.2"
},
"devDependencies": {
"copyfiles": "^2.4.1",
Expand Down
2 changes: 1 addition & 1 deletion typings/modules.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
declare module 'node-ipc';
declare module 'code-push';
declare module 'node-simctl';
declare module 'xcode-ern';
declare module 'ern-xcode';
Loading
Loading