Skip to content

Commit

Permalink
feat: angular 14 (#475)
Browse files Browse the repository at this point in the history
BREAKING CHANGE: requires angular 14
Co-authored-by: Richard Soon <[email protected]>
  • Loading branch information
rnsoon authored Sep 28, 2023
1 parent 0bd3d9e commit 30a5733
Show file tree
Hide file tree
Showing 8 changed files with 7,803 additions and 8,307 deletions.
5 changes: 3 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,9 @@
}
}
},
"defaultProject": "angulartics2",
"cli": {
"defaultCollection": "@angular-eslint/schematics"
"schematicCollections": [
"@angular-eslint/schematics"
]
}
}
3 changes: 2 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ module.exports = function (config) {
require('@angular-devkit/build-angular/plugins/karma'),
],
client: {
clearContext: false, // leave Jasmine Spec Runner output visible in browser
clearContext: false,
verboseDeprecations: true,
},
coverageReporter: {
dir: require('path').join(__dirname, './coverage/zzz'),
Expand Down
63 changes: 32 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,35 @@
},
"private": true,
"dependencies": {
"@angular/animations": "13.0.3",
"@angular/cdk": "13.0.3",
"@angular/common": "13.0.3",
"@angular/compiler": "13.0.3",
"@angular/core": "13.0.3",
"@angular/forms": "13.0.3",
"@angular/localize": "13.0.3",
"@angular/material": "13.0.3",
"@angular/platform-browser": "13.0.3",
"@angular/platform-browser-dynamic": "13.0.3",
"@angular/router": "13.0.3",
"@ng-bootstrap/ng-bootstrap": "10.0.0",
"bootstrap": "4.5.0",
"@angular/animations": "14.3.0",
"@angular/cdk": "^14.2.7",
"@angular/common": "14.3.0",
"@angular/compiler": "14.3.0",
"@angular/core": "14.3.0",
"@angular/forms": "14.3.0",
"@angular/localize": "14.3.0",
"@angular/material": "^14.2.7",
"@angular/platform-browser": "14.3.0",
"@angular/platform-browser-dynamic": "14.3.0",
"@angular/router": "14.3.0",
"@ng-bootstrap/ng-bootstrap": "^13.1.1",
"@popperjs/core": "^2.10.2",
"bootstrap": "^5.2.0",
"core-js": "3.19.2",
"rxjs": "7.4.0",
"tslib": "2.3.1",
"zone.js": "0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "13.0.4",
"@angular-eslint/builder": "13.0.1",
"@angular-eslint/eslint-plugin": "13.0.1",
"@angular-eslint/eslint-plugin-template": "13.0.1",
"@angular-eslint/schematics": "13.0.1",
"@angular-eslint/template-parser": "13.0.1",
"@angular/cli": "13.0.4",
"@angular/compiler-cli": "13.0.3",
"@angular/language-service": "13.0.3",
"@angular-devkit/build-angular": "14.2.12",
"@angular-eslint/builder": "^14.4.0",
"@angular-eslint/eslint-plugin": "^14.4.0",
"@angular-eslint/eslint-plugin-template": "^14.4.0",
"@angular-eslint/schematics": "^14.4.0",
"@angular-eslint/template-parser": "^14.4.0",
"@angular/cli": "14.2.12",
"@angular/compiler-cli": "14.3.0",
"@angular/language-service": "14.3.0",
"@types/applicationinsights-js": "1.0.9",
"@types/facebook-pixel": "0.0.24",
"@types/google.analytics": "0.0.42",
Expand All @@ -54,19 +55,19 @@
"@types/segment-analytics": "0.0.34",
"@typescript-eslint/eslint-plugin": "5.5.0",
"@typescript-eslint/parser": "5.5.0",
"cpy-cli": "3.1.1",
"cpy-cli": "^5.0.0",
"del-cli": "4.0.1",
"eslint": "^8.4.0",
"jasmine-core": "3.10.1",
"karma": "6.3.9",
"karma-chrome-launcher": "3.1.0",
"jasmine-core": "^3.99.1",
"karma": "^6.4.2",
"karma-chrome-launcher": "^3.2.0",
"karma-cli": "2.0.0",
"karma-coverage": "2.1.0",
"karma-jasmine": "4.0.1",
"karma-jasmine-html-reporter": "1.7.0",
"ng-packagr": "13.0.8",
"karma-coverage": "^2.2.1",
"karma-jasmine": "^4.0.2",
"karma-jasmine-html-reporter": "^1.7.0",
"ng-packagr": "14.2.2",
"ts-node": "10.4.0",
"typescript": "4.4.4"
"typescript": "4.8.4"
},
"release": {
"branch": "master"
Expand Down
21 changes: 0 additions & 21 deletions src/lib/angulartics2On.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -142,25 +142,4 @@ describe('angulartics2On', () => {
});
}),
));

describe('running on server', () => {
@Injectable({ providedIn: 'root' })
@Directive({
selector: '[angulartics2On]',
})
class Angulartics2OnStub extends Angulartics2On {
isBrowser() {
return false;
}
}

beforeEach(() => {
TestBed.overrideModule(Angulartics2Module, {
set: {
declarations: [Angulartics2OnStub],
exports: [Angulartics2OnStub],
},
});
});
});
});
5 changes: 2 additions & 3 deletions src/lib/test.mocks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,7 @@ export function createRootWithRouter(router: Router, type: any): ComponentFixtur
export class HelloModule {}

@NgModule({
imports: [HelloModule, CommonModule, RouterTestingModule, Angulartics2Module.forRoot()],
entryComponents: [RootCmp],
declarations: [RootCmp],
imports: [HelloModule, CommonModule, RouterTestingModule, Angulartics2Module.forRoot()],
declarations: [RootCmp]
})
export class TestModule {}
16 changes: 8 additions & 8 deletions src/styles.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
@import '~bootstrap/scss/functions';
@import '~bootstrap/scss/variables';
@import '~bootstrap/scss/variables-dark';
@import '~bootstrap/scss/maps';
@import '~bootstrap/scss/mixins';
@import '~bootstrap/scss/utilities';

@import '~bootstrap/scss/root';
@import '~bootstrap/scss/reboot';
@import '~bootstrap/scss/type';
@import '~bootstrap/scss/images';
@import '~bootstrap/scss/code';
//@import '~bootstrap/scss/code';
@import '~bootstrap/scss/grid';
// @import '~bootstrap/scss/tables';
// @import '~bootstrap/scss/forms';
Expand All @@ -21,8 +25,8 @@
// @import '~bootstrap/scss/breadcrumb';
// @import '~bootstrap/scss/pagination';
// @import '~bootstrap/scss/badge';
@import '~bootstrap/scss/jumbotron';
@import '~bootstrap/scss/alert';
//@import '~bootstrap/scss/jumbotron';
//@import '~bootstrap/scss/alert';
// @import '~bootstrap/scss/progress';
// @import '~bootstrap/scss/media';
// @import '~bootstrap/scss/list-group';
Expand All @@ -31,9 +35,7 @@
// @import '~bootstrap/scss/tooltip';
// @import '~bootstrap/scss/popover';
// @import '~bootstrap/scss/carousel';
@import '~bootstrap/scss/utilities';
@import '~bootstrap/scss/print';

//@import '~bootstrap/scss/print';

.bg-blue {
background-color: #007bff;
Expand All @@ -60,5 +62,3 @@
width: 100%;
height: auto;
}


2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"experimentalDecorators": true,
"moduleResolution": "node",
"importHelpers": true,
"target": "es2017",
"target": "es2020",
"module": "es2020",
"types": [
"node",
Expand Down
Loading

0 comments on commit 30a5733

Please sign in to comment.