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

WIP - build(docs-infra): update docs examples to latest v9 and Ivy #34374

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a764117
build(docs-infra): switch docs examples to Ivy
gkalpak Mar 23, 2020
ba44708
test(docs-infra): fix unit tests and run them for specific docs examp…
gkalpak Mar 23, 2020
f927799
build(docs-infra): update docs examples `package.json` templates wrt …
gkalpak Mar 23, 2020
782cbc7
build(docs-infra): renamed `e2e` property of `example-config.json` to…
gkalpak Mar 23, 2020
f17952a
build(docs-infra): add missing `build` npm script for `universal` doc…
gkalpak Mar 19, 2020
14a5a3a
style(docs-infra): clean up Tour-of-Heroes examples
gkalpak Mar 19, 2020
a79e13d
refactor(docs-infra): update `main.ts` in Tour-of-Heroes examples to …
gkalpak Mar 19, 2020
dab5da9
fix(docs-infra): align `universal` example with `toh-pt6`
gkalpak Mar 19, 2020
c114767
refactor(docs-infra): update `universal` example to match latest CLI
gkalpak Mar 19, 2020
c945ffb
build(docs-infra): update `@types/express-serve-static-core` to avoid…
gkalpak Mar 19, 2020
a0d451e
test(docs-infra): add tests for `universal` docs example
gkalpak Mar 19, 2020
d3c1505
docs: minor fixes/improvements in the `universal` guide
gkalpak Mar 19, 2020
0d84b07
docs: remove unneeded code from `universal` example/guide
gkalpak Mar 19, 2020
3072e2e
fixup! docs: remove unneeded code from `universal` example/guide
gkalpak Mar 23, 2020
de09677
WIP - add support for per example-type ViewEngine boilerplate
gkalpak Mar 19, 2020
fe26d8d
refactor(docs-infra): update `i18n` example to match latest CLI
gkalpak Mar 19, 2020
b1ad29c
TEMP
gkalpak Mar 19, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
Expand Up @@ -454,7 +454,7 @@ jobs:

test_docs_examples:
parameters:
ivy:
viewengine:
type: boolean
default: false
executor:
Expand All @@ -470,7 +470,7 @@ jobs:
# Run examples tests. The "CIRCLE_NODE_INDEX" will be set if "parallelism" is enabled.
# Since the parallelism is set to "5", there will be five parallel CircleCI containers.
# with either "0", "1", etc as node index. This can be passed to the "--shard" argument.
- run: yarn --cwd aio example-e2e --setup --local <<# parameters.ivy >>--ivy<</ parameters.ivy >> --cliSpecsConcurrency=5 --shard=${CIRCLE_NODE_INDEX}/${CIRCLE_NODE_TOTAL} --retry 2
- run: yarn --cwd aio example-e2e --setup --local <<# parameters.viewengine >>--viewengine<</ parameters.viewengine >> --cliSpecsConcurrency=5 --shard=${CIRCLE_NODE_INDEX}/${CIRCLE_NODE_TOTAL} --retry 2

# This job should only be run on PR builds, where `CI_PULL_REQUEST` is not `false`.
aio_preview:
Expand Down Expand Up @@ -822,8 +822,8 @@ workflows:
requires:
- build-npm-packages
- test_docs_examples:
name: test_docs_examples_ivy
ivy: true
name: test_docs_examples_viewengine
viewengine: true
requires:
- build-npm-packages
- aio_preview:
Expand All @@ -850,7 +850,7 @@ workflows:
- test_aio_local
- test_aio_local_viewengine
- test_docs_examples
- test_docs_examples_ivy
- test_docs_examples_viewengine
# Get the artifacts to publish from the build-packages-dist job
# since the publishing script expects the legacy outputs layout.
- build-npm-packages
Expand Down
8 changes: 4 additions & 4 deletions aio/README.md
Expand Up @@ -18,8 +18,8 @@ Here are the most important tasks you might need to use:

* `yarn build` - create a production build of the application (after installing dependencies, boilerplate, etc).
* `yarn build-local` - same as `build`, but use `setup-local` instead of `setup`.
* `yarn build-local-with-viewengine` - same as `build-local`, but in addition also turns on `ViewEngine` mode in aio.
(Note: Docs examples run in `ViewEngine` mode by default. To turn on `ivy` mode in examples, see `yarn boilerplate:add` below.)
* `yarn build-local-with-viewengine` - same as `build-local`, but in addition also turns on `ViewEngine` (pre-Ivy) mode in aio.
(Note: To turn on `ViewEngine` mode in docs examples, see `yarn boilerplate:add:viewengine` below.)

* `yarn start` - run a development web server that watches the files; then builds the doc-viewer and reloads the page, as necessary.
* `yarn serve-and-sync` - run both the `docs-watch` and `start` in the same console.
Expand All @@ -34,7 +34,7 @@ Here are the most important tasks you might need to use:
* `yarn docs-test` - run the unit tests for the doc generation code.

* `yarn boilerplate:add` - generate all the boilerplate code for the examples, so that they can be run locally.
* `yarn boilerplate:add:ivy` - same as `boilerplate:add` but also turns on `ivy` mode.
* `yarn boilerplate:add:viewengine` - same as `boilerplate:add` but also turns on `ViewEngine` (pre-Ivy) mode.

* `yarn boilerplate:remove` - remove all the boilerplate code that was added via `yarn boilerplate:add`.
* `yarn generate-stackblitz` - generate the stackblitz files that are used by the `live-example` tags in the docs.
Expand All @@ -44,7 +44,7 @@ Here are the most important tasks you might need to use:
- `--setup`: generate boilerplate, force webdriver update & other setup, then run tests.
- `--local`: run e2e tests with the local version of Angular contained in the "dist" folder.
_Requires `--setup` in order to take effect._
- `--ivy`: run e2e tests in `ivy` mode.
- `--viewengine`: run e2e tests in `ViewEngine` (pre-Ivy) mode.
- `--filter=foo`: limit e2e tests to those containing the word "foo".

> **Note for Windows users**
Expand Down
5 changes: 1 addition & 4 deletions aio/content/examples/.gitignore
Expand Up @@ -82,9 +82,6 @@ upgrade-phonecat-2-hybrid/aot/**/*
# styleguide
!styleguide/src/systemjs.custom.js

# universal
!universal/webpack.server.config.js

# stackblitz
*stackblitz.no-link.html

Expand All @@ -97,4 +94,4 @@ upgrade-phonecat-3-final/rollup-config.js
!upgrade-phonecat-*/**/karma-test-shim.js

# schematics
!schematics-for-libraries/projects/my-lib/package.json
!schematics-for-libraries/projects/my-lib/package.json

This file was deleted.

27 changes: 0 additions & 27 deletions aio/content/examples/binding-syntax/src/app/app.component.spec.ts

This file was deleted.

32 changes: 0 additions & 32 deletions aio/content/examples/bootstrapping/src/app/app.component.spec.ts

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -1,5 +1,5 @@
{
"e2e": [
"tests": [
{
"cmd": "yarn",
"args": [
Expand Down
13 changes: 0 additions & 13 deletions aio/content/examples/dependency-injection/example-config.json
@@ -1,13 +0,0 @@
{
"e2e": [
{
"cmd": "yarn",
"args": [
"e2e",
"--protractor-config=e2e/protractor-puppeteer.conf.js",
"--no-webdriver-update",
"--port={PORT}"
]
}
]
}
27 changes: 0 additions & 27 deletions aio/content/examples/event-binding/src/app/app.component.spec.ts

This file was deleted.

This file was deleted.

32 changes: 0 additions & 32 deletions aio/content/examples/feature-modules/src/app/app.component.spec.ts

This file was deleted.

This file was deleted.

6 changes: 6 additions & 0 deletions aio/content/examples/forms-overview/example-config.json
@@ -0,0 +1,6 @@
{
"tests": [
{"cmd": "yarn", "args": ["test", "--browsers=ChromeHeadless", "--no-watch"]},
{"cmd": "yarn", "args": ["e2e", "--prod", "--protractor-config=e2e/protractor-puppeteer.conf.js", "--no-webdriver-update", "--port={PORT}"]}
]
}

This file was deleted.

This file was deleted.