Skip to content

Commit 854d8cb

Browse files
committed
Merge branch 'ng-deploy'
Former-commit-id: 8aa1a01
2 parents 61e7cb8 + 72570e2 commit 854d8cb

Some content is hidden

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

69 files changed

+7335
-11998
lines changed

Diff for: .angulardoc.json

-4
This file was deleted.

Diff for: .circleci/config.yml

+17-15
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,31 @@ jobs:
44
build:
55

66
environment:
7-
GITHUB_ORG: https://[email protected]/angular-schule
7+
NG_CLI_ANALYTICS: ci
8+
GITHUB_ORG: https://github.com/angular-schule
89
GITHUB_NAME: The Buildbot
910
GITHUB_EMAIL: [email protected]
1011
NAME: angular-cli-ghpages
1112

1213
docker:
13-
- image: circleci/node:10-browsers
14+
- image: circleci/node:12-browsers
15+
1416
steps:
1517
- checkout
1618

17-
1819
- restore_cache:
19-
key: dependency-cache-{{ checksum "package.json" }}-{{ checksum "angular-testdrive/package.json" }}
20-
- run: npm i --silent
21-
- run: cd angular-testdrive && npm i --silent
20+
key: dependency-cache-{{ checksum "src/package.json" }}
21+
- run: cd src && npm i --silent
2222
- save_cache:
23-
key: dependency-cache-{{ checksum "package.json" }}-{{ checksum "angular-testdrive/package.json" }}
23+
key: dependency-cache-{{ checksum "src/package.json" }}
2424
paths:
25-
- node_modules
26-
- angular-testdrive/node_modules
27-
28-
29-
- run: cd angular-testdrive && npm run build
30-
- run: chmod +x bin/angular-cli-ghpages
31-
- run: cd angular-testdrive && ../bin/angular-cli-ghpages --repo "$GITHUB_ORG/$NAME.git" --name "$GITHUB_NAME" --email "$GITHUB_EMAIL" --dir=dist/angular-testdrive --cname=angular-cli-ghpages.angular.schule
32-
25+
- src/node_modules
26+
- run: cd src && npm run build
27+
- run: cd src && npm run test
28+
- run: cd src/dist && sudo npm link
29+
30+
- run: sudo -E npm install -g @angular/cli@next
31+
- run: sudo -E ng new your-angular-project --defaults
32+
- run: cd your-angular-project && sudo -E npm link angular-cli-ghpages
33+
- run: cd your-angular-project && sudo -E ng add angular-cli-ghpages
34+
- run: cd your-angular-project && sudo -E ng deploy --repo="$GITHUB_ORG/$NAME.git" --name="$GITHUB_NAME" --email="$GITHUB_EMAIL" --cname=angular-cli-ghpages.angular.schule
File renamed without changes.

Diff for: .gitignore

+26-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1-
.DS_Store
21
node_modules
3-
npm-debug.log
2+
.tmp
3+
.sass-cache
4+
.DS_Store
5+
.bash_history
6+
*.swp
7+
*.swo
8+
*.d.ts
9+
10+
*.classpath
11+
*.project
12+
*.settings/
13+
*.classpath
14+
*.project
15+
*.settings/
16+
17+
.vim/bundle
18+
nvim/autoload
19+
nvim/plugged
20+
nvim/doc
21+
nvim/swaps
22+
nvim/colors
23+
dist
24+
25+
/src/mini-testdrive/404.html
26+
/src/mini-testdrive/CNAME
27+
.angulardoc.json

Diff for: .npmignore

-4
This file was deleted.

Diff for: .vscode/launch.json

+14-6
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,21 @@
77
{
88
"type": "node",
99
"request": "launch",
10-
"name": "Launch Program",
11-
"cwd": "${workspaceRoot}/angular-testdrive",
12-
"program": "${workspaceFolder}/bin/angular-cli-ghpages",
10+
"name": "Launch Standalone Program",
11+
"cwd": "${workspaceRoot}/src",
12+
"program": "${workspaceFolder}/src/dist/angular-cli-ghpages",
13+
"outFiles": [
14+
"${workspaceFolder}/src/dist/**/*.js"
15+
],
1316
"args": [
14-
"--dir=dist/angular-testdrive",
17+
//"--no-silent",
18+
//"--dry-run",
19+
"--dir=mini-testdrive",
1520
"--cname=angular-cli-ghpages.angular.schule"
16-
]
21+
],
22+
"stopOnEntry": true,
23+
"sourceMaps": true,
24+
"preLaunchTask": "npm build",
1725
}
1826
]
19-
}
27+
}

Diff for: .vscode/tasks.json

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
// See https://go.microsoft.com/fwlink/?LinkId=733558
3+
// for the documentation about the tasks.json format
4+
"version": "2.0.0",
5+
"tasks": [
6+
{
7+
"type": "npm",
8+
"script": "build",
9+
"path": "src/",
10+
"label": "npm build"
11+
}
12+
]
13+
}

Diff for: LICENSE

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2017 Johannes Hoppe, https://angular.schule/
3+
Copyright (c) 2017-2019 Johannes Hoppe
4+
Copyright (c) 2019 Minko Gechev
45

56
Permission is hereby granted, free of charge, to any person obtaining a copy of
67
this software and associated documentation files (the "Software"), to deal in

0 commit comments

Comments
 (0)