Skip to content

Commit

Permalink
feat(ng6): add support for angular 6
Browse files Browse the repository at this point in the history
- update demo application and add SSR support

BREAKING CHANGE:

The mininmum version of Angular is now v6+ and of Node is v8+

Closes #17 and #18
  • Loading branch information
tinesoft committed Jul 18, 2018
1 parent 9ba3594 commit 14fb527
Show file tree
Hide file tree
Showing 51 changed files with 7,518 additions and 3,080 deletions.
20 changes: 15 additions & 5 deletions .yo-rc.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"generator-ngx-library": {
"version": "5.0.0",
"version": "6.2.1",
"authorName": "Tine Kondo",
"authorEmail": "[email protected]",
"githubUsername": "tinesoft",
"githubRepoName": "ngx-cookieconsent",
"projectName": "ngx-cookieconsent",
"projectVersion": "1.0.0",
"projectVersion": "1.1.0",
"projectDescription": "Cookie Consent module for Angular.",
"projectKeywords": [
"angular",
Expand All @@ -17,14 +17,15 @@
"law",
"eu"
],
"ngVersion": "2.0.0",
"ngVersion": "6.0.0",
"ngModules": [
"core",
"common"
],
"otherDependencies": ["cookieconsent"],
"dependenciesRange": ">=",
"ngPrefix": "ngc",
"testingFramework": "karma",
"useGreenkeeper": false,
"useCompodoc": true,
"enforceNgGitCommitMsg": true,
Expand All @@ -36,11 +37,20 @@
"CHANGELOG.md",
"config/karma.conf",
"demo/src/app/**",
"demo/src/styles.scss",
"demo/src/assets/logo.svg",
"demo/src/index.html",
"demo/src/favicon.ico",
"src/**/*.*"
"src/**/*.ts"
],
"deleteExclusions": [
"README.md",
"CHANGELOG.md",
"config/karma.conf",
"demo/src/app/**",
"demo/src/assets/logo.svg",
"demo/src/index.html",
"demo/src/favicon.ico",
"src/**/*.ts"
]
}
}
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2017 Tine Kondo
Copyright (c) 2018 Tine Kondo

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
View the module in action at https://tinesoft.github.io/ngx-cookieconsent

## Dependencies
* [Angular](https://angular.io) (*requires* Angular 2 or higher, tested with 2.0.0 and 4.0.0)
* [Cookie Consent](https://cookieconsent.insites.com/) (*requires* Cookie Consent 3 or higher, tested with 3.0.4)
* [Angular](https://angular.io) (*requires* Angular 6+, [v1.1.0](https://github.com/tinesoft/ngx-cookieconsent/tree/v1.1.0) is the latest version for Angular < 6 )
* [Cookie Consent](https://cookieconsent.insites.com/) (*requires* Cookie Consent 3 or higher, tested with 3.0.6)


## Installation
Expand Down Expand Up @@ -264,5 +264,5 @@ export class AppComponent {
## License
Copyright (c) 2017 Tine Kondo. Licensed under the MIT License (MIT)
Copyright (c) 2018 Tine Kondo. Licensed under the MIT License (MIT)
2 changes: 1 addition & 1 deletion config/gulp-tasks/faviconData.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"result":{"status":"success"},"favicon":{"package_url":"https://realfavicongenerator.net/files/5050533ac001e1a1ff4792016b204e3662d48589/favicons.zip","files_urls":["https://realfavicongenerator.net/files/5050533ac001e1a1ff4792016b204e3662d48589/package_files/android-chrome-192x192.png","https://realfavicongenerator.net/files/5050533ac001e1a1ff4792016b204e3662d48589/package_files/android-chrome-512x512.png","https://realfavicongenerator.net/files/5050533ac001e1a1ff4792016b204e3662d48589/package_files/apple-touch-icon.png","https://realfavicongenerator.net/files/5050533ac001e1a1ff4792016b204e3662d48589/package_files/browserconfig.xml","https://realfavicongenerator.net/files/5050533ac001e1a1ff4792016b204e3662d48589/package_files/favicon-16x16.png","https://realfavicongenerator.net/files/5050533ac001e1a1ff4792016b204e3662d48589/package_files/favicon-32x32.png","https://realfavicongenerator.net/files/5050533ac001e1a1ff4792016b204e3662d48589/package_files/favicon.ico","https://realfavicongenerator.net/files/5050533ac001e1a1ff4792016b204e3662d48589/package_files/manifest.json","https://realfavicongenerator.net/files/5050533ac001e1a1ff4792016b204e3662d48589/package_files/mstile-144x144.png","https://realfavicongenerator.net/files/5050533ac001e1a1ff4792016b204e3662d48589/package_files/mstile-150x150.png","https://realfavicongenerator.net/files/5050533ac001e1a1ff4792016b204e3662d48589/package_files/mstile-310x150.png","https://realfavicongenerator.net/files/5050533ac001e1a1ff4792016b204e3662d48589/package_files/mstile-310x310.png","https://realfavicongenerator.net/files/5050533ac001e1a1ff4792016b204e3662d48589/package_files/mstile-70x70.png"],"html_code":"<link rel=\"apple-touch-icon\" sizes=\"180x180\" href=\"/apple-touch-icon.png\">\n<link rel=\"icon\" type=\"image/png\" sizes=\"32x32\" href=\"/favicon-32x32.png\">\n<link rel=\"icon\" type=\"image/png\" sizes=\"16x16\" href=\"/favicon-16x16.png\">\n<link rel=\"manifest\" href=\"/manifest.json\">\n<meta name=\"msapplication-TileColor\" content=\"#003399\">\n<meta name=\"msapplication-TileImage\" content=\"/mstile-144x144.png\">\n<meta name=\"theme-color\" content=\"#ffffff\">","compression":"false","overlapping_markups":["link[rel=\"apple-touch-icon\"]","link[rel=\"shortcut\"]","link[rel=\"shortcut icon\"]","link[rel=\"icon\",sizes=\"16x16\"]","link[rel=\"icon\",sizes=\"32x32\"]","meta[name=\"msapplication-TileColor\"]","meta[name=\"msapplication-TileImage\"]","link[rel=\"manifest\"]","meta[name=\"theme-color\"]"]},"files_location":{"type":"path","path":"/"},"preview_picture_url":"https://realfavicongenerator.net/files/5050533ac001e1a1ff4792016b204e3662d48589/favicon_preview.png","version":"0.15"}
{"result":{"status":"success"},"favicon":{"package_url":"https://realfavicongenerator.net/files/6cc356e448fef10d80e157b7ecf6437842e7bce4/favicon_package_v0.16.zip","files_urls":["https://realfavicongenerator.net/files/6cc356e448fef10d80e157b7ecf6437842e7bce4/package_files/android-chrome-192x192.png","https://realfavicongenerator.net/files/6cc356e448fef10d80e157b7ecf6437842e7bce4/package_files/android-chrome-512x512.png","https://realfavicongenerator.net/files/6cc356e448fef10d80e157b7ecf6437842e7bce4/package_files/apple-touch-icon.png","https://realfavicongenerator.net/files/6cc356e448fef10d80e157b7ecf6437842e7bce4/package_files/browserconfig.xml","https://realfavicongenerator.net/files/6cc356e448fef10d80e157b7ecf6437842e7bce4/package_files/favicon-16x16.png","https://realfavicongenerator.net/files/6cc356e448fef10d80e157b7ecf6437842e7bce4/package_files/favicon-32x32.png","https://realfavicongenerator.net/files/6cc356e448fef10d80e157b7ecf6437842e7bce4/package_files/favicon.ico","https://realfavicongenerator.net/files/6cc356e448fef10d80e157b7ecf6437842e7bce4/package_files/mstile-144x144.png","https://realfavicongenerator.net/files/6cc356e448fef10d80e157b7ecf6437842e7bce4/package_files/mstile-150x150.png","https://realfavicongenerator.net/files/6cc356e448fef10d80e157b7ecf6437842e7bce4/package_files/mstile-310x150.png","https://realfavicongenerator.net/files/6cc356e448fef10d80e157b7ecf6437842e7bce4/package_files/mstile-310x310.png","https://realfavicongenerator.net/files/6cc356e448fef10d80e157b7ecf6437842e7bce4/package_files/mstile-70x70.png","https://realfavicongenerator.net/files/6cc356e448fef10d80e157b7ecf6437842e7bce4/package_files/site.webmanifest"],"html_code":"<link rel=\"apple-touch-icon\" sizes=\"180x180\" href=\"/apple-touch-icon.png\">\n<link rel=\"icon\" type=\"image/png\" sizes=\"32x32\" href=\"/favicon-32x32.png\">\n<link rel=\"icon\" type=\"image/png\" sizes=\"16x16\" href=\"/favicon-16x16.png\">\n<link rel=\"manifest\" href=\"/site.webmanifest\">\n<meta name=\"msapplication-TileColor\" content=\"#003399\">\n<meta name=\"msapplication-TileImage\" content=\"/mstile-144x144.png\">\n<meta name=\"theme-color\" content=\"#ffffff\">","compression":"false","overlapping_markups":["link[rel=\"apple-touch-icon\"]","link[rel=\"shortcut\"]","link[rel=\"shortcut icon\"]","link[rel=\"icon\",sizes=\"16x16\"]","link[rel=\"icon\",sizes=\"32x32\"]","meta[name=\"msapplication-TileColor\"]","meta[name=\"msapplication-TileImage\"]","link[rel=\"manifest\"]","meta[name=\"theme-color\"]"]},"files_location":{"type":"path","path":"/"},"preview_picture_url":"https://realfavicongenerator.net/files/6cc356e448fef10d80e157b7ecf6437842e7bce4/favicon_preview.png","version":"0.16"}
7 changes: 3 additions & 4 deletions config/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@ module.exports = function (config) {
require('karma-mocha-reporter'),
require('karma-jasmine-html-reporter'),
],

customLaunchers: {
// chrome setup for travis CI
Chrome_travis_ci: {
base: 'Chrome',
// Chrome setup for CI (Travis, Docker, ...)
ChromeHeadlessCI: {
base: 'ChromeHeadless',
flags: ['--no-sandbox']
}
},
Expand Down
8 changes: 4 additions & 4 deletions config/webpack.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const helpers = require('./helpers');
const LoaderOptionsPlugin = require('webpack/lib/LoaderOptionsPlugin');
const ContextReplacementPlugin = require('webpack/lib/ContextReplacementPlugin');
const webpack = require('webpack');
const { CheckerPlugin } = require('awesome-typescript-loader');

const getConfig = (hasCoverage, isTddMode) => {
Expand All @@ -27,6 +26,7 @@ const getConfig = (hasCoverage, isTddMode) => {
}

return {
mode: 'none',
devtool: 'inline-source-map',
resolve: {
extensions: ['.ts', '.js'],
Expand Down Expand Up @@ -75,14 +75,14 @@ const getConfig = (hasCoverage, isTddMode) => {

plugins: [

new LoaderOptionsPlugin({
new webpack.LoaderOptionsPlugin({
debug: false,
options: {
// legacy options go here
}
}),
// Fixes linker warnings (see https://github.com/angular/angular/issues/11580)
new ContextReplacementPlugin(
new webpack.ContextReplacementPlugin(
// fixes WARNING Critical dependency: the request of a dependency is an expression
/(.+)?angular(\\|\/)core(.+)?/,
helpers.root('src'), // location of your src
Expand Down
91 changes: 0 additions & 91 deletions demo/.angular-cli.json

This file was deleted.

4 changes: 0 additions & 4 deletions demo/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ yarn-error.log
testem.log
/typings

# e2e
/e2e/*.js
/e2e/*.map

# System Files
.DS_Store
Thumbs.db
5 changes: 2 additions & 3 deletions demo/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ngx-cookieconsent-demo

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.5.0.
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 6.0.0.

## Development server

Expand All @@ -12,7 +12,7 @@ Run `ng generate component component-name` to generate a new component. You can

## Build

Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.

## Running unit tests

Expand All @@ -21,7 +21,6 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
## Running end-to-end tests

Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
Before running the tests make sure you are serving the app via `ng serve`.

## Further help

Expand Down
Loading

0 comments on commit 14fb527

Please sign in to comment.