Skip to content

Commit

Permalink
Upgrade to Ember CLI v3.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
josemarluedke committed Oct 1, 2018
1 parent 6b11d81 commit bb34340
Show file tree
Hide file tree
Showing 8 changed files with 2,059 additions and 280 deletions.
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
45 changes: 23 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,19 @@
"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 .",
"start": "ember serve",
"test": "ember try:each",
"test": "ember test",
"test:all": "ember try:each",
"test:browser": "ember test --test-port=0",
"test:node": "qunit tests-node",
"test:test-apps": "cd test-apps/new-addon && yarn test",
Expand All @@ -36,9 +37,9 @@
"broccoli-source": "^1.1.0",
"broccoli-stew": "^1.5.0",
"ember-cli-autoprefixer": "^0.8.1",
"ember-cli-babel": "^6.11.0",
"ember-cli-babel": "^6.16.0",
"ember-cli-clipboard": "^0.8.1",
"ember-cli-htmlbars": "^2.0.3",
"ember-cli-htmlbars": "^3.0.0",
"ember-cli-htmlbars-inline-precompile": "^1.0.2",
"ember-cli-sass": "7.1.7",
"ember-cli-string-helpers": "^1.7.0",
Expand Down Expand Up @@ -81,42 +82,42 @@
},
"devDependencies": {
"@ember-decorators/babel-transforms": "^2.0.0",
"@ember/optional-features": "^0.6.3",
"babel-eslint": "^8.2.2",
"broccoli-asset-rev": "^2.6.0",
"broccoli-asset-rev": "^2.7.0",
"common-tags": "^1.7.2",
"ember-classy-page-object": "^0.4.6",
"ember-cli": "~3.0.0",
"ember-cli": "~3.3.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-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-ci": "^1.0.1",
"ember-cli-eslint": "^4.2.3",
"ember-cli-inject-live-reload": "^1.7.0",
"ember-cli-inject-live-reload": "^1.8.2",
"ember-cli-mirage": "^0.4.5",
"ember-cli-qunit": "^4.3.0",
"ember-cli-shims": "^1.2.0",
"ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^2.0.0",
"ember-cli-qunit": "^4.3.2",
"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-resolver": "^5.0.1",
"ember-source": "~3.4.0",
"ember-source-channel-url": "^1.1.0",
"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",
"ember-try": "^1.0.0",
"eslint-plugin-ember": "^5.2.0",
"eslint-plugin-node": "^7.0.1",
"loader.js": "^4.7.0",
"qunit": "^2.5.0",
"qunit-dom": "^0.5.0"
"qunit-dom": "^0.7.1"
},
"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
}
Loading

0 comments on commit bb34340

Please sign in to comment.