Skip to content

Commit 0ce4a56

Browse files
author
JeB
authored
New architect api (#298)
1 parent dc511b1 commit 0ce4a56

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+9368
-8618
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
dist: xenial
22
language: node_js
33
node_js:
4-
- 8
54
- 10
65
addons:
76
apt:

.vscode/settings.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"jest.pathToConfig": "jest-ut.config.js"
3+
}

package.json

+9-6
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,27 @@
1111
"node": ">=8.9"
1212
},
1313
"scripts": {
14-
"postbuild": "npm test && npm run e2e",
14+
"postbuild": "yarn test && yarn run e2e",
1515
"build": "tsc && ts-node merge-schemes.ts",
1616
"test": "jest src",
1717
"e2e": "jest e2e"
1818
},
1919
"devDependencies": {
20-
"@angular-devkit/build-angular": "^0.13.8",
21-
"@angular/compiler": "^7.2.13",
22-
"@angular/compiler-cli": "^7.2.13",
23-
"@types/jest": "^24.0.11",
20+
"@angular-devkit/build-angular": "^0.800.0-beta.13",
21+
"@angular/compiler": "^8.0.0-beta.12",
22+
"@angular/compiler-cli": "^8.0.0-beta.12",
23+
"@types/jest": "^24.0.0",
2424
"@types/lodash": "^4.14.118",
2525
"@types/node": "~11.9.0",
26+
"@types/webpack": "^4.4.26",
27+
"@types/webpack-dev-server": "^3.1.5",
2628
"@types/webpack-merge": "^4.1.3",
2729
"jest": "^24.7.1",
2830
"lodash": "^4.17.11",
31+
"quicktype": "^15.0.174",
2932
"ts-jest": "^24.0.0",
3033
"ts-node": "~8.0.2",
31-
"typescript": "3.2.2"
34+
"typescript": "^3.4.3"
3235
},
3336
"dependencies": {}
3437
}

packages/custom-webpack/builders.json

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"$schema": "@angular-devkit/architect/src/builders-schema.json",
2+
"$schema": "../../node_modules/@angular-devkit/architect/src/builders-schema.json",
33
"builders": {
44
"browser": {
5-
"class": "./src/browser",
5+
"implementation": "./src/browser",
66
"schema": "./src/browser/schema.json",
77
"description": "Build browser app extended with custom webpack config"
88
},
@@ -11,10 +11,15 @@
1111
"schema": "./src/server/schema.json",
1212
"description": "Build server app extended with custom webpack config"
1313
},
14+
"dev-server": {
15+
"implementation": "./src/dev-server",
16+
"schema": "./src/dev-server/schema.json",
17+
"description": "Dev server extended with custom webpack config"
18+
},
1419
"karma": {
15-
"class": "./src/karma",
20+
"implementation": "./src/karma",
1621
"schema": "./src/karma/schema.json",
1722
"description": "Karma server extended with custom webpack config"
1823
}
1924
}
20-
}
25+
}

packages/custom-webpack/examples/append-webpack-plugins/angular.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
}
5555
},
5656
"serve": {
57-
"builder": "@angular-builders/dev-server:generic",
57+
"builder": "@angular-builders/custom-webpack:dev-server",
5858
"options": {
5959
"browserTarget": "append-webpack-plugins:build"
6060
},
@@ -71,7 +71,7 @@
7171
}
7272
},
7373
"test": {
74-
"builder": "@angular-devkit/build-angular:karma",
74+
"builder": "@angular-builders/custom-webpack:karma",
7575
"options": {
7676
"main": "src/test.ts",
7777
"polyfills": "src/polyfills.ts",

packages/custom-webpack/examples/append-webpack-plugins/package.json

+19-20
Original file line numberDiff line numberDiff line change
@@ -11,41 +11,40 @@
1111
},
1212
"private": true,
1313
"dependencies": {
14-
"@angular/animations": "^7.2.13",
15-
"@angular/common": "^7.2.13",
16-
"@angular/compiler": "^7.2.13",
17-
"@angular/core": "^7.2.13",
18-
"@angular/forms": "^7.2.13",
19-
"@angular/http": "^7.2.13",
20-
"@angular/platform-browser": "^7.2.13",
21-
"@angular/platform-browser-dynamic": "^7.2.13",
22-
"@angular/router": "^7.2.13",
14+
"@angular/animations": "^8.0.0-beta.12",
15+
"@angular/common": "^8.0.0-beta.12",
16+
"@angular/compiler": "^8.0.0-beta.12",
17+
"@angular/core": "^8.0.0-beta.12",
18+
"@angular/forms": "^8.0.0-beta.12",
19+
"@angular/http": "^8.0.0-beta.9",
20+
"@angular/platform-browser": "^8.0.0-beta.12",
21+
"@angular/platform-browser-dynamic": "^8.0.0-beta.12",
22+
"@angular/router": "^8.0.0-beta.12",
2323
"core-js": "^2.5.7",
2424
"rxjs": "^6.4.0",
2525
"tslib": "^1.9.0",
26-
"zone.js": "^0.8.29"
26+
"zone.js": "^0.9.0"
2727
},
2828
"devDependencies": {
29-
"@angular-builders/custom-webpack": "^7.4.3",
30-
"@angular-builders/dev-server": "^7.3.1",
31-
"@angular-devkit/build-angular": "~0.13.2",
32-
"@angular/cli": "~7.3.8",
33-
"@angular/compiler-cli": "^7.2.13",
34-
"@angular/language-service": "^7.2.13",
29+
"@angular-builders/custom-webpack": "^8.0.0-beta.1",
30+
"@angular-devkit/build-angular": "^0.800.0-beta.13",
31+
"@angular/cli": "~8.0.0-beta.13",
32+
"@angular/compiler-cli": "^8.0.0-beta.12",
33+
"@angular/language-service": "^8.0.0-beta.12",
3534
"@types/jasmine": "~3.3.1",
3635
"@types/jasminewd2": "~2.0.6",
3736
"@types/node": "~11.9.0",
38-
"codelyzer": "~4.5.0",
37+
"codelyzer": "^5.0.0",
3938
"jasmine-core": "~3.3.0",
4039
"jasmine-spec-reporter": "~4.2.1",
4140
"karma": "~4.0.0",
4241
"karma-chrome-launcher": "~2.2.0",
4342
"karma-coverage-istanbul-reporter": "~2.0.4",
4443
"karma-jasmine": "~2.0.1",
4544
"karma-jasmine-html-reporter": "^1.4.0",
46-
"protractor": "~5.4.1",
45+
"protractor": "^5.4.2",
4746
"ts-node": "~8.0.2",
4847
"tslint": "~5.11.0",
49-
"typescript": "3.2.4"
48+
"typescript": "3.4.3"
5049
}
51-
}
50+
}

packages/custom-webpack/examples/append-webpack-plugins/src/app/app.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe('AppComponent', () => {
1616
it(`should have as title 'app'`, async(() => {
1717
const fixture = TestBed.createComponent(AppComponent);
1818
const app = fixture.debugElement.componentInstance;
19-
expect(app.title).toEqual('app');
19+
expect(app.title).toEqual('append-webpack-plugins');
2020
}));
2121
it('should render title in a h1 tag', async(() => {
2222
const fixture = TestBed.createComponent(AppComponent);

packages/custom-webpack/examples/append-webpack-plugins/src/app/app.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ import { Component } from '@angular/core';
66
styleUrls: ['./app.component.css']
77
})
88
export class AppComponent {
9-
title = 'app';
9+
title = 'append-webpack-plugins';
1010
}

packages/custom-webpack/examples/append-webpack-plugins/src/karma.conf.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ module.exports = function (config) {
2626
logLevel: config.LOG_INFO,
2727
autoWatch: true,
2828
browsers: ['Chrome'],
29-
singleRun: false
29+
customLaunchers: {
30+
ChromeHeadlessCI: {
31+
base: 'ChromeHeadless',
32+
flags: ['--no-sandbox']
33+
}
34+
},
35+
singleRun: true
3036
});
3137
};

packages/custom-webpack/examples/append-webpack-plugins/tslint.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,12 @@
117117
"check-type"
118118
],
119119
"no-output-on-prefix": true,
120-
"use-input-property-decorator": true,
121-
"use-output-property-decorator": true,
122-
"use-host-property-decorator": true,
120+
"no-inputs-metadata-property": true,
121+
"no-outputs-metadata-property": true,
122+
"no-host-metadata-property": true,
123123
"no-input-rename": true,
124124
"no-output-rename": true,
125-
"use-life-cycle-interface": true,
125+
"use-lifecycle-interface": true,
126126
"use-pipe-transform-interface": true,
127127
"component-class-suffix": true,
128128
"directive-class-suffix": true

0 commit comments

Comments
 (0)