fix(analytics): AnalyticsWithoutAdIdSupport

apps/demo-vue/package.json

@@ -4,7 +4,7 @@
 	"dependencies": {
 		"@nativescript/core": "file:../../node_modules/@nativescript/core",
 		"@nativescript/firebase-admob": "file:../../packages/firebase-admob",
-		"@nativescript/firebase-analytics": "file:../../packages/firebase-analytics",
+		"@nativescript/firebase-analytics": "file:../../dist/packages/firebase-analytics",
 		"@nativescript/firebase-app-check": "file:../../packages/firebase-app-check",
 		"@nativescript/firebase-auth": "file:../../packages/firebase-auth",
 		"@nativescript/firebase-core": "file:../../packages/firebase-core",

apps/demo/package.json

@@ -6,7 +6,7 @@
 	"dependencies": {
 		"@nativescript/core": "file:../../node_modules/@nativescript/core",
 		"@nativescript/firebase-admob": "file:../../packages/firebase-admob",
-		"@nativescript/firebase-analytics": "file:../../packages/firebase-analytics",
+		"@nativescript/firebase-analytics": "file:../../dist/packages/firebase-analytics",
 		"@nativescript/firebase-app-check": "file:../../packages/firebase-app-check",
 		"@nativescript/firebase-auth": "file:../../packages/firebase-auth",
 		"@nativescript/firebase-core": "file:../../packages/firebase-core",

packages/firebase-analytics/hooks/before-checkForChanges.ts

@@ -0,0 +1,23 @@
+const fs = require('fs');
+const path = require('path');
+
+export = function ($logger, $projectData, hookArgs) {
+	const platformName = ((hookArgs.prepareData && hookArgs.prepareData.platform) || (hookArgs.platformData && hookArgs.platformData.normalizedPlatformName) || '').toLowerCase();
+
+	if (platformName === 'ios') {
+		const rootPath = $projectData.projectDir;
+
+		const Podfile = path.join(rootPath, 'platforms', 'ios', 'Podfile');
+		const ResourcePodfile = $projectData.podfilePath;
+
+		if (fs.existsSync(Podfile) && fs.existsSync(ResourcePodfile)) {
+			const podData = fs.readFileSync(Podfile, 'utf8') || '';
+			const resourcePodData = fs.readFileSync(ResourcePodfile, 'utf8');
+
+			// set variable early in the Podfile
+			if (podData && resourcePodData && resourcePodData.indexOf('$NSFirebaseAnalyticsWithoutAdIdSupport=true') > -1) {
+				fs.writeFileSync(Podfile, '$NSFirebaseAnalyticsWithoutAdIdSupport=true \n' + podData);
+			}
+		}
+	}
+};

packages/firebase-analytics/hooks/index.ts

@@ -0,0 +1,2 @@
+import checkForChanges = require('./before-checkForChanges');
+export { checkForChanges };

packages/firebase-analytics/hooks/tsconfig.json

@@ -0,0 +1,18 @@
+{
+	"compilerOptions": {
+		"outDir": "../../../dist/packages/firebase-analytics/hooks",
+		"rootDirs": [".", ".."],
+		"module": "commonjs",
+		"target": "es2015",
+		"moduleResolution": "node",
+		"declaration": false,
+		"experimentalDecorators": true,
+		"emitDecoratorMetadata": true,
+		"noEmitHelpers": false,
+		"noEmitOnError": true,
+		"removeComments": true,
+		"skipLibCheck": true
+	},
+	"include": ["../typings/**/*.d.ts"],
+	"files": ["index.ts"]
+}

packages/firebase-analytics/package.json

@@ -8,7 +8,14 @@
 		"platforms": {
 			"ios": "6.0.0",
 			"android": "6.0.0"
-		}
+		},
+		"hooks": [
+			{
+				"type": "before-checkForChanges",
+				"script": "hooks/before-checkForChanges.js",
+				"inject": true
+			}
+		]
 	},
 	"repository": {
 		"type": "git",
@@ -31,5 +38,9 @@
 	"license": "Apache-2.0",
 	"homepage": "https://github.com/NativeScript/firebase",
 	"readmeFilename": "README.md",
-	"bootstrapper": "@nativescript/plugin-seed"
+	"bootstrapper": "@nativescript/plugin-seed",
+	"scripts": {
+		"preuninstall": "node preuninstall",
+		"postinstall": "node postinstall"
+	}
 }

packages/firebase-analytics/postinstall.ts

@@ -0,0 +1 @@
+require('@nativescript/hook')(__dirname).postinstall();

packages/firebase-analytics/preuninstall.ts

@@ -0,0 +1 @@
+require('@nativescript/hook')(__dirname).preuninstall();

packages/firebase-analytics/project.json

@@ -32,7 +32,7 @@
 		"build.all": {
 			"executor": "@nrwl/workspace:run-commands",
 			"options": {
-				"commands": ["node tools/scripts/build-finish.ts firebase-analytics"],
+				"commands": ["./node_modules/.bin/tsc -p packages/firebase-analytics/hooks/tsconfig.json", "node tools/scripts/build-finish.ts firebase-analytics"],
 				"parallel": false
 			},
 			"outputs": ["dist/packages/firebase-analytics"],

packages/firebase-analytics/tsconfig.json

@@ -1,9 +1,9 @@
 {
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "rootDir": "."
-  },
-  "exclude": ["**/*.spec.ts", "angular", "src-native"],
-  "include": ["**/*.ts", "references.d.ts"]
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"outDir": "../../dist/out-tsc",
+		"rootDir": "."
+	},
+	"exclude": ["**/*.spec.ts", "angular", "src-native", "hooks"],
+	"include": ["**/*.ts", "references.d.ts"]
 }

tsconfig.base.json

@@ -7,10 +7,10 @@
 		"emitDecoratorMetadata": true,
 		"experimentalDecorators": true,
 		"noEmitHelpers": false,
-		"target": "es2015",
+		"target": "es2017",
 		"module": "esnext",
+		"lib": ["es2019", "WebWorker", "dom"],
 		"allowSyntheticDefaultImports": true,
-		"lib": ["es2017", "dom"],
 		"skipLibCheck": true,
 		"skipDefaultLibCheck": true,
 		"baseUrl": ".",