Skip to content

Commit f348842

Browse files
authored
Merge pull request #82 from arielfaur/ionic-angular-update
Ionic angular update
2 parents 939fcaa + 3168ffd commit f348842

39 files changed

Lines changed: 25980 additions & 14268 deletions
File renamed without changes.

.eslintrc.json

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
{
2+
"root": true,
3+
"ignorePatterns": [
4+
"projects/**/*"
5+
],
6+
"overrides": [
7+
{
8+
"files": [
9+
"*.ts"
10+
],
11+
"parserOptions": {
12+
"project": [
13+
"tsconfig.json",
14+
"e2e/tsconfig.json"
15+
],
16+
"createDefaultProgram": true
17+
},
18+
"extends": [
19+
"plugin:@angular-eslint/ng-cli-compat",
20+
"plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
21+
"plugin:@angular-eslint/template/process-inline-templates"
22+
],
23+
"rules": {
24+
"@typescript-eslint/naming-convention": [
25+
"error",
26+
{
27+
"selector": [ "enumMember" ],
28+
"format": [ "PascalCase" ]
29+
}
30+
],
31+
"@angular-eslint/component-class-suffix": [
32+
"error",
33+
{
34+
"suffixes": [
35+
"Page",
36+
"Component"
37+
]
38+
}
39+
],
40+
"@angular-eslint/component-selector": [
41+
"error",
42+
{
43+
"type": "element",
44+
"prefix": "app",
45+
"style": "kebab-case"
46+
}
47+
],
48+
"@angular-eslint/directive-selector": [
49+
"error",
50+
{
51+
"type": "attribute",
52+
"prefix": "app",
53+
"style": "camelCase"
54+
}
55+
],
56+
"@typescript-eslint/explicit-member-accessibility": [
57+
"off",
58+
{
59+
"accessibility": "explicit"
60+
}
61+
],
62+
"arrow-parens": [
63+
"off",
64+
"always"
65+
],
66+
"import/order": "off",
67+
"one-var": [
68+
"off",
69+
"never"
70+
]
71+
}
72+
},
73+
{
74+
"files": [
75+
"*.html"
76+
],
77+
"extends": [
78+
"plugin:@angular-eslint/template/recommended"
79+
],
80+
"rules": {}
81+
}
82+
]
83+
}

.github/workflows/npm-publish.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: "Publish to MyGet"
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branches:
6+
- internal
7+
jobs:
8+
publish-npm:
9+
name: 🛠️ Build and Publish NPM Package
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: "🚚 Get Latest Code"
13+
uses: actions/checkout@v3
14+
- name: "⚙️ Use Node.js 16"
15+
uses: actions/setup-node@v3
16+
with:
17+
node-version: 16
18+
- run: npm install
19+
- run: |
20+
sed -i -e 's/ionic-pullup/\@cmnhospitals\/ionic-pullup/g' projects/ionic-pullup/package.json
21+
sed -i -e 's/arielfaur/cmnhospitals/g' projects/ionic-pullup/package.json
22+
- run: |
23+
npm run build-lib
24+
echo "//www.myget.org/F/cmnhospitalsnpm/npm/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./dist/ionic-pullup/.npmrc
25+
- uses: JS-DevTools/npm-publish@v1
26+
id: npm-publish
27+
with:
28+
token: ${{ secrets.NPM_TOKEN }}
29+
package: ./dist/ionic-pullup/package.json
30+
registry: https://www.myget.org/F/cmnhospitalsnpm/npm/
31+
- uses: cmnhospitals/github-tag-action@2.0.0
32+
env:
33+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34+
CUSTOM_TAG: ${{ steps.npm-publish.outputs.version }}
35+
RELEASE_BRANCHES: internal

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/.angular/cache
12
# Specifies intentionally untracked files to ignore when using Git
23
# http://git-scm.com/docs/gitignore
34

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 2022-07-28 • v6.1.0-beta.1
4+
Upgrade components for Ionic 6 and Angular 14 compatibility.
5+
6+
## 2022-07-11 • v6.0.0-beta.1
7+
Upgrade components for Ionic 6 and Angular 13 compatibility. Including moving to eslint.
8+
39
## 2020-10-29 • v5.0.0-beta.3
410
Fixed null check error when binding toolbarTopMargin property
511

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# ionic-pullup for Ionic 5 and Angular 9
1+
# ionic-pullup for Ionic 6 and Angular 14
22

33
A pull-up footer component for Ionic. The pull-up footer is a UI component built on top of Ionic's footer and offers an efficient way to hide/reveal information. The footer can fully expand to cover the content area of the screen or can be configured to expand to a maximum height.
44
The component will compute the available screen height providing for header and tabs.

angular.json

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
33
"version": 1,
4-
"defaultProject": "app",
54
"newProjectRoot": "projects",
65
"projects": {
76
"app": {
@@ -33,14 +32,23 @@
3332
],
3433
"styles": [
3534
{
36-
"input": "src/theme/variables.scss"
35+
"input": "src/theme/variables.scss",
36+
"inject": true
3737
},
3838
{
39-
"input": "src/global.scss"
39+
"input": "src/global.scss",
40+
"inject": true
4041
}
4142
],
4243
"scripts": [],
43-
"preserveSymlinks": true
44+
"preserveSymlinks": true,
45+
"aot": false,
46+
"vendorChunk": true,
47+
"extractLicenses": false,
48+
"buildOptimizer": false,
49+
"sourceMap": true,
50+
"optimization": false,
51+
"namedChunks": true
4452
},
4553
"configurations": {
4654
"production": {
@@ -53,7 +61,6 @@
5361
"optimization": true,
5462
"outputHashing": "all",
5563
"sourceMap": false,
56-
"extractCss": true,
5764
"namedChunks": false,
5865
"aot": true,
5966
"extractLicenses": true,
@@ -70,7 +77,8 @@
7077
"ci": {
7178
"progress": false
7279
}
73-
}
80+
},
81+
"defaultConfiguration": ""
7482
},
7583
"serve": {
7684
"builder": "@angular-devkit/build-angular:dev-server",
@@ -81,9 +89,7 @@
8189
"production": {
8290
"browserTarget": "app:build:production"
8391
},
84-
"ci": {
85-
"progress": false
86-
}
92+
"ci": {}
8793
}
8894
},
8995
"extract-i18n": {
@@ -121,17 +127,6 @@
121127
}
122128
}
123129
},
124-
"lint": {
125-
"builder": "@angular-devkit/build-angular:tslint",
126-
"options": {
127-
"tsConfig": [
128-
"tsconfig.app.json",
129-
"tsconfig.spec.json",
130-
"e2e/tsconfig.json"
131-
],
132-
"exclude": ["**/node_modules/**"]
133-
}
134-
},
135130
"e2e": {
136131
"builder": "@angular-devkit/build-angular:protractor",
137132
"options": {
@@ -180,7 +175,7 @@
180175
"prefix": "lib",
181176
"architect": {
182177
"build": {
183-
"builder": "@angular-devkit/build-ng-packagr:build",
178+
"builder": "@angular-devkit/build-angular:ng-packagr",
184179
"options": {
185180
"tsConfig": "projects/ionic-pullup/tsconfig.lib.json",
186181
"project": "projects/ionic-pullup/ng-package.json"
@@ -195,22 +190,22 @@
195190
}
196191
},
197192
"lint": {
198-
"builder": "@angular-devkit/build-angular:tslint",
193+
"builder": "@angular-eslint/builder:lint",
199194
"options": {
200-
"tsConfig": [
201-
"projects/ionic-pullup/tsconfig.lib.json",
202-
"projects/ionic-pullup/tsconfig.spec.json"
203-
],
204-
"exclude": [
205-
"**/node_modules/**"
195+
"lintFilePatterns": [
196+
"projects/ionic-pullup/**/*.ts",
197+
"projects/ionic-pullup/**/*.html"
206198
]
207199
}
208200
}
209201
}
210202
}
211203
},
212204
"cli": {
213-
"defaultCollection": "@ionic/angular-toolkit"
205+
"analytics": false,
206+
"schematicCollections": [
207+
"@ionic/angular-toolkit"
208+
]
214209
},
215210
"schematics": {
216211
"@ionic/angular-toolkit:component": {

e2e/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"compilerOptions": {
44
"outDir": "../out-tsc/app",
55
"module": "commonjs",
6-
"target": "es5",
6+
"target": "es2018",
77
"types": [
88
"jasmine",
99
"jasminewd2",

0 commit comments

Comments
 (0)