Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.2.1 #1

Merged
merged 27 commits into from
Jan 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
94e5f7c
fix(2889): fix build error with --prod
danielsogl Jan 12, 2018
06bbd06
fix(serve): start listening when watch is ready
imhoffd Jan 24, 2018
09bd434
Merge pull request #1372 from ionic-team/listen
imhoffd Jan 25, 2018
718d2fc
Merge pull request #1365 from danielsogl/patch-6
imhoffd Apr 2, 2018
1591c81
fix(live-server): update android platform path (#1407)
itslenny Apr 18, 2018
262a748
docs(changelog): 3.1.9
imhoffd Apr 18, 2018
6cd813a
3.1.9
imhoffd Apr 18, 2018
89ce9a5
Update node-sass dependency (#1435)
Fabious Jun 11, 2018
684fc42
chore(package): bump deps (#1421)
danielsogl Jun 11, 2018
4f6e029
chore(deps): no package lock
imhoffd Jun 11, 2018
885c159
chore(changelog): 3.1.10
imhoffd Jun 11, 2018
4b4874b
3.1.10
imhoffd Jun 11, 2018
271a6e1
fix(serve): fix EADDRINUSE issue with dev logger server
imhoffd Jul 12, 2018
e3d7f2a
docs(changelog): 3.1.11 changes
imhoffd Jul 12, 2018
ab96e23
3.1.11
imhoffd Jul 12, 2018
53fc341
feat(environments): configuration via process.env.VAR replacement (#1…
nphyatt Aug 24, 2018
1e2035e
fix(sass): remove PostCSS warning (#1364)
StefanRein Aug 24, 2018
29c3e23
fix(serve): use wss protocol for secure websocket when page is using …
rall Aug 24, 2018
190cc20
docs(changelog): 3.2.0
imhoffd Aug 24, 2018
cde0c4b
3.2.0
imhoffd Aug 24, 2018
50667cc
docs(readme): add note about existing declaration
imhoffd Aug 29, 2018
4b7119b
chore(deps): update webpack to 3.12.0 (#1477)
potremblay Oct 2, 2018
82a692e
chore(deps): bump node-sass to 4.9.3 to fix security warnings (#1483)
vially Oct 2, 2018
08d1638
chore(deps): bump node-sass to 4.10.0 to fix security warnings (#1493)
CyberBLN Nov 26, 2018
9c81010
docs(changelog): 3.2.1
imhoffd Nov 26, 2018
441301f
3.2.1
imhoffd Nov 26, 2018
a1739f6
Merge remote-tracking branch 'origin/master' into 3.2.1
trsrm Jan 2, 2019
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 .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=false
48 changes: 48 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,51 @@
<a name="3.2.1"></a>
## [3.2.1](https://github.com/ionic-team/ionic-app-scripts/compare/v3.2.0...v3.2.1) (2018-11-26)

* Security release for dependencies for `node-sass`

<a name="3.2.0"></a>
# [3.2.0](https://github.com/ionic-team/ionic-app-scripts/compare/v3.1.11...v3.2.0) (2018-08-24)


### Bug Fixes

* **sass:** remove PostCSS warning ([#1364](https://github.com/ionic-team/ionic-app-scripts/issues/1364)) ([1e2035e](https://github.com/ionic-team/ionic-app-scripts/commit/1e2035e)), closes [#1359](https://github.com/ionic-team/ionic-app-scripts/issues/1359) [#13763](https://github.com/ionic-team/ionic-app-scripts/issues/13763)
* **serve:** use wss protocol for secure websocket when page is using https ([#1358](https://github.com/ionic-team/ionic-app-scripts/issues/1358)) ([29c3e23](https://github.com/ionic-team/ionic-app-scripts/commit/29c3e23))


### Features

* **environments:** configuration via process.env.VAR replacement ([#1471](https://github.com/ionic-team/ionic-app-scripts/issues/1471)) ([53fc341](https://github.com/ionic-team/ionic-app-scripts/commit/53fc341))



<a name="3.1.11"></a>
## [3.1.11](https://github.com/ionic-team/ionic-app-scripts/compare/v3.1.10...v3.1.11) (2018-07-12)


### Bug Fixes

* **serve:** fix EADDRINUSE issue with dev logger server ([271a6e1](https://github.com/ionic-team/ionic-app-scripts/commit/271a6e1))



<a name="3.1.10"></a>
## [3.1.10](https://github.com/ionic-team/ionic-app-scripts/compare/v3.1.9...v3.1.10) (2018-06-11)



<a name="3.1.9"></a>
## [3.1.9](https://github.com/ionic-team/ionic-app-scripts/compare/v3.1.8...v3.1.9) (2018-04-18)


### Bug Fixes

* **2889:** fix build error with --prod ([94e5f7c](https://github.com/ionic-team/ionic-app-scripts/commit/94e5f7c))
* **live-server:** update android platform path ([#1407](https://github.com/ionic-team/ionic-app-scripts/issues/1407)) ([1591c81](https://github.com/ionic-team/ionic-app-scripts/commit/1591c81))
* **serve:** start listening when watch is ready ([06bbd06](https://github.com/ionic-team/ionic-app-scripts/commit/06bbd06))



<a name="3.1.8"></a>
## [3.1.8](https://github.com/ionic-team/ionic-app-scripts/compare/v3.1.7...v3.1.8) (2018-01-18)

Expand Down
15 changes: 15 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,21 @@ To run the `build` script found in the `package.json` `scripts` property, execut
npm run build
```

## Environments

You can use Node style `process.env.MY_VAR` syntax directly in your typescript
and when the application is bundled it'll be replaced with the following order of precedence:
* If the variable exists in the process environment it will be replaced with that value.
* If the variable is not defined in the process environment it will be read from a `.env.dev`
file for dev builds or `.env.prod` file for prod builds which are located in the root of the app
* If the variable is not defined in either place it will be `undefined`

In order to take advantage of this apps will need a `src/declarations.d.ts` file with the following declaration:
```typescript
declare var process: { env: { [key: string]: string | undefined; } };
```

*Note*: This declaration may conflict if `@types/node` is installed in your project. See [#3541](https://github.com/ionic-team/ionic-cli/issues/3541).

## Custom Configuration

Expand Down
3 changes: 2 additions & 1 deletion bin/ion-dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ window.IonicDevServer = {

openConnection: function() {
var self = this;
this.socket = new WebSocket('ws://' + window.location.hostname + ':' + IonicDevServerConfig.wsPort);
var socketProtocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
this.socket = new WebSocket(socketProtocol + '//' + window.location.hostname + ':' + IonicDevServerConfig.wsPort);

this.socket.onopen = function(ev) {
self.socketReady = true;
Expand Down
11 changes: 11 additions & 0 deletions config/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
var path = require('path');
var webpack = require('webpack');
var ionicWebpackFactory = require(process.env.IONIC_WEBPACK_FACTORY);
const Dotenv = require('dotenv-webpack');

var ModuleConcatPlugin = require('webpack/lib/optimize/ModuleConcatenationPlugin');
var PurifyPlugin = require('@angular-devkit/build-optimizer').PurifyPlugin;
Expand Down Expand Up @@ -91,6 +92,11 @@ var devConfig = {
},

plugins: [
new Dotenv({
path: '.env.dev', // load this now instead of the ones in '.env'
systemvars: true, // load all the predefined 'process.env' variables which will trump anything local per dotenv specs.
silent: true // hide any errors
}),
ionicWebpackFactory.getIonicEnvironmentPlugin(),
ionicWebpackFactory.getCommonChunksPlugin()
],
Expand Down Expand Up @@ -124,6 +130,11 @@ var prodConfig = {
},

plugins: [
new Dotenv({
path: '.env.prod', // load this now instead of the ones in '.env'
systemvars: true, // load all the predefined 'process.env' variables which will trump anything local per dotenv specs.
silent: true // hide any errors
}),
ionicWebpackFactory.getIonicEnvironmentPlugin(),
ionicWebpackFactory.getCommonChunksPlugin(),
new ModuleConcatPlugin(),
Expand Down
Loading