Skip to content

Commit

Permalink
feat: Update to Angular 14
Browse files Browse the repository at this point in the history
BREAKING CHANGE: Libraries that depend on Angular now require version 14, that depend on RxJS require 7.5, and that require Jasmine require 4.1
  • Loading branch information
ersimont committed Jun 6, 2022
1 parent 6ded9ff commit ea35470
Show file tree
Hide file tree
Showing 17 changed files with 57 additions and 56 deletions.
21 changes: 9 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,45 +1,42 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
# Compiled output
/dist
/tmp
/out-tsc
# Only exists if Bazel was run
/bazel-out

# dependencies
# Node
/node_modules

# profiling files
chrome-profiler-events*.json
npm-debug.log
yarn-error.log

# IDEs and editors
# .idea/
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
# Visual Studio Code
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*

# misc
# Miscellaneous
/.angular/cache
/.sass-cache
.sass-cache/
/connect.lock
/coverage
/libpeerconnection.log
*debug.log
yarn-error.log
testem.log
/typings

# System Files
# System files
.DS_Store
Thumbs.db
15 changes: 7 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"build": "ng build",
"watch": "ng build --watch --configuration development",
"test": "ng test",
"e2e": "ng e2e",
"build-libs": "yarn ts-node scripts/build-libs",
"dtslint": "dtslint --expectOnly --localTs node_modules/typescript/lib",
"prettier-all": "prettier --write \"**/*.{html,js,json,md,scss,ts,yml}\"",
Expand All @@ -28,7 +27,7 @@
"@angular/platform-browser": "^14.0.0",
"@angular/platform-browser-dynamic": "^14.0.0",
"@angular/router": "^14.0.0",
"rxjs": "~7.4.0",
"rxjs": "~7.5.0",
"tslib": "^2.3.0",
"utility-types": "~3.10.0",
"zone.js": "~0.11.4"
Expand All @@ -40,7 +39,7 @@
"@angular-eslint/eslint-plugin-template": "13.0.1",
"@angular-eslint/schematics": "13.0.1",
"@angular-eslint/template-parser": "13.0.1",
"@angular/cli": "^14.0.0",
"@angular/cli": "~14.0.0",
"@angular/compiler-cli": "^14.0.0",
"@types/glob": "^7.2.0",
"@types/jasmine": "~3.10.0",
Expand All @@ -53,11 +52,11 @@
"eslint": "^8.2.0",
"expect-type": "^0.13.0",
"glob": "^7.1.6",
"jasmine-core": "~3.10.0",
"jasmine-core": "~4.1.0",
"karma": "~6.3.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage": "~2.0.3",
"karma-jasmine": "~4.0.0",
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.0.0",
"karma-jasmine-html-reporter": "~1.7.0",
"lodash-es": "^4.17.10",
"ng-packagr": "^14.0.0",
Expand All @@ -66,7 +65,7 @@
"standard-version": "^9.0.0",
"ts-node": "^10.3.0",
"typedoc": "^0.22.5",
"typescript": "~4.7.3"
"typescript": "~4.7.2"
},
"prettier": {
"trailingComma": "all"
Expand Down Expand Up @@ -119,4 +118,4 @@
"postchangelog": "prettier --write CHANGELOG.md"
}
}
}
}
4 changes: 2 additions & 2 deletions projects/app-state/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ declare const require: {
deep?: boolean,
filter?: RegExp,
) => {
keys: () => string[];
<T>(id: string): T;
keys: () => string[];
};
};

Expand All @@ -28,4 +28,4 @@ getTestBed().initTestEnvironment(
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/u);
// And load the modules.
context.keys().map(context);
context.keys().forEach(context);
4 changes: 2 additions & 2 deletions projects/integration/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ declare const require: {
deep?: boolean,
filter?: RegExp,
) => {
keys: () => string[];
<T>(id: string): T;
keys: () => string[];
};
};

Expand All @@ -27,4 +27,4 @@ getTestBed().initTestEnvironment(
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/u);
// And load the modules.
context.keys().map(context);
context.keys().forEach(context);
4 changes: 2 additions & 2 deletions projects/js-core/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ declare const require: {
deep?: boolean,
filter?: RegExp,
) => {
keys: () => string[];
<T>(id: string): T;
keys: () => string[];
};
};

Expand All @@ -28,4 +28,4 @@ getTestBed().initTestEnvironment(
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/u);
// And load the modules.
context.keys().map(context);
context.keys().forEach(context);
4 changes: 2 additions & 2 deletions projects/micro-dash/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ declare const require: {
deep?: boolean,
filter?: RegExp,
) => {
keys: () => string[];
<T>(id: string): T;
keys: () => string[];
};
};

Expand All @@ -28,4 +28,4 @@ getTestBed().initTestEnvironment(
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/u);
// And load the modules.
context.keys().map(context);
context.keys().forEach(context);
8 changes: 5 additions & 3 deletions projects/ng-app-state/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
"directory": "projects/ng-app-state"
},
"peerDependencies": {
"@angular/common": "^13.0.0",
"@angular/core": "^13.0.0",
"@angular/common": "^14.0.0",
"@angular/core": "^14.0.0",
"@s-libs/js-core": "^13.1.0",
"@s-libs/micro-dash": "^13.1.0",
"@s-libs/ng-core": "^13.1.0",
"@s-libs/rxjs-core": "^13.1.0"
},
"dependencies": { "tslib": "^2.3.0" }
"dependencies": {
"tslib": "^2.3.0"
}
}
4 changes: 2 additions & 2 deletions projects/ng-app-state/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ declare const require: {
deep?: boolean,
filter?: RegExp,
) => {
keys: () => string[];
<T>(id: string): T;
keys: () => string[];
};
};

Expand All @@ -28,4 +28,4 @@ getTestBed().initTestEnvironment(
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/u);
// And load the modules.
context.keys().map(context);
context.keys().forEach(context);
4 changes: 2 additions & 2 deletions projects/ng-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"directory": "projects/ng-core"
},
"peerDependencies": {
"@angular/common": "^13.0.0",
"@angular/core": "^13.0.0",
"@angular/common": "^14.0.0",
"@angular/core": "^14.0.0",
"@s-libs/js-core": "^13.1.0",
"@s-libs/micro-dash": "^13.1.0",
"@s-libs/rxjs-core": "^13.1.0"
Expand Down
4 changes: 2 additions & 2 deletions projects/ng-core/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ declare const require: {
deep?: boolean,
filter?: RegExp,
) => {
keys: () => string[];
<T>(id: string): T;
keys: () => string[];
};
};

Expand All @@ -28,4 +28,4 @@ getTestBed().initTestEnvironment(
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/u);
// And load the modules.
context.keys().map(context);
context.keys().forEach(context);
12 changes: 7 additions & 5 deletions projects/ng-dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@
"directory": "projects/ng-dev"
},
"peerDependencies": {
"@angular/cdk": "^13.0.0",
"@angular/common": "^13.0.0",
"@angular/core": "^13.0.0",
"@angular/cdk": "^14.0.0",
"@angular/common": "^14.0.0",
"@angular/core": "^14.0.0",
"@s-libs/js-core": "^13.1.0",
"@s-libs/micro-dash": "^13.1.0",
"@s-libs/ng-core": "^13.1.0",
"@s-libs/rxjs-core": "^13.1.0",
"jasmine-core": "^3.10.0"
"jasmine-core": "^4.1.0"
},
"dependencies": { "tslib": "^2.3.0" }
"dependencies": {
"tslib": "^2.3.0"
}
}
2 changes: 1 addition & 1 deletion projects/ng-dev/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ getTestBed().initTestEnvironment(
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/u);
// And load the modules.
context.keys().map(context);
context.keys().forEach(context);
8 changes: 5 additions & 3 deletions projects/ng-mat-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
"directory": "projects/ng-mat-core"
},
"peerDependencies": {
"@angular/common": "^13.0.0",
"@angular/core": "^13.0.0",
"@angular/common": "^14.0.0",
"@angular/core": "^14.0.0",
"@s-libs/js-core": "^13.1.0",
"@s-libs/micro-dash": "^13.1.0",
"@s-libs/ng-core": "^13.1.0",
"@s-libs/rxjs-core": "^13.1.0"
},
"dependencies": { "tslib": "^2.3.0" }
"dependencies": {
"tslib": "^2.3.0"
}
}
4 changes: 2 additions & 2 deletions projects/ng-mat-core/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ declare const require: {
deep?: boolean,
filter?: RegExp,
) => {
keys: () => string[];
<T>(id: string): T;
keys: () => string[];
};
};

Expand All @@ -28,4 +28,4 @@ getTestBed().initTestEnvironment(
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/u);
// And load the modules.
context.keys().map(context);
context.keys().forEach(context);
6 changes: 4 additions & 2 deletions projects/rxjs-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
"peerDependencies": {
"@s-libs/js-core": "^13.1.0",
"@s-libs/micro-dash": "^13.1.0",
"rxjs": "^7.4.0"
"rxjs": "^7.5.0"
},
"dependencies": { "tslib": "^2.3.0" }
"dependencies": {
"tslib": "^2.3.0"
}
}
4 changes: 2 additions & 2 deletions projects/rxjs-core/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ declare const require: {
deep?: boolean,
filter?: RegExp,
) => {
keys: () => string[];
<T>(id: string): T;
keys: () => string[];
};
};

Expand All @@ -28,4 +28,4 @@ getTestBed().initTestEnvironment(
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/u);
// And load the modules.
context.keys().map(context);
context.keys().forEach(context);
5 changes: 1 addition & 4 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
"target": "es2020",
"module": "es2020",
"lib": ["es2020", "dom"],
"paths": {
"@s-libs/*": ["dist/*"],
"ng-mat-core": ["dist/ng-mat-core/ng-mat-core", "dist/ng-mat-core"]
},
"paths": { "@s-libs/*": ["dist/*"] },

//
// Simonton Software additions
Expand Down

0 comments on commit ea35470

Please sign in to comment.