Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ testem.js
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try

/test-apps
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ jobs:
script: yarn test:browser
- env: NAME=node tests
script: yarn test:node
- env: NAME=test-apps tests
script: yarn test:test-apps

- stage: floating dependencies
env: NAME=browser tests
Expand All @@ -45,6 +47,9 @@ jobs:
- env: NAME=node tests
install: yarn install --no-lockfile --non-interactive
script: yarn test:node
- env: NAME=test-apps tests
install: yarn install --no-lockfile --non-interactive
script: yarn test:test-apps

- stage: versioned tests
env: EMBER_TRY_SCENARIO=ember-lts-2.8
Expand Down
4 changes: 3 additions & 1 deletion lib/broccoli/search-indexer.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ module.exports = class SearchIndexCompiler extends Writer {

*buildApiItemDocuments(filePath) {
let projectVersionDoc = fs.readJsonSync(filePath, 'utf-8');
for (let item of projectVersionDoc.included) {
let apiItems = projectVersionDoc.included || [];

for (let item of apiItems) {
if (item.type === 'module') {
yield this.buildModuleDocument(item);
} else if (item.type === 'component') {
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@
"lint:js": "eslint .",
"start": "ember serve",
"test": "ember try:each",
"test:browser": "ember test --test-port=0",
"test:node": "qunit tests-node",
"test:browser": "ember test"
"test:test-apps": "cd test-apps/new-addon && yarn test",
"prepare": "./scripts/link-them.sh"
},
"dependencies": {
"@glimmer/syntax": "^0.30.5",
Expand Down
22 changes: 22 additions & 0 deletions scripts/link-them.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/bash

# Copied from https://github.com/ef4/ember-auto-import/blob/master/scripts/link-them.sh

set -e

# All packages get a node_modules directory and a .bin link
for package in "new-addon"; do
mkdir -p ./test-apps/$package/node_modules
pushd ./test-apps/$package/node_modules > /dev/null
rm -rf .bin
ln -s ../../../node_modules/.bin .bin
popd > /dev/null
done

# These packages get to depend on ember-cli-addon-docs
for package in "new-addon"; do
pushd ./test-apps/$package/node_modules > /dev/null
rm -rf ./ember-cli-addon-docs
ln -s ../../.. ./ember-cli-addon-docs
popd > /dev/null
done
Loading