uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: Configure AOT (#394)

Browse Source 
* build: Configure AOT

* build: Fix appveyor ENV settings
This commit is contained in:
Róbert Kiss
2017-08-26 00:56:28 +02:00
committed by László Monda
parent 015d110c2b
commit be3e116130
9 changed files with 1968 additions and 8049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8570
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

47
package.json
View File

@@ -14,26 +14,16 @@
"npm": ">=5.1.0 <6.0.0"
},
"devDependencies": {
"@angular/cli": "^1.3.0-rc.5",
"@angular/compiler-cli": "^4.3.3",
"@angular/language-service": "^4.3.3",
"@types/electron-devtools-installer": "^2.0.2",
"@types/electron-settings": "^3.0.0",
"@types/file-saver": "~0.0.1",
"@types/jasmine": "~2.5.53",
"@types/jasminewd2": "~2.0.2",
"@types/jquery": "^3.2.9",
"@types/node": "~6.0.60",
"@types/node": "~8.0.25",
"@types/node-hid": "^0.5.2",
"@types/usb": "^1.1.3",
"angular-notifier": "^2.0.0",
"autoprefixer": "^6.5.3",
"buffer": "^5.0.6",
"codelyzer": "~3.0.1",
"copy-webpack-plugin": "^4.0.1",
"core-js": "^2.4.1",
"css-loader": "^0.28.1",
"cssnano": "^3.10.0",
"cross-env": "^5.0.5",
"devtron": "^1.4.0",
"electron": "1.7.5",
"electron-builder": "19.6.1",
@@ -44,46 +34,17 @@
"electron-settings": "^3.1.1",
"exports-loader": "^0.6.3",
"file-loader": "^0.10.0",
"istanbul-instrumenter-loader": "^2.0.0",
"jasmine-core": "~2.6.2",
"jasmine-spec-reporter": "~4.1.0",
"json-loader": "^0.5.4",
"jsonfile": "3.0.1",
"karma": "~1.7.0",
"karma-chrome-launcher": "~2.1.1",
"karma-cli": "~1.0.1",
"karma-coverage-istanbul-reporter": "^1.2.1",
"karma-jasmine": "~1.1.0",
"karma-jasmine-html-reporter": "^0.2.2",
"lerna": "^2.0.0",
"less-loader": "^4.0.2",
"mkdirp": "^0.5.1",
"npm-run-all": "^4.0.2",
"postcss-loader": "^1.3.3",
"postcss-url": "^5.1.2",
"protractor": "~5.1.2",
"raw-loader": "^0.5.1",
"reselect": "^3.0.1",
"rimraf": "^2.6.1",
"rxjs": "^5.4.2",
"sass-loader": "^6.0.3",
"script-loader": "^0.7.0",
"source-map-loader": "^0.2.0",
"standard-version": "^4.2.0",
"style-loader": "^0.13.1",
"stylelint": "^7.13.0",
"stylus-loader": "^3.0.1",
"svg-sprite": "^1.3.7",
"ts-loader": "^2.3.1",
"ts-node": "~3.0.4",
"tslint": "~5.5.0",
"typescript": "^2.4.2",
"url-loader": "^0.5.7",
"webpack": "^2.4.1",
"webpack-dev-server": "~2.4.5",
"webpack-svgstore-plugin": "^4.0.1",
"xml-loader": "^1.2.1",
"zone.js": "^0.8.14"
"webpack": "^2.4.1"
},
"scripts": {
"postinstall": "lerna bootstrap",
@@ -97,7 +58,7 @@
"lint:style": "stylelint \"packages/uhk-agent/src/**/*.scss\" \"packages/uhk-web/src/**/*.scss\" --syntax scss",
"build": "run-s build:web build:electron",
"build:web": "lerna exec --scope uhk-web npm run build",
"build:electron": "run-s -sn build:electron:renderer build:electron:main",
"build:electron": "cross-env AOT_BUILD=true run-s -sn build:electron:renderer build:electron:main",
"build:electron:main": "lerna exec --scope uhk-agent npm run build",
"build:electron:renderer": "lerna exec --scope uhk-web npm run build:renderer",
"build:test": "lerna exec --scope test-serializer npm run build",

10
packages/uhk-agent/webpack.config.js
View File

@@ -1,5 +1,8 @@
const path = require('path');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const ContextReplacementPlugin = require("webpack/lib/ContextReplacementPlugin")
const webpackHelper = require('../../scripts/webpack-helper');
const rootDir = __dirname;
@@ -35,6 +38,11 @@ module.exports = {
to: 'package.json'
}
]
),
new ContextReplacementPlugin(
// The (\\|\/) piece accounts for path separators in *nix and Windows
/angular(\\|\/)core(\\|\/)@angular/,
webpackHelper.root(__dirname, './src') // location of your src
)
],
node: {
@@ -42,4 +50,4 @@ module.exports = {
__filename: false
}
};
}

1369
packages/uhk-web/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

28
packages/uhk-web/package.json
View File

@@ -5,7 +5,7 @@
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"build": "ng build --prod --aot",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
@@ -14,18 +14,18 @@
},
"private": true,
"devDependencies": {
"@angular/animations": "^4.3.3",
"@angular/cli": "^1.3.0-rc.5",
"@angular/common": "^4.3.3",
"@angular/compiler": "^4.3.3",
"@angular/compiler-cli": "^4.3.3",
"@angular/core": "^4.3.3",
"@angular/forms": "^4.3.3",
"@angular/http": "^4.3.3",
"@angular/language-service": "^4.3.3",
"@angular/platform-browser": "^4.3.3",
"@angular/platform-browser-dynamic": "^4.3.3",
"@angular/router": "^4.3.3",
"@angular/animations": "^4.3.6",
"@angular/cli": "^1.3.2",
"@angular/common": "^4.3.6",
"@angular/compiler": "^4.3.6",
"@angular/compiler-cli": "^4.3.6",
"@angular/core": "^4.3.6",
"@angular/forms": "^4.3.6",
"@angular/http": "^4.3.6",
"@angular/language-service": "^4.3.6",
"@angular/platform-browser": "^4.3.6",
"@angular/platform-browser-dynamic": "^4.3.6",
"@angular/router": "^4.3.6",
"@ngrx/core": "1.2.0",
"@ngrx/effects": "^2.0.4",
"@ngrx/router-store": "^1.2.6",
@@ -38,7 +38,6 @@
"@types/jasmine": "~2.5.53",
"@types/jasminewd2": "~2.0.2",
"@types/jquery": "^3.2.9",
"@types/node": "~8.0.19",
"@types/node-hid": "^0.5.2",
"@types/usb": "^1.1.3",
"angular-notifier": "^2.0.0",
@@ -48,7 +47,6 @@
"circular-dependency-plugin": "^3.0.0",
"codelyzer": "~3.0.1",
"copy-webpack-plugin": "^4.0.1",
"core-js": "^2.4.1",
"css-loader": "^0.28.1",
"cssnano": "^3.10.0",
"dragula": "^3.7.2",

2
packages/uhk-web/src/app/components/keymap/edit/keymap-edit.component.ts
View File

@@ -36,7 +36,7 @@ export class KeymapEditComponent {
keyboardSplit: boolean;
deletable$: Observable<boolean>;
protected keymap$: Observable<Keymap>;
keymap$: Observable<Keymap>;
constructor(protected store: Store<AppState>,
route: ActivatedRoute) {

6
packages/uhk-web/tsconfig.json
View File

@@ -1,5 +1,4 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../uhk-agent/dist/out-tsc",
"sourceMap": true,
@@ -16,6 +15,9 @@
"es2015.iterable",
"dom",
"es2016"
]
],
"paths": {
"@angular/*": ["../node_modules/@angular/*"]
}
}
}

6
packages/uhk-web/webpack.config.js
View File

@@ -1,3 +1,5 @@
const AOT_BUILD = process.env.AOT_BUILD;
const fs = require('fs');
const path = require('path');
const ProgressPlugin = require('webpack/lib/ProgressPlugin');
@@ -15,7 +17,7 @@ const nodeModules = path.join(process.cwd(), 'node_modules');
const realNodeModules = fs.realpathSync(nodeModules);
const genDirNodeModules = path.join(process.cwd(), 'src', '$$_gendir', 'node_modules');
const entryPoints = ["inline","polyfills","sw-register","scripts","styles","vendor","main"];
const minimizeCss = false;
const minimizeCss = AOT_BUILD;
const baseHref = "";
const deployUrl = "";
const postcssPlugins = function () {
@@ -442,7 +444,7 @@ module.exports = {
},
"exclude": [],
"tsConfigPath": "src/tsconfig.renderer.json",
"skipCodeGeneration": true
"skipCodeGeneration": !process.env.AOT_BUILD
})
],
"node": {

25
tsconfig.base.json
View File

@@ -1,25 +0,0 @@
{
"compilerOptions": {
"target": "es5",
"module": "commonjs",
"moduleResolution": "node",
"sourceMap": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"removeComments": false,
"noImplicitAny": true,
"suppressImplicitAnyIndexErrors": true,
"lib": [
"es6",
"es2016.array.include",
"dom",
"dom.iterable",
"scripthost"
]
},
"exclude": [
"./dist",
".electron/dist",
"node_modules"
]
}