getsentry · Sep 20, 2022 · Sep 20, 2022 · Sep 20, 2022 · Sep 20, 2022 · Sep 20, 2022
diff --git a/.gitignore b/.gitignore
@@ -73,3 +73,6 @@ package-lock.json
 
 # Generated Lockfiles
 Cartfile.resolved
+
+# CSL
+*.iml
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+@cloudscapelabs:registry=https://npm.pkg.github.com
diff --git a/README-CSL.md b/README-CSL.md
@@ -0,0 +1,18 @@
+Install carthage: brew install carthage
+
+Ensure master is up-to-date with upstream.
+
+Merge in latest master (fixing conflicts in package name / version);
+
+`git merge master`
+
+`npm install`
+
+Clean up the previous build:
+
+`rm -rf dist`
+`git clean -dfX src`
+
+Then make a new build
+
+`npm run build`
diff --git a/package.json b/package.json
@@ -1,10 +1,13 @@
 {
-  "name": "sentry-cordova",
-  "version": "1.3.0",
+  "name": "@cloudscapelabs/sentry-cordova",
+  "version": "1.3.0-csl4",
   "main": "dist/js/sentry-cordova.js",
   "types": "dist/js/sentry-cordova.d.ts",
   "license": "MIT",
-  "repository": "git://github.com/getsentry/sentry-cordova.git",
+  "repository": "git://github.com/cloudscapelabs/sentry-cordova.git",
+  "publishConfig": {
+    "registry": "https://npm.pkg.github.com/"
+  },
   "cordova": {
     "id": "sentry-cordova",
     "platforms": [
@@ -29,34 +32,41 @@
     "@sentry/hub": "7.34.0",
     "@sentry/types": "7.34.0",
     "@sentry/utils": "7.34.0",
-    "@sentry/wizard": "^3.21.0"
+    "@sentry/wizard": "^3.28.0"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "7.34.0",
-    "@sentry-internal/typescript": "7.34.0",
+    "@sentry-internal/eslint-config-sdk": "^8.28.0",
+    "@sentry-internal/typescript": "^8.28.0",
     "@types/cordova": "0.0.34",
-    "@types/jest": "^24.0.18",
+    "@types/jest": "^29.5.12",
     "@types/node": "^12.7.5",
     "codecov": "^3.5.0",
     "eslint": "7.6.0",
-    "jest": "^24.9.0",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^1.18.2",
     "prettier-check": "^2.0.0",
     "replace-in-file": "^4.1.3",
     "rimraf": "^3.0.0",
-    "rollup": "^1.10.1",
+    "rollup": "^2.79.1",
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.3",
-    "rollup-plugin-terser": "^4.0.4",
-    "rollup-plugin-typescript2": "^0.21.0",
-    "ts-jest": "^24.1.0",
-    "typescript": "^3.6.3"
+    "rollup-plugin-terser": "^7.0.2",
+    "rollup-plugin-typescript2": "^0.36.0",
+    "ts-jest": "^29.2.5",
+    "typescript": "^4.9.5"
+  },
+  "overrides": {
+    "@sentry/wizard": {
+      "axios": "^1.0.0"
+    }
   },
   "scripts": {
     "build:bundle": "rollup --config",
     "build:typescript": "tsc -p tsconfig.build.json",
-    "build": "run-s clean build:typescript build:bundle",
+    "build:ios": "make build",
+    "build": "run-s clean build:typescript build:bundle build:ios",
     "clean": "rimraf dist coverage",
     "jest": "jest",
     "test:watch": "jest --watch",

diff --git a/plugin.xml b/plugin.xml
@@ -35,11 +35,6 @@
           </feature>
       </config-file>
 
-       <config-file target="AndroidManifest.xml" parent="/manifest/application">
-          <meta-data android:name="io.sentry.auto-init" android:value="false" />
-      </config-file>
-
-
       <source-file src="src/android/io/sentry/SentryCordova.java" target-dir="src/io/sentry/" />
 
       <framework src="io.sentry:sentry-android:$SENTRY_ANDROID_SDK_VERSION" />

diff --git a/scripts/before_compile.js b/scripts/before_compile.js
@@ -1,14 +1,14 @@
 module.exports = function (ctx) {
-  console.log(`Sentry: running ${ctx.hook} - set SENTRY_SKIP_AUTO_RELEASE=true to skip this`);
+  if (process.env.SENTRY_RUN_AUTO_RELEASE !== 'true') {
+    console.log('Sentry: Skipping Sentry auto release');
+    return;
+  }
+
   const SentryCli = require('@sentry/cli');
   const path = require('path');
   const fs = require('fs');
   const crypto = require('crypto');
 
-  if (process.env.SENTRY_SKIP_AUTO_RELEASE) {
-    console.log('Sentry: Skipping Sentry auto release');
-    return;
-  }
 
   function checksum(str) {
     return crypto

diff --git a/scripts/plugin_add_rm.js b/scripts/plugin_add_rm.js
@@ -5,9 +5,7 @@ module.exports = function (ctx) {
     }
   } catch (e) { }
 
-  console.log(`Sentry: running ${ctx.hook} - set SENTRY_SKIP_WIZARD=true to skip this`);
-
-  if (process.env.SENTRY_SKIP_WIZARD) {
+  if (process.env.SENTRY_RUN_WIZARD !== 'true') {
     console.log('Sentry: Skipping Sentry Wizard');
     return;
   }

diff --git a/src/js/scope.ts b/src/js/scope.ts
@@ -29,7 +29,7 @@ export class CordovaScope extends Scope {
   public setTags(tags: { [key: string]: string }): this {
     // As native only has setTag, we just loop through each tag key.
     Object.keys(tags).forEach(key => {
-      NATIVE.setTag(key, tags[key]);
+      NATIVE.setTag(key, tags[key]!);
     });
     return super.setTags(tags);
   }

diff --git a/src/js/wrapper.ts b/src/js/wrapper.ts
@@ -86,7 +86,7 @@ export const NATIVE = {
 
     const headerString = JSON.stringify(envelopeHeader);
     let envelopeBytes: number[] = utf8ToBytes(headerString);
-    envelopeBytes.push(EOL);
+    envelopeBytes.push(EOL!);
 
     for (const rawItem of envelopeItems) {
 
@@ -113,9 +113,9 @@ export const NATIVE = {
       const serializedItemHeader = JSON.stringify(itemHeader);
 
       envelopeBytes.push(...utf8ToBytes(serializedItemHeader));
-      envelopeBytes.push(EOL);
+      envelopeBytes.push(EOL!);
       envelopeBytes = envelopeBytes.concat(bytesPayload);
-      envelopeBytes.push(EOL);
+      envelopeBytes.push(EOL!);
     }
     await this._nativeCall('captureEnvelope', { envelope: envelopeBytes });
   },

diff --git a/yarn.lock b/yarn.lock
-Original file line number
+Diff line change
@@ @@ -73,3 +73,6 @@ package-lock.json @@
     # Generated Lockfiles
     Cartfile.resolved
+    # CSL
+    *.iml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		@cloudscapelabs:registry=https://npm.pkg.github.com