From eaade437b7892444e5234697c26d7710e9e31c4f Mon Sep 17 00:00:00 2001 From: Sergey Astapov Date: Tue, 30 Oct 2018 13:31:32 -0400 Subject: [PATCH 1/6] Upgrade Ember CLI to 3.5 --- .bowerrc | 4 - .eslintignore | 19 ++++ .eslintrc.js | 51 +++++++++ .gitignore | 20 ++-- .jshintrc | 32 ------ .npmignore | 44 ++++---- .template-lintrc.js | 5 + .travis.yml | 59 ++++++---- LICENSE.md | 2 +- README.md | 4 +- bower.json | 7 -- config/ember-try.js | 129 +++++++++++++--------- config/environment.js | 1 - ember-cli-build.js | 8 +- index.js | 3 +- package.json | 63 ++++++----- testem.js | 32 ++++-- tests/.jshintrc | 52 --------- tests/dummy/app/app.js | 8 +- tests/dummy/app/index.html | 4 +- tests/dummy/app/router.js | 4 +- tests/dummy/config/environment.js | 9 +- tests/dummy/config/optional-features.json | 3 + tests/dummy/config/targets.js | 18 +++ tests/dummy/public/crossdomain.xml | 15 --- tests/helpers/.gitkeep | 0 tests/helpers/destroy-app.js | 5 - tests/helpers/module-for-acceptance.js | 23 ---- tests/helpers/resolver.js | 11 -- tests/helpers/start-app.js | 18 --- tests/test-helper.js | 12 +- 31 files changed, 330 insertions(+), 335 deletions(-) delete mode 100644 .bowerrc create mode 100644 .eslintignore create mode 100644 .eslintrc.js delete mode 100644 .jshintrc create mode 100644 .template-lintrc.js delete mode 100755 bower.json delete mode 100644 tests/.jshintrc create mode 100644 tests/dummy/config/optional-features.json create mode 100644 tests/dummy/config/targets.js delete mode 100644 tests/dummy/public/crossdomain.xml create mode 100644 tests/helpers/.gitkeep delete mode 100644 tests/helpers/destroy-app.js delete mode 100644 tests/helpers/module-for-acceptance.js delete mode 100644 tests/helpers/resolver.js delete mode 100644 tests/helpers/start-app.js diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index 959e169..0000000 --- a/.bowerrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "directory": "bower_components", - "analytics": false -} diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..fd20a38 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,19 @@ +# 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 diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..4c662f0 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,51 @@ +module.exports = { + root: true, + parserOptions: { + ecmaVersion: 2017, + sourceType: 'module' + }, + plugins: [ + 'ember' + ], + extends: [ + 'eslint:recommended', + 'plugin:ember/recommended' + ], + env: { + browser: true + }, + rules: { + }, + overrides: [ + // node files + { + files: [ + '.template-lintrc.js', + 'ember-cli-build.js', + 'index.js', + 'testem.js', + 'blueprints/*/index.js', + 'config/**/*.js', + 'tests/dummy/config/**/*.js' + ], + excludedFiles: [ + 'addon/**', + 'addon-test-support/**', + 'app/**', + 'tests/dummy/app/**' + ], + parserOptions: { + sourceType: 'script', + ecmaVersion: 2015 + }, + env: { + browser: false, + node: true + }, + plugins: ['node'], + rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, { + // add your custom rules and overrides for node files here + }) + } + ] +}; diff --git a/.gitignore b/.gitignore index 5ad14dd..29c9bc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,23 @@ # 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* -testem.log +/npm-debug.log* +/testem.log +/yarn-error.log + +# ember-try +/.node_modules.ember-try/ +/bower.json.ember-try +/package.json.ember-try diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index d421faa..0000000 --- a/.jshintrc +++ /dev/null @@ -1,32 +0,0 @@ -{ - "predef": [ - "document", - "window", - "-Promise" - ], - "browser": true, - "boss": true, - "curly": true, - "debug": false, - "devel": true, - "eqeqeq": true, - "evil": true, - "forin": false, - "immed": false, - "laxbreak": false, - "newcap": true, - "noarg": true, - "noempty": false, - "nonew": false, - "nomen": false, - "onevar": false, - "plusplus": false, - "regexp": false, - "undef": true, - "sub": true, - "strict": false, - "white": false, - "eqnull": true, - "esversion": 6, - "unused": true -} diff --git a/.npmignore b/.npmignore index 86f32a9..293083e 100644 --- a/.npmignore +++ b/.npmignore @@ -1,27 +1,33 @@ -/bower_components -/config/ember-try.js -/dist -/tests -/tmp -**/.gitkeep +# compiled output +/dist/ +/tmp/ + +# dependencies +/bower_components/ -.bowerrc -.editorconfig -.ember-cli -.gitattributes -.gitignore -.jshintrc -.travis.yml -.npmignore -.watchmanconfig +# misc +/.bowerrc +/.editorconfig +/.ember-cli +/.eslintignore +/.eslintrc.js +/.gitattributes +/.gitignore +/.npmignore +/.template-lintrc.js +/.travis.yml +/.watchmanconfig +/bower.json +/config/ember-try.js +/ember-cli-build.js +/testem.js +/tests/ +/yarn.lock +.gitkeep ACCEPTED-CLAS.md -bower.json CHANGELOG.md CLA-CORPORATE.md CLA-INDIVIDUAL.md CONTRIBUTING.md -ember-cli-build.js -LICENSE.md README.md RELEASE-INSTRUCTIONS.md -testem.json diff --git a/.template-lintrc.js b/.template-lintrc.js new file mode 100644 index 0000000..b45e96f --- /dev/null +++ b/.template-lintrc.js @@ -0,0 +1,5 @@ +'use strict'; + +module.exports = { + extends: 'recommended' +}; diff --git a/.travis.yml b/.travis.yml index 8656d80..f904298 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,41 +1,54 @@ --- language: node_js node_js: - - "4" + # we recommend testing addons with the same minimum supported node version as Ember CLI + # so that your addon works for all apps + - "6" sudo: false +dist: trusty + +addons: + chrome: stable cache: directories: - $HOME/.npm - - $HOME/.cache # includes bowers cache env: - # we recommend testing LTS's and latest stable release (bonus points to beta/canary) - - EMBER_TRY_SCENARIO=ember-1.13 - - EMBER_TRY_SCENARIO=ember-lts-2.4 - - EMBER_TRY_SCENARIO=ember-lts-2.8 - - EMBER_TRY_SCENARIO=ember-release - - EMBER_TRY_SCENARIO=ember-beta - - EMBER_TRY_SCENARIO=ember-canary - -matrix: - fast_finish: true + global: + # See https://git.io/vdao3 for details. + - JOBS=1 + +jobs: + fail_fast: true allow_failures: - env: EMBER_TRY_SCENARIO=ember-canary + include: + # runs linting and tests with current locked deps + + - stage: "Tests" + name: "Tests" + script: + - npm run lint:hbs + - npm run lint:js + - npm test + + # we recommend new addons test the current and previous LTS + # as well as latest stable release (bonus points to beta/canary) + - stage: "Additional Tests" + env: EMBER_TRY_SCENARIO=ember-lts-2.16 + - env: EMBER_TRY_SCENARIO=ember-lts-2.18 + - env: EMBER_TRY_SCENARIO=ember-release + - env: EMBER_TRY_SCENARIO=ember-beta + - env: EMBER_TRY_SCENARIO=ember-canary + - env: EMBER_TRY_SCENARIO=ember-default-with-jquery + before_install: - npm config set spin false - - npm install -g bower - - bower --version - - npm install phantomjs-prebuilt - - node_modules/phantomjs-prebuilt/bin/phantomjs --version - -install: - - npm install - - bower install + - npm install -g npm@4 + - npm --version script: - # Usually, it's ok to finish the test scenario without reverting - # to the addon's original dependency state, skipping "cleanup". - - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup + - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO diff --git a/LICENSE.md b/LICENSE.md index aaef8bb..6f554bd 100755 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015 SoftLayer Technologies, Inc. +Copyright (c) 2015-2018 SoftLayer Technologies, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 338ba3e..b67c2ac 100755 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ An Ember CLI addon to generate HTML documentation from [JSDoc](http://usejsdoc.o # Install -``` +```sh ember install ember-cli-jsdoc ``` @@ -66,7 +66,7 @@ Employs [Semantic Versioning 2.0.0](http://semver.org/) # Copyright and License -ember-cli-jsdoc and its source files are Copyright © 2015 [SoftLayer Technologies, Inc.](http://www.softlayer.com/) +ember-cli-jsdoc and its source files are Copyright © 2015-2018 [SoftLayer Technologies, Inc.](http://www.softlayer.com/) The software is [MIT Licensed](LICENSE.md) diff --git a/bower.json b/bower.json deleted file mode 100755 index 0d19f26..0000000 --- a/bower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "ember-cli-jsdoc", - "dependencies": { - "ember": "2.10.0", - "ember-cli-shims": "0.1.3" - } -} diff --git a/config/ember-try.js b/config/ember-try.js index c58516b..7742969 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -1,60 +1,83 @@ -/*jshint node:true*/ -module.exports = { - scenarios: [ - { - name: 'ember-lts-2.4', - bower: { - dependencies: { - 'ember': 'components/ember#lts-2-4' +'use strict'; + +const getChannelURL = require('ember-source-channel-url'); + +module.exports = function() { + return Promise.all([ + getChannelURL('release'), + getChannelURL('beta'), + getChannelURL('canary') + ]).then((urls) => { + return { + scenarios: [ + { + name: 'ember-lts-2.16', + env: { + EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }), + }, + npm: { + devDependencies: { + '@ember/jquery': '^0.5.1', + 'ember-source': '~2.16.0' + } + } }, - resolutions: { - 'ember': 'lts-2-4' - } - } - }, - { - name: 'ember-lts-2.8', - bower: { - dependencies: { - 'ember': 'components/ember#lts-2-8' + { + name: 'ember-lts-2.18', + env: { + EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }), + }, + npm: { + devDependencies: { + '@ember/jquery': '^0.5.1', + 'ember-source': '~2.18.0' + } + } }, - resolutions: { - 'ember': 'lts-2-8' - } - } - }, - { - name: 'ember-release', - bower: { - dependencies: { - 'ember': 'components/ember#release' + { + name: 'ember-release', + npm: { + devDependencies: { + 'ember-source': urls[0] + } + } }, - resolutions: { - 'ember': 'release' - } - } - }, - { - name: 'ember-beta', - bower: { - dependencies: { - 'ember': 'components/ember#beta' + { + name: 'ember-beta', + npm: { + devDependencies: { + 'ember-source': urls[1] + } + } }, - resolutions: { - 'ember': 'beta' - } - } - }, - { - name: 'ember-canary', - bower: { - dependencies: { - 'ember': 'components/ember#canary' + { + name: 'ember-canary', + npm: { + devDependencies: { + 'ember-source': urls[2] + } + } + }, + { + name: 'ember-default', + npm: { + devDependencies: {} + } }, - resolutions: { - 'ember': 'canary' + { + name: 'ember-default-with-jquery', + env: { + EMBER_OPTIONAL_FEATURES: JSON.stringify({ + 'jquery-integration': true + }) + }, + npm: { + devDependencies: { + '@ember/jquery': '^0.5.1' + } + } } - } - } - ] + ] + }; + }); }; diff --git a/config/environment.js b/config/environment.js index 28a787b..0dfaed4 100644 --- a/config/environment.js +++ b/config/environment.js @@ -1,4 +1,3 @@ -/*jshint node:true*/ 'use strict'; module.exports = function(/* environment, appConfig */) { diff --git a/ember-cli-build.js b/ember-cli-build.js index 4ac3913..dc5a39e 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -1,9 +1,9 @@ -/*jshint node:true*/ -/* global require, module */ -var EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); +'use strict'; + +const EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); module.exports = function(defaults) { - var app = new EmberAddon(defaults, { + let app = new EmberAddon(defaults, { // Add options here }); diff --git a/index.js b/index.js index 2922883..ca42bb4 100644 --- a/index.js +++ b/index.js @@ -1,8 +1,7 @@ -/* jshint node: true */ 'use strict'; module.exports = { - name: 'ember-cli-jsdoc', + name: require('./package').name, includedCommands: function() { return { diff --git a/package.json b/package.json index 26316a0..6b59afa 100644 --- a/package.json +++ b/package.json @@ -4,17 +4,16 @@ "description": "Generate documentation of your app/addon from your JSDoc comments", "scripts": { "build": "ember build", - "start": "ember server", - "test": "ember try:each" + "lint:hbs": "ember-template-lint .", + "lint:js": "eslint .", + "start": "ember serve", + "test": "ember test", + "test:all": "ember try:each" }, "homepage": "http://softlayer.github.io/ember-cli-jsdoc/", - "repository": { - "type": "git", - "url": "http://github.com/softlayer/ember-cli-jsdoc.git" - }, "bugs": "https://github.com/softlayer/ember-cli-jsdoc/issues", "engines": { - "node": ">= 0.12.0" + "node": "6.* || 8.* || >= 10.*" }, "keywords": [ "ember-addon", @@ -23,35 +22,45 @@ "comments", "docblock" ], - "author": "Jeremy Brown (http://www.notmessenger.com/)", + "repository": { + "type": "git", + "url": "http://github.com/softlayer/ember-cli-jsdoc.git" + }, "license": "MIT", + "author": "Jeremy Brown (http://www.notmessenger.com/)", "dependencies": { "chalk": "1.1.3", - "ember-cli-babel": "5.1.7", + "ember-cli-babel": "^7.1.0", "jsdoc": "3.5.5", "jsdoc-plugins": "1.2.2", "rsvp": "3.0.18" }, "devDependencies": { - "broccoli-asset-rev": "2.4.5", - "ember-ajax": "2.4.1", - "ember-cli": "2.10.0", - "ember-cli-app-version": "2.0.0", - "ember-cli-dependency-checker": "1.3.0", - "ember-cli-htmlbars": "1.0.10", - "ember-cli-htmlbars-inline-precompile": "0.3.3", - "ember-cli-inject-live-reload": "1.4.1", - "ember-cli-jshint": "2.0.1", - "ember-cli-qunit": "3.0.1", - "ember-cli-test-loader": "1.1.0", - "ember-cli-uglify": "1.2.0", - "ember-disable-prototype-extensions": "1.1.0", + "@ember/optional-features": "^0.6.3", + "broccoli-asset-rev": "^2.7.0", + "ember-ajax": "^3.1.0", + "ember-cli": "~3.5.0", + "ember-cli-dependency-checker": "^3.0.0", + "ember-cli-eslint": "^4.2.3", + "ember-cli-htmlbars": "^3.0.0", + "ember-cli-htmlbars-inline-precompile": "^1.0.3", + "ember-cli-inject-live-reload": "^1.8.2", + "ember-cli-template-lint": "^1.0.0-beta.1", + "ember-cli-uglify": "^2.1.0", + "ember-disable-prototype-extensions": "^1.1.3", "ember-disable-proxy-controllers": "1.0.1", - "ember-export-application-global": "1.0.5", - "ember-load-initializers": "0.5.1", - "ember-resolver": "2.0.3", - "ember-try": "0.2.2", - "loader.js": "4.0.10" + "ember-export-application-global": "^2.0.0", + "ember-load-initializers": "^1.1.0", + "ember-maybe-import-regenerator": "^0.1.6", + "ember-qunit": "^3.4.1", + "ember-resolver": "^5.0.1", + "ember-source": "~3.5.0", + "ember-source-channel-url": "^1.1.0", + "ember-try": "^1.0.0", + "eslint-plugin-ember": "^5.2.0", + "eslint-plugin-node": "^7.0.1", + "loader.js": "^4.7.0", + "qunit-dom": "^0.8.0" }, "ember-addon": { "configPath": "tests/dummy/config" diff --git a/testem.js b/testem.js index 26044b2..726d187 100644 --- a/testem.js +++ b/testem.js @@ -1,13 +1,25 @@ -/*jshint node:true*/ module.exports = { - "framework": "qunit", - "test_page": "tests/index.html?hidepassed", - "disable_watching": true, - "launch_in_ci": [ - "PhantomJS" + test_page: 'tests/index.html?hidepassed', + disable_watching: true, + launch_in_ci: [ + 'Chrome' ], - "launch_in_dev": [ - "PhantomJS", - "Chrome" - ] + launch_in_dev: [ + 'Chrome' + ], + browser_args: { + Chrome: { + ci: [ + // --no-sandbox is needed when running Chrome inside a container + 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) + } + } }; diff --git a/tests/.jshintrc b/tests/.jshintrc deleted file mode 100644 index d2bd113..0000000 --- a/tests/.jshintrc +++ /dev/null @@ -1,52 +0,0 @@ -{ - "predef": [ - "document", - "window", - "location", - "setTimeout", - "$", - "-Promise", - "define", - "console", - "visit", - "exists", - "fillIn", - "click", - "keyEvent", - "triggerEvent", - "find", - "findWithAssert", - "wait", - "DS", - "andThen", - "currentURL", - "currentPath", - "currentRouteName" - ], - "node": false, - "browser": false, - "boss": true, - "curly": true, - "debug": false, - "devel": false, - "eqeqeq": true, - "evil": true, - "forin": false, - "immed": false, - "laxbreak": false, - "newcap": true, - "noarg": true, - "noempty": false, - "nonew": false, - "nomen": false, - "onevar": false, - "plusplus": false, - "regexp": false, - "undef": true, - "sub": true, - "strict": false, - "white": false, - "eqnull": true, - "esversion": 6, - "unused": true -} diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js index 831ad61..b3b2bd6 100644 --- a/tests/dummy/app/app.js +++ b/tests/dummy/app/app.js @@ -1,13 +1,9 @@ -import Ember from 'ember'; +import Application from '@ember/application'; import Resolver from './resolver'; import loadInitializers from 'ember-load-initializers'; import config from './config/environment'; -let App; - -Ember.MODEL_FACTORY_INJECTIONS = true; - -App = Ember.Application.extend({ +const App = Application.extend({ modulePrefix: config.modulePrefix, podModulePrefix: config.podModulePrefix, Resolver diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html index 5120bd7..61400b2 100644 --- a/tests/dummy/app/index.html +++ b/tests/dummy/app/index.html @@ -9,8 +9,8 @@ {{content-for "head"}} - - + + {{content-for "head-footer"}} diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js index cdc2578..d0bb009 100644 --- a/tests/dummy/app/router.js +++ b/tests/dummy/app/router.js @@ -1,7 +1,7 @@ -import Ember from 'ember'; +import EmberRouter from '@ember/routing/router'; import config from './config/environment'; -const Router = Ember.Router.extend({ +const Router = EmberRouter.extend({ location: config.locationType, rootURL: config.rootURL }); diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index 703c472..182d3fc 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -1,9 +1,9 @@ -/* jshint node: true */ +'use strict'; module.exports = function(environment) { - var ENV = { + let ENV = { modulePrefix: 'dummy', - environment: environment, + environment, rootURL: '/', locationType: 'auto', EmberENV: { @@ -40,10 +40,11 @@ module.exports = function(environment) { ENV.APP.LOG_VIEW_LOOKUPS = false; ENV.APP.rootElement = '#ember-testing'; + ENV.APP.autoboot = false; } if (environment === 'production') { - + // here you can enable a production-specific feature } return ENV; diff --git a/tests/dummy/config/optional-features.json b/tests/dummy/config/optional-features.json new file mode 100644 index 0000000..b190262 --- /dev/null +++ b/tests/dummy/config/optional-features.json @@ -0,0 +1,3 @@ +{ + "jquery-integration": false +} diff --git a/tests/dummy/config/targets.js b/tests/dummy/config/targets.js new file mode 100644 index 0000000..8ffae36 --- /dev/null +++ b/tests/dummy/config/targets.js @@ -0,0 +1,18 @@ +'use strict'; + +const browsers = [ + 'last 1 Chrome versions', + 'last 1 Firefox versions', + 'last 1 Safari versions' +]; + +const isCI = !!process.env.CI; +const isProduction = process.env.EMBER_ENV === 'production'; + +if (isCI || isProduction) { + browsers.push('ie 11'); +} + +module.exports = { + browsers +}; diff --git a/tests/dummy/public/crossdomain.xml b/tests/dummy/public/crossdomain.xml deleted file mode 100644 index 0c16a7a..0000000 --- a/tests/dummy/public/crossdomain.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - diff --git a/tests/helpers/.gitkeep b/tests/helpers/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js deleted file mode 100644 index c3d4d1a..0000000 --- a/tests/helpers/destroy-app.js +++ /dev/null @@ -1,5 +0,0 @@ -import Ember from 'ember'; - -export default function destroyApp(application) { - Ember.run(application, 'destroy'); -} diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js deleted file mode 100644 index 76996fd..0000000 --- a/tests/helpers/module-for-acceptance.js +++ /dev/null @@ -1,23 +0,0 @@ -import { module } from 'qunit'; -import Ember from 'ember'; -import startApp from '../helpers/start-app'; -import destroyApp from '../helpers/destroy-app'; - -const { RSVP: { Promise } } = Ember; - -export default function(name, options = {}) { - module(name, { - beforeEach() { - this.application = startApp(); - - if (options.beforeEach) { - return options.beforeEach.apply(this, arguments); - } - }, - - afterEach() { - let afterEach = options.afterEach && options.afterEach.apply(this, arguments); - return Promise.resolve(afterEach).then(() => destroyApp(this.application)); - } - }); -} diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js deleted file mode 100644 index b208d38..0000000 --- a/tests/helpers/resolver.js +++ /dev/null @@ -1,11 +0,0 @@ -import Resolver from '../../resolver'; -import config from '../../config/environment'; - -const resolver = Resolver.create(); - -resolver.namespace = { - modulePrefix: config.modulePrefix, - podModulePrefix: config.podModulePrefix -}; - -export default resolver; diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js deleted file mode 100644 index 54c33c1..0000000 --- a/tests/helpers/start-app.js +++ /dev/null @@ -1,18 +0,0 @@ -import Ember from 'ember'; -import Application from '../../app'; -import config from '../../config/environment'; - -export default function startApp(attrs) { - let application; - - // use defaults, but you can override - let attributes = Ember.assign({}, config.APP, attrs); - - Ember.run(() => { - application = Application.create(attributes); - application.setupForTesting(); - application.injectTestHelpers(); - }); - - return application; -} diff --git a/tests/test-helper.js b/tests/test-helper.js index e6cfb70..0382a84 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -1,6 +1,8 @@ -import resolver from './helpers/resolver'; -import { - setResolver -} from 'ember-qunit'; +import Application from '../app'; +import config from '../config/environment'; +import { setApplication } from '@ember/test-helpers'; +import { start } from 'ember-qunit'; -setResolver(resolver); +setApplication(Application.create(config.APP)); + +start(); From 98bdbb218a7547566fe12935eff0f0bdc533dd56 Mon Sep 17 00:00:00 2001 From: amullabaev Date: Fri, 20 Sep 2019 11:14:28 +0600 Subject: [PATCH 2/6] Updated ember-disable-proxy-controllers package version to get rid of deprecation warnings from old babel version while building project --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6b59afa..6a095de 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "ember-cli-template-lint": "^1.0.0-beta.1", "ember-cli-uglify": "^2.1.0", "ember-disable-prototype-extensions": "^1.1.3", - "ember-disable-proxy-controllers": "1.0.1", + "ember-disable-proxy-controllers": "1.0.2", "ember-export-application-global": "^2.0.0", "ember-load-initializers": "^1.1.0", "ember-maybe-import-regenerator": "^0.1.6", From aa09f079eeaf78b193a0a67eb06e3f0cbe4343af Mon Sep 17 00:00:00 2001 From: amullabaev Date: Fri, 20 Sep 2019 11:20:13 +0600 Subject: [PATCH 3/6] Added node to eslint env to remove warning about `module.exports` and `require` --- .eslintrc.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 4c662f0..c0a6de3 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -12,7 +12,8 @@ module.exports = { 'plugin:ember/recommended' ], env: { - browser: true + browser: true, + node: true }, rules: { }, From 3d93df46fa68bed796779f4e83491c6c1af287b8 Mon Sep 17 00:00:00 2001 From: amullabaev Date: Fri, 20 Sep 2019 11:34:00 +0600 Subject: [PATCH 4/6] Removed unused variable --- jsdocTemplates/default/publish.js | 1 - 1 file changed, 1 deletion(-) diff --git a/jsdocTemplates/default/publish.js b/jsdocTemplates/default/publish.js index 436805c..ef735c2 100644 --- a/jsdocTemplates/default/publish.js +++ b/jsdocTemplates/default/publish.js @@ -13,7 +13,6 @@ var util = require('util'); var htmlsafe = helper.htmlsafe; var linkto = helper.linkto; var resolveAuthorLinks = helper.resolveAuthorLinks; -var scopeToPunc = helper.scopeToPunc; var hasOwnProp = Object.prototype.hasOwnProperty; var data; From 6bcc2b98e8f9bbc24b384421496e7a980cc08634 Mon Sep 17 00:00:00 2001 From: amullabaev Date: Fri, 20 Sep 2019 11:35:13 +0600 Subject: [PATCH 5/6] Added suppress warnings for console.log calls --- lib/commands/ember-cli-jsdoc.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/commands/ember-cli-jsdoc.js b/lib/commands/ember-cli-jsdoc.js index bac714f..08e2de5 100755 --- a/lib/commands/ember-cli-jsdoc.js +++ b/lib/commands/ember-cli-jsdoc.js @@ -17,16 +17,19 @@ module.exports = { return new rsvp.Promise( function( resolve, reject ) { exec( cmdPath + ' -c jsdoc.json', { cwd: process.cwd() }, function( error, stdout, stderr ) { + // eslint-disable-next-line no-console console.log( stderr ); var shouldReject = false; if ( error ) { + // eslint-disable-next-line no-console console.log( chalk.red( 'EMBER-CLI-JSDOC: ERRORS have occurred during documentation generation' ) ); shouldReject = true; } if ( /WARNING/.test( stderr ) ) { + // eslint-disable-next-line no-console console.log( chalk.yellow( 'EMBER-CLI-JSDOC: WARNINGS have occurred during documentation generation' ) ); } @@ -34,6 +37,7 @@ module.exports = { reject(); } else { + // eslint-disable-next-line no-console console.log( chalk.green( 'EMBER-CLI-JSDOC: Documentation was successfully generated' ) ); resolve(); } From ad599d88786dfcd60c6e733d8d371a307fc1f6a7 Mon Sep 17 00:00:00 2001 From: amullabaev Date: Fri, 20 Sep 2019 11:36:00 +0600 Subject: [PATCH 6/6] Appended path to minified scripts in .eslintignore --- .eslintignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.eslintignore b/.eslintignore index fd20a38..468342e 100644 --- a/.eslintignore +++ b/.eslintignore @@ -17,3 +17,6 @@ /.node_modules.ember-try/ /bower.json.ember-try /package.json.ember-try + +# minified scripts +/jsdocTemplates/default/static/scripts/prettify/