Skip to content

fix(analytics): AnalyticsWithoutAdIdSupport #115

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

Merged
merged 3 commits into from
Aug 8, 2022
Merged

fix(analytics): AnalyticsWithoutAdIdSupport #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f98e0d
fix(analytics): AnalyticsWithoutAdIdSupport
triniwiz Aug 6, 2022
37d5ae6
feat(analytics): hook to handle AdId support
NathanWalker Aug 8, 2022
6e1b71d
chore: adjust package to ensure hooks are included for analytics
NathanWalker Aug 8, 2022
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
2 changes: 1 addition & 1 deletion apps/demo-vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion apps/demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
23 changes: 23 additions & 0 deletions packages/firebase-analytics/hooks/before-checkForChanges.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
}
}
};
2 changes: 2 additions & 0 deletions packages/firebase-analytics/hooks/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import checkForChanges = require('./before-checkForChanges');
export { checkForChanges };
18 changes: 18 additions & 0 deletions packages/firebase-analytics/hooks/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
}
15 changes: 13 additions & 2 deletions packages/firebase-analytics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
1 change: 1 addition & 0 deletions packages/firebase-analytics/postinstall.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require('@nativescript/hook')(__dirname).postinstall();
1 change: 1 addition & 0 deletions packages/firebase-analytics/preuninstall.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require('@nativescript/hook')(__dirname).preuninstall();
2 changes: 1 addition & 1 deletion packages/firebase-analytics/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
14 changes: 7 additions & 7 deletions packages/firebase-analytics/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
}
4 changes: 2 additions & 2 deletions tsconfig.base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": ".",
Expand Down