Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

[rc] Add support for Angular 9, TypeScript ~3.6 #181

Merged
merged 43 commits into from
Feb 12, 2020
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
98489b0
Implement Dart SASS
Blackbaud-SteveBrush Sep 3, 2019
ce0daa5
Upgraded webpack
Blackbaud-SteveBrush Sep 3, 2019
a00d18a
Merged master
Blackbaud-SteveBrush Sep 3, 2019
2cc3078
Merge master
Blackbaud-SteveBrush Oct 14, 2019
eac54ba
Angular 9
Blackbaud-SteveBrush Oct 24, 2019
4841822
Merge branch 'rc-4.0.0' into dart-sass
Blackbaud-SteveBrush Nov 19, 2019
6eb8a56
Add appveyor
Blackbaud-SteveBrush Nov 19, 2019
5b79532
Merge branch 'rc-4.0.0' into rc-angular-9
Blackbaud-SteveBrush Nov 20, 2019
bc344ed
Merge branch 'rc-4.0.0' into dart-sass
Blackbaud-SteveBrush Nov 20, 2019
027eb88
Fix package lock
Blackbaud-SteveBrush Nov 20, 2019
282ff06
Merge branch 'dart-sass' into rc-angular-9
Blackbaud-SteveBrush Nov 20, 2019
931c6d9
Upgrade core-js, webpack and loaders
Blackbaud-SteveBrush Nov 20, 2019
b9a0c6c
Use Common HTTP
Blackbaud-SteveBrush Nov 20, 2019
bdd7031
Use css-loader, to-string-loader
Blackbaud-SteveBrush Nov 21, 2019
ad63019
Use dev branch for template
Blackbaud-SteveBrush Nov 21, 2019
89a05f5
Updated packages
Blackbaud-SteveBrush Nov 21, 2019
9fddd12
Update packages
Blackbaud-SteveBrush Nov 21, 2019
21bc965
Fix coverage
Blackbaud-SteveBrush Nov 21, 2019
02c95fb
Disable ivy for now
Blackbaud-SteveBrush Nov 22, 2019
2a57428
Update packages
Blackbaud-SteveBrush Nov 22, 2019
85916bf
Add ngDevMode
Blackbaud-SteveBrush Nov 22, 2019
ed0dca0
Update modals
Blackbaud-SteveBrush Nov 22, 2019
ae0f3ab
Revert webpack raw-loader changes
Blackbaud-SteveBrush Dec 2, 2019
42aaf39
Merge branch 'rc-4.0.0' into rc-angular-9
Blackbaud-SteveBrush Jan 22, 2020
5aefd25
Updated minor versions
Blackbaud-SteveBrush Jan 22, 2020
b17b7a6
Update packages
Blackbaud-SteveBrush Jan 22, 2020
4aaccbc
Update packages
Blackbaud-SteveBrush Jan 24, 2020
0022f49
Revert Ivy config
Blackbaud-SteveBrush Jan 27, 2020
d898502
Disable Ivy
Blackbaud-SteveBrush Jan 27, 2020
ed1c7cc
Make core-js a dependency
Blackbaud-SteveBrush Jan 30, 2020
2e9f931
Remove runtime module
Blackbaud-SteveBrush Jan 30, 2020
7bd6d2e
Re-add pact stuff
Blackbaud-SteveBrush Jan 30, 2020
6c17d87
Add inline comments
Blackbaud-SteveBrush Jan 30, 2020
19396e6
Comment cleanup
Blackbaud-SteveBrush Jan 30, 2020
e8c2bd3
Update package
Blackbaud-SteveBrush Jan 31, 2020
0651d66
Enable Ivy
Blackbaud-SteveBrush Feb 5, 2020
7301eb5
Upgrade packages
Blackbaud-SteveBrush Feb 5, 2020
d898c6f
Update packages
Blackbaud-SteveBrush Feb 7, 2020
8d7fc3f
Merge branch 'rc-4.0.0' into rc-angular-9
Blackbaud-SteveBrush Feb 7, 2020
bf6f7f7
Merge branch 'rc-4.0.0' into rc-angular-9
Blackbaud-SteveBrush Feb 7, 2020
a3f928b
Update i18n
Blackbaud-SteveBrush Feb 7, 2020
a292990
Merge branch 'rc-4.0.0' into rc-angular-9
Blackbaud-SteveBrush Feb 12, 2020
ab08077
Update packages
Blackbaud-SteveBrush Feb 12, 2020
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
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"prefer-arrow-callback": "off",
"prefer-const": "off",
"prefer-destructuring": "off",
"prefer-object-spread": "off",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This rule was turned "on" by default in the latest version of ESLint.

"prefer-rest-params": "off",
"prefer-spread": "off",
"prefer-template": "off",
Expand Down
6 changes: 4 additions & 2 deletions cli/utils/browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,16 @@ function browser(argv, skyPagesConfig, stats, port) {

logger.info(`Launching Local URL: ${localUrl}`);
open(localUrl, {
app: argv.browser
app: argv.browser,
url: true
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upgraded open to the next major version; they require you to specify if the "thing" you're opening is a URL or not.

});
break;

case 'host':
logger.info(`Launching Host URL: ${hostUrl}`);
open(hostUrl, {
app: argv.browser
app: argv.browser,
url: true
});
break;

Expand Down
2 changes: 1 addition & 1 deletion config/protractor/protractor-dev.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ let config = {
} else {

const url = 'https://github.com/blackbaud/skyux-sdk-template';
const branch = 'master';
const branch = 'rc-4.0.0';
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pointing to a specific branch of the template to get e2e tests to run.

See: https://github.com/blackbaud/skyux-sdk-template/tree/rc-4.0.0


console.log('Running command using full install.');
common.rimrafPromise(common.tmp)
Expand Down
14 changes: 7 additions & 7 deletions config/webpack/build-public-library.webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ function getWebpackConfig(skyPagesConfig) {
},
{
test: /\.html$/,
use: 'raw-loader'
use: 'html-loader'
Blackbaud-SteveBrush marked this conversation as resolved.
Show resolved Hide resolved
},
{
test: /\.scss$/,
use: ['raw-loader', 'sass-loader']
},
{
test: /\.css$/,
use: ['raw-loader', 'style-loader']
test: /\.s?css$/,
use: [
'to-string-loader',
'css-loader',
'sass-loader'
]
}
]
}
Expand Down
5 changes: 3 additions & 2 deletions config/webpack/common.webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,14 @@ function getWebpackConfig(skyPagesConfig, argv = {}) {
{
test: /\.s?css$/,
use: [
'raw-loader',
'to-string-loader',
'css-loader',
'sass-loader'
]
},
{
test: /\.html$/,
loader: 'raw-loader'
loader: 'html-loader'
},
{
// Mark files inside `@angular/core` as using SystemJS style dynamic imports.
Expand Down
8 changes: 6 additions & 2 deletions config/webpack/test.webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,15 @@ function getWebpackConfig(skyPagesConfig, argv) {

{
test: /\.s?css$/,
use: ['raw-loader', 'sass-loader']
use: [
'to-string-loader',
'css-loader',
'sass-loader'
]
},
{
test: /\.html$/,
loader: 'raw-loader'
loader: 'html-loader'
},
{
// Mark files inside `@angular/core` as using SystemJS style dynamic imports.
Expand Down
12 changes: 0 additions & 12 deletions lib/sky-pages-module-generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ function getSource(skyAppConfig) {
let nodeModuleImports = [
`import { NgModule } from '@angular/core';`,
`import { CommonModule } from '@angular/common';`,
`import { HttpModule } from '@angular/http';`,
`import { FormsModule, ReactiveFormsModule } from '@angular/forms';`,
`import { RouterModule } from '@angular/router';`,
`import { SkyAppAssetsService } from '@skyux/assets';`,
Expand All @@ -93,7 +92,6 @@ function getSource(skyAppConfig) {

let runtimeModuleImports = [
'CommonModule',
'HttpModule',
'FormsModule',
'ReactiveFormsModule',
'AppExtrasModule',
Expand Down Expand Up @@ -123,16 +121,6 @@ function getSource(skyAppConfig) {

runtimeProviders.push(authTokenProvider);

if (skyAppConfig.skyux.auth) {
nodeModuleImports.push(`import { XHRBackend, RequestOptions } from '@angular/http';`);
nodeModuleImports.push(`import { SkyAuthHttp } from '@skyux/http';`);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

runtimeProviders.push(`{
provide: SkyAuthHttp,
useClass: SkyAuthHttp,
deps: [XHRBackend, RequestOptions, SkyAuthTokenProvider, SkyAppConfig]
}`);
}

if (skyAppConfig.skyux.help) {
nodeModuleImports.push(`import { BBHelpModule } from '@blackbaud/skyux-lib-help';`);
runtimeModuleImports.push('BBHelpModule');
Expand Down
Loading