Skip to content

Commit

Permalink
Update to Ionic 5.5.2 Angular 11.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Sunil Kumar committed Mar 19, 2021
1 parent e9f0ef5 commit 8508d25
Show file tree
Hide file tree
Showing 21 changed files with 5,382 additions and 3,144 deletions.
17 changes: 17 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# For the full list of supported browsers by the Angular framework, please see:
# https://angular.io/guide/browser-support

# You can see what browsers were selected by your queries by running:
# npx browserslist

last 1 Chrome version
last 1 Firefox version
last 2 Edge major versions
last 2 Safari major versions
last 2 iOS major versions
Firefox ESR
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
16 changes: 16 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Editor configuration, see https://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.ts]
quote_type = single

[*.md]
max_line_length = off
trim_trailing_whitespace = false
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
node_modules
resources
plugins
25 changes: 24 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
Clone and run npm install, If you wish to update to the latest Ionic **delete** the `node_modules` and run below,

```
npm install @ionic/angular@latest @ionic/angular-toolkit@latest --save
ng update @angular/core @angular/cli
npm install @ionic/angular-toolkit@latest
```

## Install the Stripe (cordova) plugin not for Capacitor
Expand All @@ -14,6 +15,28 @@ ionic cordova plugin add cordova-plugin-stripe
npm install --save @ionic-native/stripe
```

## Ionic Native (peer dependency issue fix)

```
npm WARN @ionic-native/[email protected] requires a peer of @ionic-native/core@^5.1.0 but none is installed. You must install peer dependencies yourself.
```

You need to install manually as below

```
npm i @ionic-native/core
```

## Install Stripe for Capacitor

Make sure your Ionic project is integrated with Capacitor and not Cordova

```
npm install cordova-plugin-stripe
npm install @ionic-native/stripe
ionic cap sync
```

## Stripe (Test) Key

**/src/payments/payments.page.ts**
Expand Down
10 changes: 1 addition & 9 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,7 @@
"output": "./svg"
}
],
"styles": [
{
"input": "src/theme/variables.scss"
},
{
"input": "src/global.scss"
}
],
"styles": ["src/theme/variables.scss", "src/global.scss"],
"scripts": []
},
"configurations": {
Expand All @@ -52,7 +45,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
Expand Down
12 changes: 0 additions & 12 deletions browserslist

This file was deleted.

1 change: 0 additions & 1 deletion config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<allow-intent href="mailto:*" />
<allow-intent href="geo:*" />
<preference name="ScrollEnabled" value="false" />
<preference name="android-minSdkVersion" value="19" />
<preference name="BackupWebStorage" value="none" />
<preference name="SplashMaintainAspectRatio" value="true" />
<preference name="FadeSplashScreenDuration" value="300" />
Expand Down
15 changes: 12 additions & 3 deletions e2e/protractor.conf.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
// @ts-check
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts

const { SpecReporter } = require('jasmine-spec-reporter');
const { SpecReporter, StacktraceOption } = require('jasmine-spec-reporter');

/**
* @type { import("protractor").Config }
*/
exports.config = {
allScriptsTimeout: 11000,
specs: [
'./src/**/*.e2e-spec.ts'
],
capabilities: {
'browserName': 'chrome'
browserName: 'chrome'
},
directConnect: true,
SELENIUM_PROMISE_MANAGER: false,
baseUrl: 'http://localhost:4200/',
framework: 'jasmine',
jasmineNodeOpts: {
Expand All @@ -23,6 +28,10 @@ exports.config = {
require('ts-node').register({
project: require('path').join(__dirname, './tsconfig.json')
});
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
jasmine.getEnv().addReporter(new SpecReporter({
spec: {
displayStacktrace: StacktraceOption.PRETTY
}
}));
}
};
5 changes: 2 additions & 3 deletions e2e/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"target": "es2018",
"types": [
"jasmine",
"jasminewd2",
"node"
]
}
Expand Down
Loading

0 comments on commit 8508d25

Please sign in to comment.