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
21 changes: 18 additions & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
tmp/
dist/
node_modules/
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/coverage/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
7 changes: 5 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,20 @@ module.exports = {
// node files
{
files: [
'.template-lintrc.js',
'ember-cli-build.js',
'index.js',
'testem.js',
'ember-cli-build.js',
'blueprints/*/index.js',
'config/**/*.js',
'lib/**/*.js',
'tests/dummy/config/**/*.js',
'tests-node/**/*.js'
],
excludedFiles: [
'app/**',
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
],
parserOptions: {
Expand Down
23 changes: 11 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/dist/
/tmp/

# dependencies
/node_modules
/bower_components
/bower_components/
/node_modules/

# misc
/.sass-cache
/connect.lock
/coverage/*
/coverage/
/libpeerconnection.log
npm-debug.log*
yarn-error.log
testem.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try

.DS_Store
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
44 changes: 25 additions & 19 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
/bower_components
# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.eslintignore
/.eslintrc.js
/.gitignore
/.watchmanconfig
/.travis.yml
/bower.json
/config/ember-try.js
/dist
/tests
/tmp
**/.gitkeep
.bowerrc
.editorconfig
.ember-cli
.eslintrc.js
.gitignore
.watchmanconfig
.travis.yml
bower.json
ember-cli-build.js
testem.js
/ember-cli-build.js
/testem.js
/tests/
/yarn.lock
.gitkeep

# sandbox examples
/lib/sandbox

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try

/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
/test-apps
121 changes: 61 additions & 60 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
"ember-addon",
"ember-cli-deploy-plugin"
],
"repository": "https://github.com/ember-learn/ember-cli-addon-docs",
"license": "MIT",
"author": "",
"directories": {
"doc": "doc",
"test": "tests"
},
"repository": "https://github.com/ember-learn/ember-cli-addon-docs",
"scripts": {
"build": "ember build",
"lint:js": "eslint .",
Expand All @@ -24,99 +24,100 @@
"prepare": "./scripts/link-them.sh"
},
"dependencies": {
"@glimmer/syntax": "^0.30.5",
"@glimmer/syntax": "^0.36.4",
"broccoli-bridge": "^1.0.0",
"broccoli-caching-writer": "^3.0.3",
"broccoli-debug": "^0.6.4",
"broccoli-filter": "^1.2.4",
"broccoli-funnel": "^2.0.1",
"broccoli-merge-trees": "^2.0.0",
"broccoli-persistent-filter": "^1.4.3",
"broccoli-plugin": "^1.3.0",
"broccoli-merge-trees": "^3.0.1",
"broccoli-persistent-filter": "^2.0.0",
"broccoli-plugin": "^1.3.1",
"broccoli-source": "^1.1.0",
"broccoli-stew": "^1.5.0",
"broccoli-stew": "^2.0.0",
"ember-cli-autoprefixer": "^0.8.1",
"ember-cli-babel": "^6.11.0",
"ember-cli-clipboard": "^0.8.1",
"ember-cli-htmlbars": "^2.0.3",
"ember-cli-htmlbars-inline-precompile": "^1.0.2",
"ember-cli-babel": "^6.16.0",
"ember-cli-clipboard": "^0.9.0",
"ember-cli-htmlbars": "^3.0.0",
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
"ember-cli-sass": "7.1.7",
"ember-cli-string-helpers": "^1.7.0",
"ember-cli-string-helpers": "^1.9.0",
"ember-cli-tailwind": "^0.6.2",
"ember-code-snippet": "^2.2.0",
"ember-code-snippet": "^2.3.1",
"ember-component-css": "0.6.5",
"ember-concurrency": "^0.8.16",
"ember-concurrency": "^0.8.21",
"ember-data": "2.x - 3.x",
"ember-fetch": "^4.0.2",
"ember-fetch-adapter": "^0.4.2",
"ember-fetch": "^5.1.3",
"ember-fetch-adapter": "^0.4.3",
"ember-href-to": "^1.15.1",
"ember-keyboard": "^3.0.0",
"ember-keyboard": "^4.0.0",
"ember-modal-dialog": "2.4.3",
"ember-responsive": "^3.0.0-beta.1",
"ember-router-scroll": "^0.7.1",
"ember-svg-jar": "^1.2.1",
"ember-router-scroll": "^1.0.0",
"ember-svg-jar": "^1.2.2",
"ember-tether": "^1.0.0-beta.2",
"ember-truth-helpers": "^2.0.0",
"execa": "^0.9.0",
"fs-extra": "^5.0.0",
"git-repo-info": "^1.4.1",
"ember-truth-helpers": "^2.1.0",
"execa": "^1.0.0",
"fs-extra": "^7.0.0",
"git-repo-info": "^2.0.0",
"highlightjs": "^9.10.0",
"hosted-git-info": "^2.5.0",
"hosted-git-info": "^2.7.1",
"html-entities": "^1.2.1",
"inflected": "^2.0.3",
"jsdom": "^11.11.0",
"json-api-serializer": "^1.11.0",
"liquid-fire": "^0.29.1",
"lodash": "^4.17.5",
"lunr": "^2.1.5",
"jsdom": "^11.12.0",
"json-api-serializer": "^1.13.0",
"liquid-fire": "^0.29.5",
"lodash": "^4.17.11",
"lunr": "^2.3.3",
"marked": "^0.5.0",
"parse-git-config": "^1.1.1",
"parse-git-config": "^2.0.3",
"quick-temp": "^0.1.8",
"resolve": "^1.5.0",
"sass": "^1.13.2",
"semver": "^5.5.0",
"resolve": "^1.8.1",
"sass": "^1.14.1",
"semver": "^5.5.1",
"striptags": "^3.1.1",
"walk-sync": "^0.3.2",
"walk-sync": "^0.3.3",
"yuidocjs": "^0.10.2"
},
"devDependencies": {
"@ember-decorators/babel-transforms": "^2.0.0",
"babel-eslint": "^8.2.2",
"broccoli-asset-rev": "^2.6.0",
"common-tags": "^1.7.2",
"ember-classy-page-object": "^0.4.6",
"ember-cli": "~3.0.0",
"ember-cli-addon-docs-esdoc": "^0.2.0",
"ember-cli-addon-docs-yuidoc": "^0.2.0",
"ember-cli-dependency-checker": "^2.1.0",
"@ember-decorators/babel-transforms": "^2.1.2",
"@ember/optional-features": "^0.7.0",
"babel-eslint": "^10.0.1",
"broccoli-asset-rev": "^3.0.0",
"common-tags": "^1.8.0",
"ember-classy-page-object": "^0.5.0",
"ember-cli": "~3.3.0",
"ember-cli-addon-docs-esdoc": "^0.2.1",
"ember-cli-addon-docs-yuidoc": "^0.2.1",
"ember-cli-dependency-checker": "^3.0.0",
"ember-cli-deploy": "^1.0.2",
"ember-cli-deploy-build": "^1.1.1",
"ember-cli-deploy-git": "^1.3.2",
"ember-cli-deploy-git": "^1.3.3",
"ember-cli-deploy-git-ci": "^1.0.1",
"ember-cli-eslint": "^4.2.3",
"ember-cli-inject-live-reload": "^1.7.0",
"ember-cli-mirage": "^0.4.5",
"ember-cli-qunit": "^4.3.0",
"ember-cli-inject-live-reload": "^1.8.2",
"ember-cli-mirage": "^0.4.9",
"ember-cli-qunit": "^4.3.2",
"ember-cli-shims": "^1.2.0",
"ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^2.0.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-uglify": "^2.1.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.0.0",
"ember-load-initializers": "^1.1.0",
"ember-maybe-import-regenerator-for-testing": "^1.0.0",
"ember-resolver": "^4.5.0",
"ember-source": "~3.0.0",
"ember-source-channel-url": "^1.0.1",
"ember-test-selectors": "^0.3.8",
"ember-try": "^0.2.23",
"eslint-plugin-ember": "^5.0.3",
"eslint-plugin-node": "^5.2.1",
"loader.js": "^4.6.0",
"qunit": "^2.5.0",
"qunit-dom": "^0.5.0"
"ember-resolver": "^5.0.1",
"ember-source": "~3.4.0",
"ember-source-channel-url": "^1.1.0",
"ember-test-selectors": "^1.0.0",
"ember-try": "^1.0.0",
"eslint-plugin-ember": "^5.2.0",
"eslint-plugin-node": "^7.0.1",
"loader.js": "^4.7.0",
"qunit": "^2.6.2",
"qunit-dom": "^0.8.0"
},
"engines": {
"node": "6.* || >= 7.*"
"node": "6.* || 8.* || >= 10.*"
},
"ember-addon": {
"configPath": "tests/dummy/config",
Expand Down
11 changes: 6 additions & 5 deletions testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ module.exports = {
],
browser_args: {
Chrome: {
mode: 'ci',
args: [
ci: [
// --no-sandbox is needed when running Chrome inside a container
process.env.TRAVIS ? '--no-sandbox' : null,

'--disable-gpu',
process.env.CI ? '--no-sandbox' : null,
'--headless',
'--disable-gpu',
'--disable-dev-shm-usage',
'--disable-software-rasterizer',
'--mute-audio',
'--remote-debugging-port=0',
'--window-size=1440,900'
].filter(Boolean)
Expand Down
3 changes: 3 additions & 0 deletions tests/dummy/config/optional-features.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"jquery-integration": false
}
2 changes: 1 addition & 1 deletion tests/pages/api/class.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ const ClassPage = BaseAddonPage.extend({
})
});

export default ClassPage.create();
export default new ClassPage();
4 changes: 2 additions & 2 deletions tests/pages/api/module.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const ModulePage = BaseAddonPage.extend({
// eslint-disable-next-line ember/avoid-leaking-state-in-ember-objects
editLink: {
scope: '[data-test-edit-page-link]',
href: attribute('href', 'a'),
href: attribute('href', 'a')
},

// eslint-disable-next-line ember/avoid-leaking-state-in-ember-objects
Expand All @@ -42,4 +42,4 @@ const ModulePage = BaseAddonPage.extend({
}
});

export default ModulePage.create();
export default new ModulePage();
2 changes: 1 addition & 1 deletion tests/pages/app.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import BaseAddonPage from './base';

export default BaseAddonPage.create();
export default new BaseAddonPage();
Loading