Skip to content

Commit

Permalink
feat: Update dependenices
Browse files Browse the repository at this point in the history
BREAKING CHANGE: `ng-core` and `ng-app-state`, and `ng-dev` now require angular 11
  • Loading branch information
ersimont committed Nov 21, 2020
2 parents f0f2473 + 080cd75 commit 45eb28e
Show file tree
Hide file tree
Showing 32 changed files with 2,665 additions and 2,801 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -35,7 +35,7 @@ speed-measure-plugin*.json
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
*debug.log
yarn-error.log
testem.log
/typings
Expand Down
2 changes: 0 additions & 2 deletions angular.json
Expand Up @@ -83,7 +83,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
Expand Down Expand Up @@ -260,7 +259,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
Expand Down
44 changes: 22 additions & 22 deletions package.json
Expand Up @@ -22,47 +22,47 @@
"ts-node": "ts-node -O \"{ \\\"module\\\": \\\"commonjs\\\" }\""
},
"dependencies": {
"@angular/animations": "~10.2.2",
"@angular/common": "~10.2.2",
"@angular/compiler": "~10.2.2",
"@angular/core": "~10.2.2",
"@angular/forms": "~10.2.2",
"@angular/platform-browser": "~10.2.2",
"@angular/platform-browser-dynamic": "~10.2.2",
"@angular/router": "~10.2.2",
"@typescript-eslint/eslint-plugin": "~4.6.1",
"@typescript-eslint/parser": "~4.6.1",
"eslint": "~7.13.0",
"@angular/animations": "~11.0.2",
"@angular/common": "~11.0.2",
"@angular/compiler": "~11.0.2",
"@angular/core": "~11.0.2",
"@angular/forms": "~11.0.2",
"@angular/platform-browser": "~11.0.2",
"@angular/platform-browser-dynamic": "~11.0.2",
"@angular/router": "~11.0.2",
"@typescript-eslint/eslint-plugin": "~4.8.1",
"@typescript-eslint/parser": "~4.8.1",
"eslint": "~7.14.0",
"rxjs": "~6.6.0",
"tslib": "^2.0.0",
"tslint-config-prettier": "~1.18.0",
"utility-types": "~3.10.0",
"zone.js": "~0.10.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1002.0",
"@angular/cdk": "~10.2.7",
"@angular/cli": "~10.2.0",
"@angular/compiler-cli": "~10.2.2",
"@angular/material": "~10.2.7",
"@types/jasmine": "~3.5.0",
"@angular-devkit/build-angular": "~0.1100.2",
"@angular/cdk": "~11.0.0",
"@angular/cli": "~11.0.2",
"@angular/compiler-cli": "~11.0.2",
"@angular/material": "~11.0.0",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.3",
"@types/lodash-es": "^4.17.3",
"@types/node": "^12.11.1",
"@types/prettier": "^2.0.1",
"@types/sinon": "^9.0.4",
"codelyzer": "^6.0.0-next.1",
"dtslint": "^3.6.12",
"codelyzer": "^6.0.0",
"dtslint": "^4.0.6",
"glob": "^7.1.6",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~5.0.0",
"karma": "~5.1.1",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-coverage": "~2.0.3",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"lodash-es": "^4.17.10",
"ng-packagr": "^10.1.0",
"ng-packagr": "^11.0.3",
"prettier": "^2.0.5",
"protractor": "~7.0.0",
"sinon": "^9.0.2",
Expand Down
11 changes: 7 additions & 4 deletions projects/app-state/karma.conf.js
Expand Up @@ -9,16 +9,19 @@ module.exports = function (config) {
require("karma-jasmine"),
require("karma-chrome-launcher"),
require("karma-jasmine-html-reporter"),
require("karma-coverage-istanbul-reporter"),
require("karma-coverage"),
require("@angular-devkit/build-angular/plugins/karma"),
],
client: {
clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
jasmineHtmlReporter: {
suppressAll: true, // removes the duplicated traces
},
coverageReporter: {
dir: require("path").join(__dirname, "../../coverage/app-state"),
reports: ["html", "lcovonly", "text-summary"],
fixWebpackSourcePaths: true,
subdir: ".",
reporters: [{ type: "html" }, { type: "text-summary" }],
},
reporters: ["progress", "kjhtml"],
port: 9876,
Expand Down
4 changes: 3 additions & 1 deletion projects/app-state/package.json
Expand Up @@ -15,5 +15,7 @@
"@s-libs/ng-core": "^10.0.0",
"@s-libs/rxjs-core": "^10.0.0"
},
"dependencies": { "tslib": "^2.0.0" }
"dependencies": {
"tslib": "^2.0.0"
}
}
1 change: 0 additions & 1 deletion projects/integration/.browserslistrc
Expand Up @@ -14,5 +14,4 @@ last 2 Edge major versions
last 2 Safari major versions
last 2 iOS major versions
Firefox ESR
not IE 9-10 # Angular support for IE 9-10 has been deprecated and will be removed as of Angular v11. To opt-in, remove the 'not' prefix on this line.
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
1 change: 1 addition & 0 deletions projects/integration/e2e/protractor.conf.js
Expand Up @@ -14,6 +14,7 @@ exports.config = {
browserName: "chrome",
},
directConnect: true,
SELENIUM_PROMISE_MANAGER: false,
baseUrl: "http://localhost:4200/",
framework: "jasmine",
jasmineNodeOpts: {
Expand Down
8 changes: 4 additions & 4 deletions projects/integration/e2e/src/app.e2e-spec.ts
@@ -1,14 +1,14 @@
import { browser, element, by, ElementFinder, Key, logging } from 'protractor';
import { browser, by, element, ElementFinder, Key, logging } from 'protractor';
import { AppPage } from './app.po';

const cities = ['San Francisco', 'Nairobi', 'Gulu'];

describe('integration App', () => {
let page: AppPage;

beforeEach(() => {
beforeEach(async () => {
page = new AppPage();
page.navigateTo();
await page.navigateTo();
});

afterEach(async () => {
Expand Down Expand Up @@ -130,7 +130,7 @@ describe('integration App', () => {

await browser
.actions()
.dragAndDrop(getInput('range'), { x: -99, y: 0 })
.dragAndDrop(await getInput('range').getWebElement(), { x: -99, y: 0 })
.perform();
await expectValue('0');
});
Expand Down
4 changes: 2 additions & 2 deletions projects/integration/e2e/src/app.po.ts
@@ -1,7 +1,7 @@
import { browser } from 'protractor';

export class AppPage {
navigateTo(): Promise<unknown> {
return browser.get(browser.baseUrl) as Promise<unknown>;
async navigateTo(): Promise<unknown> {
return browser.get(browser.baseUrl);
}
}
2 changes: 1 addition & 1 deletion projects/integration/e2e/tsconfig.json
Expand Up @@ -5,6 +5,6 @@
"outDir": "../../../out-tsc/e2e",
"module": "commonjs",
"target": "es2018",
"types": ["jasmine", "jasminewd2", "node"]
"types": ["jasmine", "node"]
}
}
11 changes: 7 additions & 4 deletions projects/integration/karma.conf.js
Expand Up @@ -9,16 +9,19 @@ module.exports = function (config) {
require("karma-jasmine"),
require("karma-chrome-launcher"),
require("karma-jasmine-html-reporter"),
require("karma-coverage-istanbul-reporter"),
require("karma-coverage"),
require("@angular-devkit/build-angular/plugins/karma"),
],
client: {
clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
jasmineHtmlReporter: {
suppressAll: true, // removes the duplicated traces
},
coverageReporter: {
dir: require("path").join(__dirname, "../../coverage/integration"),
reports: ["html", "lcovonly", "text-summary"],
fixWebpackSourcePaths: true,
subdir: ".",
reporters: [{ type: "html" }, { type: "text-summary" }],
},
reporters: ["progress", "kjhtml"],
port: 9876,
Expand Down
2 changes: 1 addition & 1 deletion projects/integration/src/polyfills.ts
Expand Up @@ -18,7 +18,7 @@
* BROWSER POLYFILLS
*/

/** IE10 and IE11 requires the following for NgClass support on SVG elements */
/** IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.

/**
Expand Down
11 changes: 7 additions & 4 deletions projects/js-core/karma.conf.js
Expand Up @@ -9,16 +9,19 @@ module.exports = function (config) {
require("karma-jasmine"),
require("karma-chrome-launcher"),
require("karma-jasmine-html-reporter"),
require("karma-coverage-istanbul-reporter"),
require("karma-coverage"),
require("@angular-devkit/build-angular/plugins/karma"),
],
client: {
clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
jasmineHtmlReporter: {
suppressAll: true, // removes the duplicated traces
},
coverageReporter: {
dir: require("path").join(__dirname, "../../coverage/js-core"),
reports: ["html", "lcovonly", "text-summary"],
fixWebpackSourcePaths: true,
subdir: ".",
reporters: [{ type: "html" }, { type: "text-summary" }],
},
reporters: ["progress", "kjhtml"],
port: 9876,
Expand Down
8 changes: 6 additions & 2 deletions projects/js-core/package.json
Expand Up @@ -9,6 +9,10 @@
"url": "https://github.com/simontonsoftware/s-libs.git",
"directory": "projects/js-core"
},
"peerDependencies": { "@s-libs/micro-dash": "^10.0.0" },
"dependencies": { "tslib": "^2.0.0" }
"peerDependencies": {
"@s-libs/micro-dash": "^10.0.0"
},
"dependencies": {
"tslib": "^2.0.0"
}
}
1 change: 0 additions & 1 deletion projects/micro-dash-sizes/.browserslistrc
Expand Up @@ -14,5 +14,4 @@ last 2 Edge major versions
last 2 Safari major versions
last 2 iOS major versions
Firefox ESR
not IE 9-10 # Angular support for IE 9-10 has been deprecated and will be removed as of Angular v11. To opt-in, remove the 'not' prefix on this line.
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
11 changes: 7 additions & 4 deletions projects/micro-dash/karma.conf.js
Expand Up @@ -9,16 +9,19 @@ module.exports = function (config) {
require("karma-jasmine"),
require("karma-chrome-launcher"),
require("karma-jasmine-html-reporter"),
require("karma-coverage-istanbul-reporter"),
require("karma-coverage"),
require("@angular-devkit/build-angular/plugins/karma"),
],
client: {
clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
jasmineHtmlReporter: {
suppressAll: true, // removes the duplicated traces
},
coverageReporter: {
dir: require("path").join(__dirname, "../../coverage/micro-dash"),
reports: ["html", "lcovonly", "text-summary"],
fixWebpackSourcePaths: true,
subdir: ".",
reporters: [{ type: "html" }, { type: "text-summary" }],
},
reporters: ["progress", "kjhtml"],
port: 9876,
Expand Down
5 changes: 4 additions & 1 deletion projects/micro-dash/package.json
Expand Up @@ -10,5 +10,8 @@
"url": "https://github.com/simontonsoftware/s-libs.git",
"directory": "projects/micro-dash"
},
"dependencies": { "tslib": "^2.0.0", "utility-types": "^3.10.0" }
"dependencies": {
"tslib": "^2.0.0",
"utility-types": "^3.10.0"
}
}
11 changes: 7 additions & 4 deletions projects/ng-app-state/karma.conf.js
Expand Up @@ -9,16 +9,19 @@ module.exports = function (config) {
require("karma-jasmine"),
require("karma-chrome-launcher"),
require("karma-jasmine-html-reporter"),
require("karma-coverage-istanbul-reporter"),
require("karma-coverage"),
require("@angular-devkit/build-angular/plugins/karma"),
],
client: {
clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
jasmineHtmlReporter: {
suppressAll: true, // removes the duplicated traces
},
coverageReporter: {
dir: require("path").join(__dirname, "../../coverage/ng-app-state"),
reports: ["html", "lcovonly", "text-summary"],
fixWebpackSourcePaths: true,
subdir: ".",
reporters: [{ type: "html" }, { type: "text-summary" }],
},
reporters: ["progress", "kjhtml"],
port: 9876,
Expand Down
8 changes: 5 additions & 3 deletions projects/ng-app-state/package.json
Expand Up @@ -10,12 +10,14 @@
"directory": "projects/ng-app-state"
},
"peerDependencies": {
"@angular/common": "^10.2.0",
"@angular/core": "^10.2.0",
"@angular/common": "^11.0.0",
"@angular/core": "^11.0.0",
"@s-libs/js-core": "^10.0.0",
"@s-libs/micro-dash": "^10.0.0",
"@s-libs/ng-core": "^10.0.0",
"@s-libs/rxjs-core": "^10.0.0"
},
"dependencies": { "tslib": "^2.0.0" }
"dependencies": {
"tslib": "^2.0.0"
}
}

0 comments on commit 45eb28e

Please sign in to comment.