Skip to content

Commit ce09cfb

Browse files
author
Michael Parnham
committed
PVP-7147 trying to get an ngx 13 compliant app to work. this is manual merge from pull request fullcalendar#386 
1 parent e5c512f commit ce09cfb

File tree

21 files changed

+8320
-238
lines changed

21 files changed

+8320
-238
lines changed

‎.eslintrc.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"root": true,
3+
"ignorePatterns": ["projects/**/*"],
4+
"overrides": [
5+
{
6+
"files": ["*.ts"],
7+
"parserOptions": {
8+
"project": ["tsconfig.json", "e2e/tsconfig.json"],
9+
"createDefaultProgram": true
10+
},
11+
"extends": [
12+
"plugin:@angular-eslint/recommended",
13+
"plugin:@angular-eslint/template/process-inline-templates"
14+
],
15+
"rules": {}
16+
},
17+
{
18+
"files": ["*.html"],
19+
"extends": ["plugin:@angular-eslint/template/recommended"],
20+
"rules": {}
21+
}
22+
]
23+
}

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
!/dist/fullcalendar/package.json
1111
/tmp
1212
/out-tsc
13+
/dist
1314

1415
# dependencies
1516
/node_modules
@@ -32,6 +33,7 @@ package-lock.json
3233
!.vscode/extensions.json
3334

3435
# misc
36+
/.angular/cache
3537
/.sass-cache
3638
/connect.lock
3739
/coverage

‎README.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# FullCalendar Angular Component [![Build Status](https://travis-ci.com/fullcalendar/fullcalendar-angular.svg?branch=master)](https://travis-ci.com/fullcalendar/fullcalendar-angular)
32

43
This project provides an official Angular component for FullCalendar, with all the same setting.
@@ -9,7 +8,6 @@ This project provides an official Angular component for FullCalendar, with all t
98

109
This project is built and maintained by [irustm](https://github.com/irustm) in partnership with the maintainers of FullCalendar. The project was originally called `ng-fullcalendar` which can still be [found on NPM](https://www.npmjs.com/package/ng-fullcalendar).
1110

12-
1311
## Supported Angular Versions
1412

15-
`@fullcalendar/angular` version 5 supports Angular 9 - 11.
13+
`@fullcalendar/angular` version 5 supports Angular 9 - 13.

‎angular.json‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"build": {
1818
"builder": "@angular-devkit/build-angular:browser",
1919
"options": {
20-
"aot": true,
2120
"outputPath": "dist/fullcalendar-demo",
2221
"index": "src/index.html",
2322
"main": "src/main.ts",
@@ -31,7 +30,13 @@
3130
"styles": [
3231
"src/styles.scss"
3332
],
34-
"scripts": []
33+
"scripts": [],
34+
"vendorChunk": true,
35+
"extractLicenses": false,
36+
"buildOptimizer": false,
37+
"sourceMap": true,
38+
"optimization": false,
39+
"namedChunks": true
3540
},
3641
"configurations": {
3742
"production": {
@@ -45,7 +50,6 @@
4550
"outputHashing": "all",
4651
"sourceMap": false,
4752
"namedChunks": false,
48-
"aot": true,
4953
"extractLicenses": true,
5054
"vendorChunk": false,
5155
"buildOptimizer": true,
@@ -61,7 +65,8 @@
6165
}
6266
]
6367
}
64-
}
68+
},
69+
"defaultConfiguration": ""
6570
},
6671
"serve": {
6772
"builder": "@angular-devkit/build-angular:dev-server",
@@ -98,14 +103,11 @@
98103
}
99104
},
100105
"lint": {
101-
"builder": "@angular-devkit/build-angular:tslint",
106+
"builder": "@angular-eslint/builder:lint",
102107
"options": {
103-
"tsConfig": [
104-
"src/tsconfig.app.json",
105-
"src/tsconfig.spec.json"
106-
],
107-
"exclude": [
108-
"**/node_modules/**"
108+
"lintFilePatterns": [
109+
"src/**/*.ts",
110+
"src/**/*.html"
109111
]
110112
}
111113
}
@@ -129,11 +131,11 @@
129131
}
130132
},
131133
"lint": {
132-
"builder": "@angular-devkit/build-angular:tslint",
134+
"builder": "@angular-eslint/builder:lint",
133135
"options": {
134-
"tsConfig": "e2e/tsconfig.e2e.json",
135-
"exclude": [
136-
"**/node_modules/**"
136+
"lintFilePatterns": [
137+
"e2e//**/*.ts",
138+
"e2e//**/*.html"
137139
]
138140
}
139141
}
@@ -171,19 +173,19 @@
171173
}
172174
},
173175
"lint": {
174-
"builder": "@angular-devkit/build-angular:tslint",
176+
"builder": "@angular-eslint/builder:lint",
175177
"options": {
176-
"tsConfig": [
177-
"projects/fullcalendar/tsconfig.lib.json",
178-
"projects/fullcalendar/tsconfig.spec.json"
179-
],
180-
"exclude": [
181-
"**/node_modules/**"
178+
"lintFilePatterns": [
179+
"projects/fullcalendar/**/*.ts",
180+
"projects/fullcalendar/**/*.html"
182181
]
183182
}
184183
}
185184
}
186185
}
187186
},
188-
"defaultProject": "fullcalendar-demo"
187+
"defaultProject": "fullcalendar-demo",
188+
"cli": {
189+
"defaultCollection": "@angular-eslint/schematics"
190+
}
189191
}

‎dist/fullcalendar/package.json‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,36 @@
1515
"url": "https://github.com/fullcalendar/fullcalendar-angular.git"
1616
},
1717
"dependencies": {
18-
"@fullcalendar/core": "~5.10.1",
19-
"fast-deep-equal": "^3.1.1",
2018
"tslib": "^2.0.0"
2119
},
2220
"peerDependencies": {
23-
"@angular/common": "9 - 12",
24-
"@angular/core": "9 - 12"
21+
"@angular/common": "9 - 13",
22+
"@angular/core": "9 - 13",
23+
"@fullcalendar/core": "~5.10.1",
24+
"fast-deep-equal": "^3.1.1"
2525
},
2626
"engines": {
2727
"node": ">= 6.9.0",
2828
"npm": ">= 3.0.0"
2929
},
30-
"main": "bundles/fullcalendar-angular.umd.js",
31-
"module": "fesm2015/fullcalendar-angular.js",
32-
"es2015": "fesm2015/fullcalendar-angular.js",
33-
"esm2015": "esm2015/fullcalendar-angular.js",
34-
"fesm2015": "fesm2015/fullcalendar-angular.js",
30+
"module": "fesm2015/fullcalendar-angular.mjs",
31+
"es2020": "fesm2020/fullcalendar-angular.mjs",
32+
"esm2020": "esm2020/fullcalendar-angular.mjs",
33+
"fesm2020": "fesm2020/fullcalendar-angular.mjs",
34+
"fesm2015": "fesm2015/fullcalendar-angular.mjs",
3535
"typings": "fullcalendar-angular.d.ts",
36-
"metadata": "fullcalendar-angular.metadata.json",
36+
"exports": {
37+
"./package.json": {
38+
"default": "./package.json"
39+
},
40+
".": {
41+
"types": "./fullcalendar-angular.d.ts",
42+
"esm2020": "./esm2020/fullcalendar-angular.mjs",
43+
"es2020": "./fesm2020/fullcalendar-angular.mjs",
44+
"es2015": "./fesm2015/fullcalendar-angular.mjs",
45+
"node": "./fesm2015/fullcalendar-angular.mjs",
46+
"default": "./fesm2020/fullcalendar-angular.mjs"
47+
}
48+
},
3749
"sideEffects": false
3850
}

‎e2e/.eslintrc.json‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"extends": "../.eslintrc.json",
3+
"ignorePatterns": ["!**/*"],
4+
"overrides": [
5+
{
6+
"files": ["*.ts"],
7+
"parserOptions": {
8+
"project": [
9+
"src/tsconfig.app.json",
10+
"src/tsconfig.spec.json",
11+
"e2e/tsconfig.e2e.json"
12+
],
13+
"createDefaultProgram": true
14+
},
15+
"rules": {
16+
"@angular-eslint/directive-selector": [
17+
"error",
18+
{
19+
"type": "attribute",
20+
"prefix": "",
21+
"style": "camelCase"
22+
}
23+
],
24+
"@angular-eslint/component-selector": [
25+
"error",
26+
{
27+
"type": "element",
28+
"prefix": "",
29+
"style": "kebab-case"
30+
}
31+
]
32+
}
33+
},
34+
{
35+
"files": ["*.html"],
36+
"rules": {}
37+
}
38+
]
39+
}

‎e2e/src/app.e2e-spec.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import { AppPage } from './app.po';
2-
import { protractor, browser } from 'protractor';
2+
import { browser } from 'protractor';
33

44
describe('workspace-project App', () => {
55
let page: AppPage;
66

7-
beforeAll(() => {
7+
beforeAll(async () => {
88
page = new AppPage();
99
page.navigateTo();
10+
11+
await browser.waitForAngularEnabled(false);
1012
});
1113

1214
it('should display calendar component', () => {
@@ -25,5 +27,4 @@ describe('workspace-project App', () => {
2527
page.getUpdateHeaderButton().click();
2628
expect(page.getMonthButton().isPresent()).toBeFalsy();
2729
});
28-
2930
});

‎package.json‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"scripts": {
66
"ng": "ng",
77
"start": "ng serve",
8-
"build": "npm run build:meta && ng build fullcalendar --prod",
8+
"build": "npm run build:meta && ng build fullcalendar --configuration production",
99
"build:meta": "mkdir -p dist/fullcalendar && cp LICENSE.* README.* dist/fullcalendar",
10-
"build:demo": "ng build fullcalendar-demo --configuration='production'",
10+
"build:demo": "ng build fullcalendar-demo --configuration production",
1111
"test": "ng test fullcalendar --watch=false --browsers ChromeHeadless",
1212
"test:watch": "ng test fullcalendar --watch=true",
1313
"test:demo": "ng test",
@@ -19,33 +19,40 @@
1919
"version": "npm run sync-version-fields && git add projects/fullcalendar/package.json"
2020
},
2121
"dependencies": {
22-
"@angular/animations": "~11.0.2",
23-
"@angular/common": "~11.0.2",
24-
"@angular/compiler": "~11.0.2",
25-
"@angular/core": "~11.0.2",
26-
"@angular/forms": "~11.0.2",
27-
"@angular/platform-browser": "~11.0.2",
28-
"@angular/platform-browser-dynamic": "~11.0.2",
29-
"@angular/router": "~11.0.2",
22+
"@angular/animations": "~13.1.0",
23+
"@angular/common": "~13.1.0",
24+
"@angular/compiler": "~13.1.0",
25+
"@angular/core": "~13.1.0",
26+
"@angular/forms": "~13.1.0",
27+
"@angular/platform-browser": "~13.1.0",
28+
"@angular/platform-browser-dynamic": "~13.1.0",
29+
"@angular/router": "~13.1.0",
3030
"@fullcalendar/core": "~5.10.1",
3131
"@fullcalendar/daygrid": "~5.10.1",
3232
"@fullcalendar/interaction": "~5.10.1",
3333
"@fullcalendar/timegrid": "~5.10.1",
34-
"core-js": "^3.6.2",
34+
"core-js": "^3.19.3",
3535
"fast-deep-equal": "^3.1.1",
3636
"rxjs": "~6.5.4",
3737
"tslib": "^2.0.0",
38-
"zone.js": "~0.10.3"
38+
"zone.js": "~0.11.4"
3939
},
4040
"devDependencies": {
41-
"@angular-devkit/build-angular": "~0.1100.2",
42-
"@angular/cli": "~11.0.2",
43-
"@angular/compiler-cli": "~11.0.2",
44-
"@angular/language-service": "~11.0.2",
41+
"@angular-devkit/build-angular": "~13.1.1",
42+
"@angular-eslint/builder": "^13.0.1",
43+
"@angular-eslint/eslint-plugin": "^13.0.1",
44+
"@angular-eslint/eslint-plugin-template": "^13.0.1",
45+
"@angular-eslint/schematics": "^13.0.1",
46+
"@angular-eslint/template-parser": "^13.0.1",
47+
"@angular/cli": "~13.1.1",
48+
"@angular/compiler-cli": "~13.1.0",
49+
"@angular/language-service": "~13.1.0",
4550
"@types/jasmine": "~3.6.0",
4651
"@types/jasminewd2": "~2.0.3",
4752
"@types/node": "^12.11.1",
48-
"codelyzer": "^6.0.0",
53+
"@typescript-eslint/eslint-plugin": "^5.7.0",
54+
"@typescript-eslint/parser": "^5.7.0",
55+
"eslint": "^8.4.1",
4956
"fullcalendar-scheduler": "~5.10.1",
5057
"jasmine-core": "~3.6.0",
5158
"jasmine-spec-reporter": "~5.0.0",
@@ -54,10 +61,9 @@
5461
"karma-coverage-istanbul-reporter": "~3.0.2",
5562
"karma-jasmine": "~4.0.0",
5663
"karma-jasmine-html-reporter": "^1.5.0",
57-
"ng-packagr": "^11.0.3",
64+
"ng-packagr": "^13.1.1",
5865
"protractor": "~7.0.0",
59-
"ts-node": "~8.5.4",
60-
"tslint": "~6.1.0",
61-
"typescript": "4.0.5"
66+
"ts-node": "~10.4.0",
67+
"typescript": "4.4.4"
6268
}
63-
}
69+
}

‎projects/fullcalendar/.eslintrc.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"extends": "../../.eslintrc.json",
3+
"ignorePatterns": ["!**/*"],
4+
"overrides": [
5+
{
6+
"files": ["*.ts"],
7+
"parserOptions": {
8+
"project": [
9+
"projects/fullcalendar/tsconfig.lib.json",
10+
"projects/fullcalendar/tsconfig.spec.json"
11+
],
12+
"createDefaultProgram": true
13+
},
14+
"rules": {}
15+
},
16+
{
17+
"files": ["*.html"],
18+
"rules": {}
19+
}
20+
]
21+
}

‎projects/fullcalendar/ng-package.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
{
22
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
33
"dest": "../../dist/fullcalendar",
4-
"whitelistedNonPeerDependencies": ["."],
54
"lib": {
6-
"entryFile": "src/public_api.ts",
7-
"umdModuleIds": {
8-
"@fullcalendar/core": "FullCalendar"
9-
}
5+
"entryFile": "src/public_api.ts"
106
}
117
}

0 commit comments

Comments
 (0)