Skip to content

Commit

Permalink
Jaybell/update ng v13 (#93)
Browse files Browse the repository at this point in the history
* build: update to angular v10

* build: update to angular v11

* build: update to angular v12

* build: update to angular v13

* build: use next gen node 14 image

* build: use newest node 14 image

* build: update to eslint

- up the max size as we are now compiling fully for ivy

* build: use legacy image

* chore: remove coverage and align nvmrc to circleci version
  • Loading branch information
yharaskrik committed Feb 9, 2022
1 parent 91cdc2c commit d917a92
Show file tree
Hide file tree
Showing 30 changed files with 8,221 additions and 8,742 deletions.
File renamed without changes.
5 changes: 3 additions & 2 deletions .circleci/config.yml
Expand Up @@ -2,7 +2,7 @@ version: 2

docker_defaults: &docker_defaults
docker:
- image: circleci/node:14.11.0-browsers
- image: circleci/node:14.18.2-browsers
working_directory: ~/project/repo

attach_workspace: &attach_workspace
Expand Down Expand Up @@ -62,7 +62,8 @@ jobs:
command: |
sudo npm run lint
sudo npm test
sudo npm run coveralls
# To be added back in later
# sudo npm run coveralls
build_ssr:
<<: *docker_defaults
steps:
Expand Down
51 changes: 51 additions & 0 deletions .eslintrc.json
@@ -0,0 +1,51 @@
{
"root": true,
"ignorePatterns": [
"projects/**/*"
],
"overrides": [
{
"files": [
"*.ts"
],
"parserOptions": {
"project": [
"tsconfig.json",
"e2e/tsconfig.json"
],
"createDefaultProgram": true
},
"extends": [
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
"@angular-eslint/component-selector": [
"error",
{
"prefix": "ngx",
"style": "kebab-case",
"type": "element"
}
],
"@angular-eslint/directive-selector": [
"error",
{
"prefix": "ngx",
"style": "camelCase",
"type": "attribute"
}
]
}
},
{
"files": [
"*.html"
],
"extends": [
"plugin:@angular-eslint/template/recommended"
],
"rules": {}
}
]
}
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -4,6 +4,7 @@
/dist
/tmp
/out-tsc
**/coverage
# Only exists if Bazel was run
/bazel-out

Expand Down Expand Up @@ -32,6 +33,8 @@ speed-measure-plugin.json
.history/*

# misc
.angular
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
@@ -1 +1 @@
v14.11.0
v14.18.2
61 changes: 34 additions & 27 deletions angular.json
Expand Up @@ -23,9 +23,20 @@
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"aot": false,
"assets": ["src/favicon.ico", "src/assets"],
"styles": ["src/styles.scss"],
"scripts": []
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.scss"
],
"scripts": [],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
Expand All @@ -38,7 +49,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
Expand All @@ -52,7 +62,8 @@
}
]
}
}
},
"defaultConfiguration": ""
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
Expand All @@ -78,20 +89,14 @@
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"assets": ["src/favicon.ico", "src/assets"],
"styles": ["src/styles.scss"],
"scripts": []
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"tsconfig.app.json",
"tsconfig.spec.json",
"e2e/tsconfig.json"
"assets": [
"src/favicon.ico",
"src/assets"
],
"exclude": ["**/node_modules/**"]
"styles": [
"src/styles.scss"
],
"scripts": []
}
},
"e2e": {
Expand All @@ -111,7 +116,9 @@
"options": {
"outputPath": "dist/ngx-skeleton-loader-demo/server",
"main": "server.ts",
"tsConfig": "tsconfig.server.json"
"tsConfig": "tsconfig.server.json",
"sourceMap": true,
"optimization": false
},
"configurations": {
"production": {
Expand All @@ -125,7 +132,8 @@
"sourceMap": false,
"optimization": true
}
}
},
"defaultConfiguration": ""
},
"serve-ssr": {
"builder": "@nguniversal/builders:ssr-dev-server",
Expand Down Expand Up @@ -162,7 +170,7 @@
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "projects/ngx-skeleton-loader/tsconfig.lib.json",
"project": "projects/ngx-skeleton-loader/ng-package.json"
Expand All @@ -182,13 +190,12 @@
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"builder": "@angular-eslint/builder:lint",
"options": {
"tsConfig": [
"projects/ngx-skeleton-loader/tsconfig.lib.json",
"projects/ngx-skeleton-loader/tsconfig.spec.json"
],
"exclude": ["**/node_modules/**"]
"lintFilePatterns": [
"projects/ngx-skeleton-loader/**/*.ts",
"projects/ngx-skeleton-loader/**/*.html"
]
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion e2e/tsconfig.json
Expand Up @@ -3,7 +3,7 @@
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"target": "es2018",
"types": [
"jasmine",
"jasminewd2",
Expand Down
3 changes: 2 additions & 1 deletion karma.conf.js
Expand Up @@ -10,7 +10,8 @@ module.exports = function (config) {
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular-devkit/build-angular/plugins/karma')
require('@angular-devkit/build-angular/plugins/karma'),
require('karma-coverage')
],
client: {
clearContext: false // leave Jasmine Spec Runner output visible in browser
Expand Down

0 comments on commit d917a92

Please sign in to comment.