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.

Sign up for GitHub

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

Jump to bottom

revert: docs-infra: several fixes related to running docs examples with ivy #33216

Closed
wants to merge 4 commits into from
Closed

revert: docs-infra: several fixes related to running docs examples with ivy #33216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4bce469
revert: build: update webdriver-manager to support latest Chrome
matsko Oct 17, 2019
9832c3d
revert: build(docs-infra): update protractor/webdriver-manager to sup…
matsko Oct 17, 2019
0a38e34
revert: build(docs-infra): ensure `setup-local` and similar scripts b…
matsko Oct 17, 2019
24b1ddf
revert: fix(docs-infra): consider all formats when compiling docs exa…
matsko Oct 17, 2019
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
9 changes: 3 additions & 6 deletions aio/package.json
View file
Open in desktop
Expand Up @@ -17,11 +17,11 @@
"build": "yarn ~~build",
"prebuild-local": "yarn setup-local",
"build-local": "yarn ~~build",
"prebuild-local-ci": "yarn setup-local-ci",
"prebuild-local-ci": "yarn setup-local --no-build-packages",
"build-local-ci": "yarn ~~build --progress=false",
"prebuild-local-with-viewengine": "node scripts/switch-to-viewengine && yarn setup-local",
"build-local-with-viewengine": "yarn ~~build",
"prebuild-local-with-viewengine-ci": "node scripts/switch-to-viewengine && yarn setup-local-ci",
"prebuild-local-with-viewengine-ci": "node scripts/switch-to-viewengine && yarn setup-local --no-build-packages",
"build-local-with-viewengine-ci": "yarn ~~build --progress=false",
"extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js 38635d2d9",
"lint": "yarn check-env && yarn docs-lint && ng lint && yarn example-lint && yarn tools-lint",
Expand All @@ -32,11 +32,8 @@
"setup": "yarn example-use-npm && yarn aio-use-npm",
"postsetup": "yarn boilerplate:add && yarn extract-cli-command-docs && yarn docs",
"presetup-local": "yarn presetup",
"setup-local": "yarn aio-use-local && yarn example-use-local",
"setup-local": "yarn example-use-local && yarn aio-use-local",
"postsetup-local": "yarn postsetup",
"presetup-local-ci": "yarn presetup-local",
"setup-local-ci": "yarn aio-use-local --no-build-packages && yarn example-use-local",
"postsetup-local-ci": "yarn postsetup-local",
"set-opensearch-url": "node --eval \"const sh = require('shelljs'); sh.set('-e'); sh.sed('-i', /PLACEHOLDER_URL/g, process.argv[1], 'dist/assets/opensearch.xml');\"",
"presmoke-tests": "yarn update-webdriver",
"smoke-tests": "protractor tests/deployment/e2e/protractor.conf.js --suite smoke --baseUrl",
Expand Down
4 changes: 3 additions & 1 deletion aio/tools/examples/example-boilerplate.js
View file
Open in desktop
Expand Up @@ -80,7 +80,9 @@ class ExampleBoilerPlate {
}

if (ivy) {
shelljs.exec(`yarn --cwd ${SHARED_PATH} ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points`);
// We only need the "es2015" bundles as the CLI webpack build does not need
// any other formats for building and serving.
shelljs.exec(`yarn --cwd ${SHARED_PATH} ngcc --properties es2015`);
}

exampleFolders.forEach(exampleFolder => {
Expand Down
4 changes: 2 additions & 2 deletions aio/tools/examples/shared/package.json
View file
Open in desktop
Expand Up @@ -39,8 +39,8 @@
"express": "^4.14.1",
"rxjs": "^6.5.1",
"systemjs": "0.19.39",
"tslib": "^1.9.0",
"web-animations-js": "^2.3.1",
"tslib": "^1.9.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
Expand Down Expand Up @@ -72,7 +72,7 @@
"karma-jasmine-html-reporter": "^1.4.2",
"lite-server": "^2.2.2",
"lodash": "^4.16.2",
"protractor": "^5.4.2",
"protractor": "~5.4.0",
"rimraf": "^2.5.4",
"rollup": "^1.1.0",
"rollup-plugin-commonjs": "^9.2.1",
Expand Down
18 changes: 11 additions & 7 deletions aio/tools/examples/shared/yarn.lock
View file
Open in desktop
Expand Up @@ -465,6 +465,10 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.3.tgz#7c6b0f8eaf16ae530795de2ad1b85d34bf2f5c58"
integrity sha512-wp6IOGu1lxsfnrD+5mX6qwSwWuqsdkKKxTN4aQc4wByHAKZJf9/D4KXPQ1POUjEbnCP5LMggB0OEFNY9OTsMqg==

"@types/node@^6.0.46":
version "6.0.90"
resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.90.tgz#0ed74833fa1b73dcdb9409dcb1c97ec0a8b13b02"

"@types/node@~8.9.4":
version "8.9.5"
resolved "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz#162b864bc70be077e6db212b322754917929e976"
Expand Down Expand Up @@ -5951,11 +5955,11 @@ protoduck@^5.0.1:
dependencies:
genfun "^5.0.0"

protractor@^5.4.2:
version "5.4.2"
resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.2.tgz#329efe37f48b2141ab9467799be2d4d12eb48c13"
integrity sha512-zlIj64Cr6IOWP7RwxVeD8O4UskLYPoyIcg0HboWJL9T79F1F0VWtKkGTr/9GN6BKL+/Q/GmM7C9kFVCfDbP5sA==
protractor@~5.4.0:
version "5.4.1"
resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.1.tgz#011a99e38df7aa45d22455b889ffbb13a6ce0bd9"
dependencies:
"@types/node" "^6.0.46"
"@types/q" "^0.0.32"
"@types/selenium-webdriver" "^3.0.0"
blocking-proxy "^1.0.0"
Expand Down Expand Up @@ -8021,9 +8025,9 @@ webdriver-js-extender@2.1.0:
selenium-webdriver "^3.0.1"

webdriver-manager@^12.0.6:
version "12.1.7"
resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.7.tgz#ed4eaee8f906b33c146e869b55e850553a1b1162"
integrity sha512-XINj6b8CYuUYC93SG3xPkxlyUc3IJbD6Vvo75CVGuG9uzsefDzWQrhz0Lq8vbPxtb4d63CZdYophF8k8Or/YiA==
version "12.1.5"
resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.5.tgz#28817b14d4b16b94ede10d5a7ee187aeb7679edf"
integrity sha512-f1apDjMpZ8SHlXtXGzqBxOjV+WQcDRz5PN7pWScgjXS7vhUIFcM3V89Shetf4A04n8DDR2MxiVQq6JproFcRZw==
dependencies:
adm-zip "^0.4.9"
chalk "^1.1.1"
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Expand Up @@ -11946,9 +11946,9 @@ webdriver-js-extender@2.1.0:
selenium-webdriver "^3.0.1"

webdriver-manager@^12.0.6:
version "12.1.7"
resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.7.tgz#ed4eaee8f906b33c146e869b55e850553a1b1162"
integrity sha512-XINj6b8CYuUYC93SG3xPkxlyUc3IJbD6Vvo75CVGuG9uzsefDzWQrhz0Lq8vbPxtb4d63CZdYophF8k8Or/YiA==
version "12.1.5"
resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.5.tgz#28817b14d4b16b94ede10d5a7ee187aeb7679edf"
integrity sha512-f1apDjMpZ8SHlXtXGzqBxOjV+WQcDRz5PN7pWScgjXS7vhUIFcM3V89Shetf4A04n8DDR2MxiVQq6JproFcRZw==
dependencies:
adm-zip "^0.4.9"
chalk "^1.1.1"
Expand Down