david.tahir/AngularTicTacToe
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove caret & tilde

Browse Source
This commit is contained in:
Maxime GRIS
2017-05-21 16:56:17 +02:00
parent d528a71c4e
commit dd98155951
3 changed files with 93 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main.js
View File

@@ -2,6 +2,7 @@
try { try {
const electron = require('electron'); const electron = require('electron');
// Module to control application life. // Module to control application life.
const { app } = electron; const { app } = electron;
// Module to create native browser window. // Module to create native browser window.
@@ -12,7 +13,8 @@ try {
serve = args.some(val => val === "--serve"); serve = args.some(val => val === "--serve");
if (serve) { if (serve) {
require('electron-reload')(__dirname + '/dist'); require('electron-reload')(__dirname + '/dist', {
});
} }
function createWindow() { function createWindow() {
@@ -75,4 +77,5 @@ try {
} catch (e) { } catch (e) {
// Catch Error // Catch Error
throw e;
} }

114
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "angular-electron", "name": "angular-electron",
"version": "1.3.5", "version": "1.3.6",
"description": "Angular 4 with Electron (Typescript + SASS + Hot Reload)", "description": "Angular 4 with Electron (Typescript + SASS + Hot Reload)",
"homepage": "https://github.com/maximegris/angular-electron", "homepage": "https://github.com/maximegris/angular-electron",
"author": { "author": {
@@ -35,67 +35,67 @@
"pree2e": "webdriver-manager update --standalone false --gecko false --quiet" "pree2e": "webdriver-manager update --standalone false --gecko false --quiet"
}, },
"dependencies": { "dependencies": {
"@angular/common": "~4.0.2", "@angular/common": "4.0.2",
"@angular/compiler": "~4.0.2", "@angular/compiler": "4.0.2",
"@angular/core": "~4.0.2", "@angular/core": "4.0.2",
"@angular/forms": "~4.0.2", "@angular/forms": "4.0.2",
"@angular/http": "~4.0.2", "@angular/http": "4.0.2",
"@angular/platform-browser": "~4.0.2", "@angular/platform-browser": "4.0.2",
"@angular/platform-browser-dynamic": "~4.0.2", "@angular/platform-browser-dynamic": "4.0.2",
"@angular/router": "~4.0.2", "@angular/router": "4.0.2",
"core-js": "~2.4.1", "core-js": "2.4.1",
"rxjs": "~5.3.0", "rxjs": "5.3.0",
"zone.js": "~0.8.5" "zone.js": "0.8.5"
}, },
"devDependencies": { "devDependencies": {
"@angular/cli": "1.0.0", "@angular/cli": "1.0.0",
"@angular/compiler-cli": "~4.0.2", "@angular/compiler-cli": "4.0.2",
"@types/electron": "~1.4.37", "@types/electron": "1.4.37",
"@types/jasmine": "2.5.41", "@types/jasmine": "2.5.41",
"@types/node": "^7.0.18", "@types/node": "7.0.18",
"autoprefixer": "~6.7.7", "autoprefixer": "6.7.7",
"codelyzer": "~2.1.1", "codelyzer": "2.1.1",
"copyfiles": "~1.2.0", "copyfiles": "1.2.0",
"cross-env": "^4.0.0", "cross-env": "4.0.0",
"css-loader": "~0.26.1", "css-loader": "0.26.1",
"cssnano": "~3.10.0", "cssnano": "3.10.0",
"electron": "~1.6.7", "electron": "1.6.7",
"electron-packager": "~8.6.0", "electron-packager": "8.6.0",
"electron-reload": "~1.1.0", "electron-reload": "^1.2.0",
"exports-loader": "~0.6.4", "exports-loader": "0.6.4",
"extract-zip": "=1.6.0", "extract-zip": "=1.6.0",
"file-loader": "~0.11.1", "file-loader": "0.11.1",
"html-loader": "~0.4.5", "html-loader": "0.4.5",
"istanbul-instrumenter-loader": "~2.0.0", "istanbul-instrumenter-loader": "2.0.0",
"jasmine-core": "~2.5.2", "jasmine-core": "2.5.2",
"jasmine-spec-reporter": "~3.2.0", "jasmine-spec-reporter": "3.2.0",
"json-loader": "~0.5.4", "json-loader": "0.5.4",
"karma": "~1.4.1", "karma": "1.4.1",
"karma-chrome-launcher": "~2.0.0", "karma-chrome-launcher": "2.0.0",
"karma-cli": "~1.0.1", "karma-cli": "1.0.1",
"karma-coverage-istanbul-reporter": "~0.2.0", "karma-coverage-istanbul-reporter": "0.2.0",
"karma-jasmine": "~1.1.0", "karma-jasmine": "1.1.0",
"karma-jasmine-html-reporter": "~0.2.2", "karma-jasmine-html-reporter": "0.2.2",
"karma-sourcemap-loader": "~0.3.7", "karma-sourcemap-loader": "0.3.7",
"less-loader": "~2.2.3", "less-loader": "2.2.3",
"minimist": "^1.2.0", "minimist": "1.2.0",
"mkdirp": "^0.5.1", "mkdirp": "0.5.1",
"postcss-loader": "~1.3.3", "postcss-loader": "1.3.3",
"postcss-url": "~6.0.4", "postcss-url": "6.0.4",
"protractor": "~5.1.1", "protractor": "5.1.1",
"raw-loader": "~0.5.1", "raw-loader": "0.5.1",
"sass-loader": "~6.0.3", "sass-loader": "6.0.3",
"script-loader": "~0.7.0", "script-loader": "0.7.0",
"source-map-loader": "~0.2.1", "source-map-loader": "0.2.1",
"style-loader": "~0.16.1", "style-loader": "0.16.1",
"stylus-loader": "~3.0.1", "stylus-loader": "3.0.1",
"ts-node": "~3.0.2", "ts-node": "3.0.2",
"tslint": "~5.1.0", "tslint": "5.1.0",
"typescript": "~2.2.2", "typescript": "2.2.2",
"url-loader": "~0.5.8", "url-loader": "0.5.8",
"webdriver-manager": "~12.0.4", "webdriver-manager": "12.0.4",
"webpack": "~2.4.1", "webpack": "2.4.1",
"webpack-dev-server": "^2.4.5" "webpack-dev-server": "2.4.5"
}, },
"license": "SEE LICENSE IN LICENSE.md" "license": "SEE LICENSE IN LICENSE.md"
} }

60
webpack.config.js
View File

@@ -12,7 +12,7 @@ const { CommonsChunkPlugin, UglifyJsPlugin } = require('webpack').optimize;
const { AotPlugin } = require('@ngtools/webpack'); const { AotPlugin } = require('@ngtools/webpack');
const nodeModules = path.join(process.cwd(), 'node_modules'); const nodeModules = path.join(process.cwd(), 'node_modules');
const entryPoints = ["inline","polyfills","sw-register","styles","vendor","main"]; const entryPoints = ["inline", "polyfills", "sw-register", "styles", "vendor", "main"];
const baseHref = ""; const baseHref = "";
const deployUrl = ""; const deployUrl = "";
@@ -62,13 +62,13 @@ function getPlugins() {
let leftIndex = entryPoints.indexOf(left.names[0]); let leftIndex = entryPoints.indexOf(left.names[0]);
let rightindex = entryPoints.indexOf(right.names[0]); let rightindex = entryPoints.indexOf(right.names[0]);
if (leftIndex > rightindex) { if (leftIndex > rightindex) {
return 1; return 1;
} }
else if (leftIndex < rightindex) { else if (leftIndex < rightindex) {
return -1; return -1;
} }
else { else {
return 0; return 0;
} }
} }
})); }));
@@ -98,26 +98,28 @@ function getPlugins() {
"options": { "options": {
"postcss": [ "postcss": [
autoprefixer(), autoprefixer(),
postcssUrl({"url": (obj) => { postcssUrl({
// Only convert root relative URLs, which CSS-Loader won't process into require(). "url": (obj) => {
if (!obj.url.startsWith('/') || obj.url.startsWith('//')) { // Only convert root relative URLs, which CSS-Loader won't process into require().
if (!obj.url.startsWith('/') || obj.url.startsWith('//')) {
return obj.url; return obj.url;
} }
if (deployUrl.match(/:\/\//)) { if (deployUrl.match(/:\/\//)) {
// If deployUrl contains a scheme, ignore baseHref use deployUrl as is. // If deployUrl contains a scheme, ignore baseHref use deployUrl as is.
return `${deployUrl.replace(/\/$/, '')}${obj.url}`; return `${deployUrl.replace(/\/$/, '')}${obj.url}`;
} }
else if (baseHref.match(/:\/\//)) { else if (baseHref.match(/:\/\//)) {
// If baseHref contains a scheme, include it as is. // If baseHref contains a scheme, include it as is.
return baseHref.replace(/\/$/, '') + return baseHref.replace(/\/$/, '') +
`/${deployUrl}/${obj.url}`.replace(/\/\/+/g, '/'); `/${deployUrl}/${obj.url}`.replace(/\/\/+/g, '/');
} }
else { else {
// Join together base-href, deploy-url and the original URL. // Join together base-href, deploy-url and the original URL.
// Also dedupe multiple slashes into single ones. // Also dedupe multiple slashes into single ones.
return `/${baseHref}/${deployUrl}/${obj.url}`.replace(/\/\/+/g, '/'); return `/${baseHref}/${deployUrl}/${obj.url}`.replace(/\/\/+/g, '/');
}
} }
}}) })
], ],
"sassLoader": { "sassLoader": {
"sourceMap": false, "sourceMap": false,
@@ -130,7 +132,7 @@ function getPlugins() {
} }
})); }));
if(isProd) { if (isProd) {
plugins.push(new HashedModuleIdsPlugin({ plugins.push(new HashedModuleIdsPlugin({
"hashFunction": "md5", "hashFunction": "md5",
"hashDigest": "base64", "hashDigest": "base64",
@@ -158,7 +160,7 @@ function getPlugins() {
})); }));
} else { } else {
plugins.push( new AotPlugin({ plugins.push(new AotPlugin({
"mainPath": "main.ts", "mainPath": "main.ts",
"hostReplacementPaths": { "hostReplacementPaths": {
"environments/index.ts": "environments/index.ts" "environments/index.ts": "environments/index.ts"
@@ -200,8 +202,8 @@ module.exports = {
"extensions": [ "extensions": [
".ts", ".ts",
".js", ".js",
".scss", ".scss",
".json" ".json"
], ],
"aliasFields": [], "aliasFields": [],
"alias": { // WORKAROUND See. angular-cli/issues/5433 "alias": { // WORKAROUND See. angular-cli/issues/5433
@@ -368,14 +370,16 @@ module.exports = {
}, },
"plugins": getPlugins(), "plugins": getPlugins(),
"node": { "node": {
"fs": "empty", fs: "empty",
"global": true, global: true,
"crypto": "empty", crypto: "empty",
"tls": "empty", tls: "empty",
"net": "empty", net: "empty",
"process": true, process: true,
"module": false, module: false,
"clearImmediate": false, clearImmediate: false,
"setImmediate": false setImmediate: false,
__dirname: false,
__filename: false
} }
}; };