From 005bf58d4395bcd8264f9b3efad4713cef2f222b Mon Sep 17 00:00:00 2001 From: Travis Hoover Date: Thu, 24 Jun 2021 11:30:00 -0700 Subject: [PATCH] Convert fastboot-addon to new test infra Also removing the old test-packages/fastboot-addon code --- test-packages/fastboot-addon/.editorconfig | 19 --- test-packages/fastboot-addon/.ember-cli | 9 -- test-packages/fastboot-addon/.eslintignore | 20 --- test-packages/fastboot-addon/.eslintrc.js | 58 ------- test-packages/fastboot-addon/.gitignore | 25 --- test-packages/fastboot-addon/.npmignore | 32 ---- .../fastboot-addon/.template-lintrc.js | 5 - test-packages/fastboot-addon/.travis.yml | 59 ------- test-packages/fastboot-addon/.watchmanconfig | 3 - test-packages/fastboot-addon/CONTRIBUTING.md | 26 --- test-packages/fastboot-addon/LICENSE.md | 9 -- test-packages/fastboot-addon/README.md | 38 ----- test-packages/fastboot-addon/addon/.gitkeep | 0 test-packages/fastboot-addon/app/.gitkeep | 0 .../fastboot-addon/config/ember-try.js | 88 ---------- .../fastboot-addon/config/environment.js | 5 - .../fastboot-addon/ember-cli-build.js | 18 --- test-packages/fastboot-addon/package.json | 71 --------- test-packages/fastboot-addon/testem.js | 2 - .../fastboot-addon/tests/dummy/app/app.js | 12 -- .../tests/dummy/app/components/.gitkeep | 0 .../tests/dummy/app/controllers/.gitkeep | 0 .../tests/dummy/app/helpers/.gitkeep | 0 .../fastboot-addon/tests/dummy/app/index.html | 25 --- .../tests/dummy/app/models/.gitkeep | 0 .../fastboot-addon/tests/dummy/app/router.js | 10 -- .../tests/dummy/app/routes/.gitkeep | 0 .../tests/dummy/app/styles/app.css | 0 .../tests/dummy/app/templates/application.hbs | 3 - .../tests/dummy/config/environment.js | 51 ------ .../tests/dummy/config/optional-features.json | 6 - .../tests/dummy/config/targets.js | 18 --- .../tests/dummy/public/robots.txt | 3 - .../fastboot-addon/tests/helpers/.gitkeep | 0 test-packages/fastboot-addon/tests/index.html | 40 ----- .../fastboot-addon/tests/integration/.gitkeep | 0 .../fastboot-addon/tests/test-helper.js | 12 -- .../fastboot-addon/tests/unit/.gitkeep | 0 test-packages/fastboot-addon/vendor/.gitkeep | 0 .../addon/components/addon-example.hbs | 0 .../addon/components/addon-example.js | 0 .../app/components/addon-example.js | 0 .../app/services/addon-example.js | 0 .../fastboot/services/addon-example.js | 0 .../fixtures}/fastboot-addon/index.js | 0 .../fixtures}/fastboot-addon/public/sample.js | 0 tests/scenarios/fastboot-app-test.ts | 11 +- yarn.lock | 150 +++--------------- 48 files changed, 35 insertions(+), 793 deletions(-) delete mode 100644 test-packages/fastboot-addon/.editorconfig delete mode 100644 test-packages/fastboot-addon/.ember-cli delete mode 100644 test-packages/fastboot-addon/.eslintignore delete mode 100644 test-packages/fastboot-addon/.eslintrc.js delete mode 100644 test-packages/fastboot-addon/.gitignore delete mode 100644 test-packages/fastboot-addon/.npmignore delete mode 100644 test-packages/fastboot-addon/.template-lintrc.js delete mode 100644 test-packages/fastboot-addon/.travis.yml delete mode 100644 test-packages/fastboot-addon/.watchmanconfig delete mode 100644 test-packages/fastboot-addon/CONTRIBUTING.md delete mode 100644 test-packages/fastboot-addon/LICENSE.md delete mode 100644 test-packages/fastboot-addon/README.md delete mode 100644 test-packages/fastboot-addon/addon/.gitkeep delete mode 100644 test-packages/fastboot-addon/app/.gitkeep delete mode 100644 test-packages/fastboot-addon/config/ember-try.js delete mode 100644 test-packages/fastboot-addon/config/environment.js delete mode 100644 test-packages/fastboot-addon/ember-cli-build.js delete mode 100644 test-packages/fastboot-addon/package.json delete mode 100644 test-packages/fastboot-addon/testem.js delete mode 100644 test-packages/fastboot-addon/tests/dummy/app/app.js delete mode 100644 test-packages/fastboot-addon/tests/dummy/app/components/.gitkeep delete mode 100644 test-packages/fastboot-addon/tests/dummy/app/controllers/.gitkeep delete mode 100644 test-packages/fastboot-addon/tests/dummy/app/helpers/.gitkeep delete mode 100644 test-packages/fastboot-addon/tests/dummy/app/index.html delete mode 100644 test-packages/fastboot-addon/tests/dummy/app/models/.gitkeep delete mode 100644 test-packages/fastboot-addon/tests/dummy/app/router.js delete mode 100644 test-packages/fastboot-addon/tests/dummy/app/routes/.gitkeep delete mode 100644 test-packages/fastboot-addon/tests/dummy/app/styles/app.css delete mode 100644 test-packages/fastboot-addon/tests/dummy/app/templates/application.hbs delete mode 100644 test-packages/fastboot-addon/tests/dummy/config/environment.js delete mode 100644 test-packages/fastboot-addon/tests/dummy/config/optional-features.json delete mode 100644 test-packages/fastboot-addon/tests/dummy/config/targets.js delete mode 100644 test-packages/fastboot-addon/tests/dummy/public/robots.txt delete mode 100644 test-packages/fastboot-addon/tests/helpers/.gitkeep delete mode 100644 test-packages/fastboot-addon/tests/index.html delete mode 100644 test-packages/fastboot-addon/tests/integration/.gitkeep delete mode 100644 test-packages/fastboot-addon/tests/test-helper.js delete mode 100644 test-packages/fastboot-addon/tests/unit/.gitkeep delete mode 100644 test-packages/fastboot-addon/vendor/.gitkeep rename {test-packages => tests/fixtures}/fastboot-addon/addon/components/addon-example.hbs (100%) rename {test-packages => tests/fixtures}/fastboot-addon/addon/components/addon-example.js (100%) rename {test-packages => tests/fixtures}/fastboot-addon/app/components/addon-example.js (100%) rename {test-packages => tests/fixtures}/fastboot-addon/app/services/addon-example.js (100%) rename {test-packages => tests/fixtures}/fastboot-addon/fastboot/services/addon-example.js (100%) rename {test-packages => tests/fixtures}/fastboot-addon/index.js (100%) rename {test-packages => tests/fixtures}/fastboot-addon/public/sample.js (100%) diff --git a/test-packages/fastboot-addon/.editorconfig b/test-packages/fastboot-addon/.editorconfig deleted file mode 100644 index c35a00240..000000000 --- a/test-packages/fastboot-addon/.editorconfig +++ /dev/null @@ -1,19 +0,0 @@ -# EditorConfig helps developers define and maintain consistent -# coding styles between different editors and IDEs -# editorconfig.org - -root = true - -[*] -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true -indent_style = space -indent_size = 2 - -[*.hbs] -insert_final_newline = false - -[*.{diff,md}] -trim_trailing_whitespace = false diff --git a/test-packages/fastboot-addon/.ember-cli b/test-packages/fastboot-addon/.ember-cli deleted file mode 100644 index ee64cfed2..000000000 --- a/test-packages/fastboot-addon/.ember-cli +++ /dev/null @@ -1,9 +0,0 @@ -{ - /** - Ember CLI sends analytics information by default. The data is completely - anonymous, but there are times when you might want to disable this behavior. - - Setting `disableAnalytics` to true will prevent any data from being sent. - */ - "disableAnalytics": false -} diff --git a/test-packages/fastboot-addon/.eslintignore b/test-packages/fastboot-addon/.eslintignore deleted file mode 100644 index 72df37307..000000000 --- a/test-packages/fastboot-addon/.eslintignore +++ /dev/null @@ -1,20 +0,0 @@ -# unconventional js -/blueprints/*/files/ -/vendor/ - -# compiled output -/dist/ -/tmp/ - -# dependencies -/bower_components/ -/node_modules/ - -# misc -/coverage/ -!.* - -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try diff --git a/test-packages/fastboot-addon/.eslintrc.js b/test-packages/fastboot-addon/.eslintrc.js deleted file mode 100644 index 85a190092..000000000 --- a/test-packages/fastboot-addon/.eslintrc.js +++ /dev/null @@ -1,58 +0,0 @@ -'use strict'; - -module.exports = { - root: true, - parser: 'babel-eslint', - parserOptions: { - ecmaVersion: 2018, - sourceType: 'module', - ecmaFeatures: { - legacyDecorators: true - } - }, - plugins: [ - 'ember' - ], - extends: [ - 'eslint:recommended', - 'plugin:ember/recommended' - ], - env: { - browser: true - }, - rules: { - 'ember/no-jquery': 'error' - }, - overrides: [ - // node files - { - files: [ - '.eslintrc.js', - '.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' - }, - 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/test-packages/fastboot-addon/.gitignore b/test-packages/fastboot-addon/.gitignore deleted file mode 100644 index c40a1b2ab..000000000 --- a/test-packages/fastboot-addon/.gitignore +++ /dev/null @@ -1,25 +0,0 @@ -# See https://help.github.com/ignore-files/ for more about ignoring files. - -# compiled output -/dist/ -/tmp/ - -# dependencies -/bower_components/ -/node_modules/ - -# misc -/.env* -/.pnp* -/.sass-cache -/connect.lock -/coverage/ -/libpeerconnection.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/test-packages/fastboot-addon/.npmignore b/test-packages/fastboot-addon/.npmignore deleted file mode 100644 index bd09adff9..000000000 --- a/test-packages/fastboot-addon/.npmignore +++ /dev/null @@ -1,32 +0,0 @@ -# compiled output -/dist/ -/tmp/ - -# dependencies -/bower_components/ - -# misc -/.bowerrc -/.editorconfig -/.ember-cli -/.env* -/.eslintignore -/.eslintrc.js -/.git/ -/.gitignore -/.template-lintrc.js -/.travis.yml -/.watchmanconfig -/bower.json -/config/ember-try.js -/CONTRIBUTING.md -/ember-cli-build.js -/testem.js -/tests/ -/yarn.lock -.gitkeep - -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try diff --git a/test-packages/fastboot-addon/.template-lintrc.js b/test-packages/fastboot-addon/.template-lintrc.js deleted file mode 100644 index f38737001..000000000 --- a/test-packages/fastboot-addon/.template-lintrc.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -module.exports = { - extends: 'octane' -}; diff --git a/test-packages/fastboot-addon/.travis.yml b/test-packages/fastboot-addon/.travis.yml deleted file mode 100644 index 8ddfaf16d..000000000 --- a/test-packages/fastboot-addon/.travis.yml +++ /dev/null @@ -1,59 +0,0 @@ ---- -language: node_js -node_js: - # we recommend testing addons with the same minimum supported node version as Ember CLI - # so that your addon works for all apps - - "10" - -dist: trusty - -addons: - chrome: stable - -cache: - directories: - - $HOME/.npm - -env: - global: - # See https://git.io/vdao3 for details. - - JOBS=1 - -branches: - only: - - master - # npm version tags - - /^v\d+\.\d+\.\d+/ - -jobs: - fast_finish: 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 - - npm run test:ember - - - stage: "Additional Tests" - name: "Floating Dependencies" - install: - - npm install --no-package-lock - script: - - npm run test:ember - - # we recommend new addons test the current and previous LTS - # as well as latest stable release (bonus points to beta/canary) - - env: EMBER_TRY_SCENARIO=ember-lts-3.12 - - env: EMBER_TRY_SCENARIO=ember-lts-3.16 - - 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 - - env: EMBER_TRY_SCENARIO=ember-classic - -script: - - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO diff --git a/test-packages/fastboot-addon/.watchmanconfig b/test-packages/fastboot-addon/.watchmanconfig deleted file mode 100644 index e7834e3e4..000000000 --- a/test-packages/fastboot-addon/.watchmanconfig +++ /dev/null @@ -1,3 +0,0 @@ -{ - "ignore_dirs": ["tmp", "dist"] -} diff --git a/test-packages/fastboot-addon/CONTRIBUTING.md b/test-packages/fastboot-addon/CONTRIBUTING.md deleted file mode 100644 index ac6b3ad8b..000000000 --- a/test-packages/fastboot-addon/CONTRIBUTING.md +++ /dev/null @@ -1,26 +0,0 @@ -# How To Contribute - -## Installation - -* `git clone ` -* `cd fastboot-addon` -* `npm install` - -## Linting - -* `npm run lint:hbs` -* `npm run lint:js` -* `npm run lint:js -- --fix` - -## Running tests - -* `ember test` – Runs the test suite on the current Ember version -* `ember test --server` – Runs the test suite in "watch mode" -* `ember try:each` – Runs the test suite against multiple Ember versions - -## Running the dummy application - -* `ember serve` -* Visit the dummy application at [http://localhost:4200](http://localhost:4200). - -For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/). diff --git a/test-packages/fastboot-addon/LICENSE.md b/test-packages/fastboot-addon/LICENSE.md deleted file mode 100644 index 7b6573f5e..000000000 --- a/test-packages/fastboot-addon/LICENSE.md +++ /dev/null @@ -1,9 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2020 - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/test-packages/fastboot-addon/README.md b/test-packages/fastboot-addon/README.md deleted file mode 100644 index b6cf48398..000000000 --- a/test-packages/fastboot-addon/README.md +++ /dev/null @@ -1,38 +0,0 @@ -fastboot-addon -============================================================================== - -[Short description of the addon.] - - -Compatibility ------------------------------------------------------------------------------- - -* Ember.js v3.12 or above -* Ember CLI v2.13 or above -* Node.js v10 or above - - -Installation ------------------------------------------------------------------------------- - -``` -ember install fastboot-addon -``` - - -Usage ------------------------------------------------------------------------------- - -[Longer description of how to use the addon in apps.] - - -Contributing ------------------------------------------------------------------------------- - -See the [Contributing](CONTRIBUTING.md) guide for details. - - -License ------------------------------------------------------------------------------- - -This project is licensed under the [MIT License](LICENSE.md). diff --git a/test-packages/fastboot-addon/addon/.gitkeep b/test-packages/fastboot-addon/addon/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/test-packages/fastboot-addon/app/.gitkeep b/test-packages/fastboot-addon/app/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/test-packages/fastboot-addon/config/ember-try.js b/test-packages/fastboot-addon/config/ember-try.js deleted file mode 100644 index 91935e105..000000000 --- a/test-packages/fastboot-addon/config/ember-try.js +++ /dev/null @@ -1,88 +0,0 @@ -'use strict'; - -const getChannelURL = require('ember-source-channel-url'); - -module.exports = async function() { - return { - scenarios: [ - { - name: 'ember-lts-3.12', - npm: { - devDependencies: { - 'ember-source': '~3.12.0' - } - } - }, - { - name: 'ember-lts-3.16', - npm: { - devDependencies: { - 'ember-source': '~3.16.0' - } - } - }, - { - name: 'ember-release', - npm: { - devDependencies: { - 'ember-source': await getChannelURL('release') - } - } - }, - { - name: 'ember-beta', - npm: { - devDependencies: { - 'ember-source': await getChannelURL('beta') - } - } - }, - { - name: 'ember-canary', - npm: { - devDependencies: { - 'ember-source': await getChannelURL('canary') - } - } - }, - // The default `.travis.yml` runs this scenario via `npm test`, - // not via `ember try`. It's still included here so that running - // `ember try:each` manually or from a customized CI config will run it - // along with all the other scenarios. - { - name: 'ember-default', - npm: { - devDependencies: {} - } - }, - { - name: 'ember-default-with-jquery', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ - 'jquery-integration': true - }) - }, - npm: { - devDependencies: { - '@ember/jquery': '^0.5.1' - } - } - }, - { - name: 'ember-classic', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ - 'application-template-wrapper': true, - 'default-async-observers': false, - 'template-only-glimmer-components': false - }) - }, - npm: { - ember: { - edition: 'classic' - } - } - } - ] - }; -}; diff --git a/test-packages/fastboot-addon/config/environment.js b/test-packages/fastboot-addon/config/environment.js deleted file mode 100644 index 0dfaed472..000000000 --- a/test-packages/fastboot-addon/config/environment.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -module.exports = function(/* environment, appConfig */) { - return { }; -}; diff --git a/test-packages/fastboot-addon/ember-cli-build.js b/test-packages/fastboot-addon/ember-cli-build.js deleted file mode 100644 index dc5a39e1b..000000000 --- a/test-packages/fastboot-addon/ember-cli-build.js +++ /dev/null @@ -1,18 +0,0 @@ -'use strict'; - -const EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); - -module.exports = function(defaults) { - let app = new EmberAddon(defaults, { - // Add options here - }); - - /* - This build file specifies the options for the dummy test app of this - addon, located in `/tests/dummy` - This build file does *not* influence how the addon or the app using it - behave. You most likely want to be modifying `./index.js` or app's build file - */ - - return app.toTree(); -}; diff --git a/test-packages/fastboot-addon/package.json b/test-packages/fastboot-addon/package.json deleted file mode 100644 index 6f5c47a1c..000000000 --- a/test-packages/fastboot-addon/package.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "name": "fastboot-addon", - "version": "0.0.0", - "description": "The default blueprint for ember-cli addons.", - "keywords": [ - "ember-addon" - ], - "repository": "", - "license": "MIT", - "author": "", - "directories": { - "doc": "doc", - "test": "tests" - }, - "scripts": { - "build": "ember build --environment=production", - "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*", - "lint:hbs": "ember-template-lint .", - "lint:js": "eslint .", - "start": "ember serve", - "test": "npm-run-all lint:* test:*" - }, - "dependencies": { - "ember-cli-babel": "^7.20.5", - "ember-cli-htmlbars": "^4.2.3" - }, - "devDependencies": { - "@ember/optional-features": "^1.3.0", - "@ember/test-helpers": "^2.4.2", - "@embroider/test-support": "0.36.0", - "@glimmer/component": "^1.0.0", - "@glimmer/tracking": "^1.0.0", - "babel-eslint": "^10.1.0", - "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.5.3", - "ember-cli": "~3.27.0", - "ember-cli-dependency-checker": "^3.2.0", - "ember-cli-inject-live-reload": "^2.0.2", - "ember-cli-sri": "^2.1.1", - "ember-cli-uglify": "^3.0.0", - "ember-disable-prototype-extensions": "^1.1.3", - "ember-export-application-global": "^2.0.1", - "ember-load-initializers": "^2.1.1", - "ember-maybe-import-regenerator": "^0.1.6", - "ember-qunit": "^5.1.4", - "ember-resolver": "^7.0.0", - "ember-source": "~3.22.0", - "ember-source-channel-url": "^2.0.1", - "ember-template-lint": "^2.4.0", - "ember-try": "^1.4.0", - "eslint": "^6.8.0", - "eslint-plugin-ember": "^7.10.1", - "eslint-plugin-node": "^9.0.0", - "loader.js": "^4.7.0", - "npm-run-all": "^4.1.5", - "qunit": "^2.14.1", - "qunit-dom": "^1.6.0" - }, - "engines": { - "node": "10.* || >= 12" - }, - "ember": { - "edition": "octane" - }, - "ember-addon": { - "configPath": "tests/dummy/config" - }, - "volta": { - "extends": "../../package.json" - } -} diff --git a/test-packages/fastboot-addon/testem.js b/test-packages/fastboot-addon/testem.js deleted file mode 100644 index 442829a1a..000000000 --- a/test-packages/fastboot-addon/testem.js +++ /dev/null @@ -1,2 +0,0 @@ -const { testemConfig } = require('@embroider/test-support/suite-setup-util'); -module.exports = testemConfig(); diff --git a/test-packages/fastboot-addon/tests/dummy/app/app.js b/test-packages/fastboot-addon/tests/dummy/app/app.js deleted file mode 100644 index d8e2088b6..000000000 --- a/test-packages/fastboot-addon/tests/dummy/app/app.js +++ /dev/null @@ -1,12 +0,0 @@ -import Application from '@ember/application'; -import Resolver from 'ember-resolver'; -import loadInitializers from 'ember-load-initializers'; -import config from './config/environment'; - -export default class App extends Application { - modulePrefix = config.modulePrefix; - podModulePrefix = config.podModulePrefix; - Resolver = Resolver; -} - -loadInitializers(App, config.modulePrefix); diff --git a/test-packages/fastboot-addon/tests/dummy/app/components/.gitkeep b/test-packages/fastboot-addon/tests/dummy/app/components/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/test-packages/fastboot-addon/tests/dummy/app/controllers/.gitkeep b/test-packages/fastboot-addon/tests/dummy/app/controllers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/test-packages/fastboot-addon/tests/dummy/app/helpers/.gitkeep b/test-packages/fastboot-addon/tests/dummy/app/helpers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/test-packages/fastboot-addon/tests/dummy/app/index.html b/test-packages/fastboot-addon/tests/dummy/app/index.html deleted file mode 100644 index 61400b20f..000000000 --- a/test-packages/fastboot-addon/tests/dummy/app/index.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - Dummy - - - - {{content-for "head"}} - - - - - {{content-for "head-footer"}} - - - {{content-for "body"}} - - - - - {{content-for "body-footer"}} - - diff --git a/test-packages/fastboot-addon/tests/dummy/app/models/.gitkeep b/test-packages/fastboot-addon/tests/dummy/app/models/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/test-packages/fastboot-addon/tests/dummy/app/router.js b/test-packages/fastboot-addon/tests/dummy/app/router.js deleted file mode 100644 index 224ca426a..000000000 --- a/test-packages/fastboot-addon/tests/dummy/app/router.js +++ /dev/null @@ -1,10 +0,0 @@ -import EmberRouter from '@ember/routing/router'; -import config from './config/environment'; - -export default class Router extends EmberRouter { - location = config.locationType; - rootURL = config.rootURL; -} - -Router.map(function() { -}); diff --git a/test-packages/fastboot-addon/tests/dummy/app/routes/.gitkeep b/test-packages/fastboot-addon/tests/dummy/app/routes/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/test-packages/fastboot-addon/tests/dummy/app/styles/app.css b/test-packages/fastboot-addon/tests/dummy/app/styles/app.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/test-packages/fastboot-addon/tests/dummy/app/templates/application.hbs b/test-packages/fastboot-addon/tests/dummy/app/templates/application.hbs deleted file mode 100644 index 5230580f8..000000000 --- a/test-packages/fastboot-addon/tests/dummy/app/templates/application.hbs +++ /dev/null @@ -1,3 +0,0 @@ -

Welcome to Ember

- -{{outlet}} \ No newline at end of file diff --git a/test-packages/fastboot-addon/tests/dummy/config/environment.js b/test-packages/fastboot-addon/tests/dummy/config/environment.js deleted file mode 100644 index 9f2393692..000000000 --- a/test-packages/fastboot-addon/tests/dummy/config/environment.js +++ /dev/null @@ -1,51 +0,0 @@ -'use strict'; - -module.exports = function(environment) { - let ENV = { - modulePrefix: 'dummy', - environment, - rootURL: '/', - locationType: 'auto', - EmberENV: { - FEATURES: { - // Here you can enable experimental features on an ember canary build - // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true - }, - EXTEND_PROTOTYPES: { - // Prevent Ember Data from overriding Date.parse. - Date: false - } - }, - - APP: { - // Here you can pass flags/options to your application instance - // when it is created - } - }; - - if (environment === 'development') { - // ENV.APP.LOG_RESOLVER = true; - // ENV.APP.LOG_ACTIVE_GENERATION = true; - // ENV.APP.LOG_TRANSITIONS = true; - // ENV.APP.LOG_TRANSITIONS_INTERNAL = true; - // ENV.APP.LOG_VIEW_LOOKUPS = true; - } - - if (environment === 'test') { - // Testem prefers this... - ENV.locationType = 'none'; - - // keep test console output quieter - ENV.APP.LOG_ACTIVE_GENERATION = false; - 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/test-packages/fastboot-addon/tests/dummy/config/optional-features.json b/test-packages/fastboot-addon/tests/dummy/config/optional-features.json deleted file mode 100644 index b26286e2e..000000000 --- a/test-packages/fastboot-addon/tests/dummy/config/optional-features.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "application-template-wrapper": false, - "default-async-observers": true, - "jquery-integration": false, - "template-only-glimmer-components": true -} diff --git a/test-packages/fastboot-addon/tests/dummy/config/targets.js b/test-packages/fastboot-addon/tests/dummy/config/targets.js deleted file mode 100644 index 8ffae3636..000000000 --- a/test-packages/fastboot-addon/tests/dummy/config/targets.js +++ /dev/null @@ -1,18 +0,0 @@ -'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/test-packages/fastboot-addon/tests/dummy/public/robots.txt b/test-packages/fastboot-addon/tests/dummy/public/robots.txt deleted file mode 100644 index f5916452e..000000000 --- a/test-packages/fastboot-addon/tests/dummy/public/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# http://www.robotstxt.org -User-agent: * -Disallow: diff --git a/test-packages/fastboot-addon/tests/helpers/.gitkeep b/test-packages/fastboot-addon/tests/helpers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/test-packages/fastboot-addon/tests/index.html b/test-packages/fastboot-addon/tests/index.html deleted file mode 100644 index 3eb848dbd..000000000 --- a/test-packages/fastboot-addon/tests/index.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - Dummy Tests - - - - {{content-for "head"}} - {{content-for "test-head"}} - - - - - - {{content-for "head-footer"}} - {{content-for "test-head-footer"}} - - - {{content-for "body"}} - {{content-for "test-body"}} - -
-
-
-
-
-
- - - - - - - - {{content-for "body-footer"}} - {{content-for "test-body-footer"}} - - diff --git a/test-packages/fastboot-addon/tests/integration/.gitkeep b/test-packages/fastboot-addon/tests/integration/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/test-packages/fastboot-addon/tests/test-helper.js b/test-packages/fastboot-addon/tests/test-helper.js deleted file mode 100644 index 4efd6e58a..000000000 --- a/test-packages/fastboot-addon/tests/test-helper.js +++ /dev/null @@ -1,12 +0,0 @@ -import Application from 'dummy/app'; -import config from 'dummy/config/environment'; -import * as QUnit from 'qunit'; -import { setApplication } from '@ember/test-helpers'; -import { setup } from 'qunit-dom'; -import { start } from 'ember-qunit'; - -setApplication(Application.create(config.APP)); - -setup(QUnit.assert); - -start(); diff --git a/test-packages/fastboot-addon/tests/unit/.gitkeep b/test-packages/fastboot-addon/tests/unit/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/test-packages/fastboot-addon/vendor/.gitkeep b/test-packages/fastboot-addon/vendor/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/test-packages/fastboot-addon/addon/components/addon-example.hbs b/tests/fixtures/fastboot-addon/addon/components/addon-example.hbs similarity index 100% rename from test-packages/fastboot-addon/addon/components/addon-example.hbs rename to tests/fixtures/fastboot-addon/addon/components/addon-example.hbs diff --git a/test-packages/fastboot-addon/addon/components/addon-example.js b/tests/fixtures/fastboot-addon/addon/components/addon-example.js similarity index 100% rename from test-packages/fastboot-addon/addon/components/addon-example.js rename to tests/fixtures/fastboot-addon/addon/components/addon-example.js diff --git a/test-packages/fastboot-addon/app/components/addon-example.js b/tests/fixtures/fastboot-addon/app/components/addon-example.js similarity index 100% rename from test-packages/fastboot-addon/app/components/addon-example.js rename to tests/fixtures/fastboot-addon/app/components/addon-example.js diff --git a/test-packages/fastboot-addon/app/services/addon-example.js b/tests/fixtures/fastboot-addon/app/services/addon-example.js similarity index 100% rename from test-packages/fastboot-addon/app/services/addon-example.js rename to tests/fixtures/fastboot-addon/app/services/addon-example.js diff --git a/test-packages/fastboot-addon/fastboot/services/addon-example.js b/tests/fixtures/fastboot-addon/fastboot/services/addon-example.js similarity index 100% rename from test-packages/fastboot-addon/fastboot/services/addon-example.js rename to tests/fixtures/fastboot-addon/fastboot/services/addon-example.js diff --git a/test-packages/fastboot-addon/index.js b/tests/fixtures/fastboot-addon/index.js similarity index 100% rename from test-packages/fastboot-addon/index.js rename to tests/fixtures/fastboot-addon/index.js diff --git a/test-packages/fastboot-addon/public/sample.js b/tests/fixtures/fastboot-addon/public/sample.js similarity index 100% rename from test-packages/fastboot-addon/public/sample.js rename to tests/fixtures/fastboot-addon/public/sample.js diff --git a/tests/scenarios/fastboot-app-test.ts b/tests/scenarios/fastboot-app-test.ts index 57e147210..e72de7817 100644 --- a/tests/scenarios/fastboot-app-test.ts +++ b/tests/scenarios/fastboot-app-test.ts @@ -3,6 +3,8 @@ import { PreparedApp, Project } from 'scenario-tester'; import { setupFastboot } from './helpers'; import QUnit from 'qunit'; import merge from 'lodash/merge'; +import { dirname } from 'path'; +import { loadFromFixtureData } from './helpers'; const { module: Qmodule, test } = QUnit; appScenarios @@ -17,7 +19,14 @@ appScenarios project.addDependency(sampleLib); project.linkDependency('ember-cli-fastboot', { baseDir: __dirname }); project.linkDependency('fastboot', { baseDir: __dirname }); - project.linkDependency('fastboot-addon', { baseDir: __dirname }); + + let fastbootAddon = Project.fromDir(dirname(require.resolve('../addon-template/package.json')), { + linkDeps: true, + }); + + fastbootAddon.pkg.name = 'fastboot-addon'; + merge(fastbootAddon.files, loadFromFixtureData('fastboot-addon')); + project.addDependency(fastbootAddon); // this fixes: Cannot find module 'abortcontroller-polyfill/dist/cjs-ponyfill' project.removeDependency('ember-fetch'); diff --git a/yarn.lock b/yarn.lock index 90ea4092e..ba453c875 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1645,19 +1645,6 @@ silent-error "^1.1.0" util.promisify "^1.0.0" -"@ember/optional-features@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@ember/optional-features/-/optional-features-1.3.0.tgz#d7da860417b85a56cec88419f30da5ee1dde2756" - integrity sha512-Lrfojy4xKwTX+J4EAylmxZY2TO6bQtP4Lg5C8/z2priVqiT0X5fVB1+4WQCJbRBetctO1lMDnqjmhWCVKB8bmQ== - dependencies: - chalk "^3.0.0" - ember-cli-version-checker "^3.1.3" - glob "^7.1.6" - inquirer "^7.0.1" - mkdirp "^0.5.1" - silent-error "^1.1.1" - util.promisify "^1.0.0" - "@ember/optional-features@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@ember/optional-features/-/optional-features-2.0.0.tgz#c809abd5a27d5b0ef3c6de3941334ab6153313f0" @@ -3309,7 +3296,7 @@ acorn-globals@^6.0.0: acorn "^7.1.1" acorn-walk "^7.1.1" -acorn-jsx@^5.0.0, acorn-jsx@^5.2.0, acorn-jsx@^5.3.1: +acorn-jsx@^5.0.0, acorn-jsx@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== @@ -5457,23 +5444,6 @@ broccoli-uglify-sourcemap@^2.1.1: walk-sync "^0.3.2" workerpool "^2.3.0" -broccoli-uglify-sourcemap@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-3.2.0.tgz#d96f1d41f6c18e9a5d49af1a5ab9489cdcac1c6c" - integrity sha512-kkkn8v7kXdWwnZNekq+3ILuTAGkZoaoEMUYCKoER5/uokuoyTjtdYLHaE7UxHkuPEuLfjvJYv21sCCePZ74/2g== - dependencies: - async-promise-queue "^1.0.5" - broccoli-plugin "^1.2.1" - debug "^4.1.0" - lodash.defaultsdeep "^4.6.1" - matcher-collection "^2.0.0" - mkdirp "^0.5.0" - source-map-url "^0.4.0" - symlink-or-copy "^1.0.1" - terser "^4.3.9" - walk-sync "^1.1.3" - workerpool "^5.0.1" - broccoli@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-2.3.0.tgz#b3f71b2c3d02fc042988e208827a09c75dd7b350" @@ -7105,7 +7075,7 @@ ember-asset-loader@^0.6.1: object-assign "^4.1.0" walk-sync "^1.1.3" -ember-auto-import@^1.10.1, ember-auto-import@^1.11.2, ember-auto-import@^1.2.21, ember-auto-import@^1.5.3: +ember-auto-import@^1.10.1, ember-auto-import@^1.11.2, ember-auto-import@^1.2.21: version "1.11.3" resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.11.3.tgz#6e3384a7fbb163384a34546f2e902cd297b0e683" integrity sha512-ekq/XCvsonESobFU30zjZ0I4XMy2E/2ZILCYWuQ1JdhcCSTYhnXDZcqRW8itUG7kbsPqAHT/XZ1LEZYm3seVwQ== @@ -7765,7 +7735,7 @@ ember-cli-htmlbars-inline-precompile@^2.1.0: heimdalljs-logger "^0.1.9" silent-error "^1.1.0" -ember-cli-htmlbars@^4.2.0, ember-cli-htmlbars@^4.2.3, ember-cli-htmlbars@^4.3.1: +ember-cli-htmlbars@^4.2.0, ember-cli-htmlbars@^4.3.1: version "4.5.0" resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.5.0.tgz#d299e4f7eba6f30dc723ee086906cc550beb252e" integrity sha512-bYJpK1pqFu9AadDAGTw05g2LMNzY8xTCIqQm7dMJmKEoUpLRFbPf4SfHXrktzDh7Q5iggl6Skzf1M0bPlIxARw== @@ -8077,14 +8047,6 @@ ember-cli-uglify@^2.1.0: broccoli-uglify-sourcemap "^2.1.1" lodash.defaultsdeep "^4.6.0" -ember-cli-uglify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-3.0.0.tgz#8819665b2cc5fe70e3ba9fe7a94645209bc42fd6" - integrity sha512-n3QxdBfAgBdb2Cnso82Kt/nxm3ppIjnYWM8uhOEhF1aYxNXfM7AJrc+yiqTCDUR61Db8aCpHfAMvChz3kyme7g== - dependencies: - broccoli-uglify-sourcemap "^3.1.0" - lodash.defaultsdeep "^4.6.0" - ember-cli-version-checker@^2.1.0, ember-cli-version-checker@^2.1.2: version "2.2.0" resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz#47771b731fe0962705e27c8199a9e3825709f3b3" @@ -8601,7 +8563,7 @@ ember-inline-svg@^0.2.1: svgo "~1.0.5" walk-sync "^0.3.1" -ember-load-initializers@^2.0.0, ember-load-initializers@^2.1.1, ember-load-initializers@^2.1.2: +ember-load-initializers@^2.0.0, ember-load-initializers@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-2.1.2.tgz#8a47a656c1f64f9b10cecdb4e22a9d52ad9c7efa" integrity sha512-CYR+U/wRxLbrfYN3dh+0Tb6mFaxJKfdyz+wNql6cqTrA0BBi9k6J3AaKXj273TqvEpyyXegQFFkZEiuZdYtgJw== @@ -9012,7 +8974,7 @@ ember-style-modifier@^0.6.0: ember-cli-babel "^7.21.0" ember-modifier "^2.1.0" -ember-template-lint@^2.18.1, ember-template-lint@^2.4.0: +ember-template-lint@^2.18.1: version "2.21.0" resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-2.21.0.tgz#7e120abf309a8810eeed26c52377943faf15a95b" integrity sha512-19QbEqJQdMfcRS7PsQsubflRowEtnkbD0tpYR4q/xq4lodmhU7hhOFvlTQgbxD/jwW5Ur+tkOwH4KFy9JwOyXA== @@ -9403,7 +9365,7 @@ eslint-plugin-ember@^10.2.0, eslint-plugin-ember@^10.3.0: requireindex "^1.2.0" snake-case "^3.0.3" -eslint-plugin-ember@^7.0.0, eslint-plugin-ember@^7.10.1: +eslint-plugin-ember@^7.0.0: version "7.13.0" resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-7.13.0.tgz#a1df7794f06cdc6e1b8acfe6c59db5cf861f53dc" integrity sha512-qIbw4uP0qUJoiWF4+7MTJWqwEN86RGmBNId0cwSoHoVNWtcw50R1ajYgxM1Q5FVUdoisVeSl9lKVRh5zkDFl+g== @@ -9461,7 +9423,7 @@ eslint-plugin-node@^11.1.0: resolve "^1.10.1" semver "^6.1.0" -eslint-plugin-node@^9.0.0, eslint-plugin-node@^9.0.1: +eslint-plugin-node@^9.0.1: version "9.2.0" resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-9.2.0.tgz#b1911f111002d366c5954a6d96d3cd5bf2a3036a" integrity sha512-2abNmzAH/JpxI4gEOwd6K8wZIodK3BmHbTxz4s79OIYwwIt2gkpEXlAouJXu4H1c9ySTnRso0tsuthSOZbUMlA== @@ -9480,7 +9442,7 @@ eslint-plugin-prettier@^3.1.4, eslint-plugin-prettier@^3.3.1: dependencies: prettier-linter-helpers "^1.0.0" -eslint-scope@5.1.1, eslint-scope@^5.0.0, eslint-scope@^5.1.1: +eslint-scope@5.1.1, eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== @@ -9496,7 +9458,7 @@ eslint-scope@^4.0.3: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.3.1, eslint-utils@^1.4.2, eslint-utils@^1.4.3: +eslint-utils@^1.3.1, eslint-utils@^1.4.2: version "1.4.3" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== @@ -9569,49 +9531,6 @@ eslint@^5.6.0: table "^5.2.3" text-table "^0.2.0" -eslint@^6.8.0: - version "6.8.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb" - integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig== - dependencies: - "@babel/code-frame" "^7.0.0" - ajv "^6.10.0" - chalk "^2.1.0" - cross-spawn "^6.0.5" - debug "^4.0.1" - doctrine "^3.0.0" - eslint-scope "^5.0.0" - eslint-utils "^1.4.3" - eslint-visitor-keys "^1.1.0" - espree "^6.1.2" - esquery "^1.0.1" - esutils "^2.0.2" - file-entry-cache "^5.0.1" - functional-red-black-tree "^1.0.1" - glob-parent "^5.0.0" - globals "^12.1.0" - ignore "^4.0.6" - import-fresh "^3.0.0" - imurmurhash "^0.1.4" - inquirer "^7.0.0" - is-glob "^4.0.0" - js-yaml "^3.13.1" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.3.0" - lodash "^4.17.14" - minimatch "^3.0.4" - mkdirp "^0.5.1" - natural-compare "^1.4.0" - optionator "^0.8.3" - progress "^2.0.0" - regexpp "^2.0.1" - semver "^6.1.2" - strip-ansi "^5.2.0" - strip-json-comments "^3.0.1" - table "^5.2.3" - text-table "^0.2.0" - v8-compile-cache "^2.0.3" - eslint@^7.14.0, eslint@^7.20.0, eslint@^7.23.0: version "7.28.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz#435aa17a0b82c13bb2be9d51408b617e49c1e820" @@ -9671,15 +9590,6 @@ espree@^5.0.1: acorn-jsx "^5.0.0" eslint-visitor-keys "^1.0.0" -espree@^6.1.2: - version "6.2.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a" - integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw== - dependencies: - acorn "^7.1.1" - acorn-jsx "^5.2.0" - eslint-visitor-keys "^1.1.0" - espree@^7.3.0, espree@^7.3.1: version "7.3.1" resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" @@ -10069,9 +9979,7 @@ fast-sourcemap-concat@^2.1.0: "fastboot-addon@link:test-packages/fastboot-addon": version "0.0.0" - dependencies: - ember-cli-babel "^7.20.5" - ember-cli-htmlbars "^4.2.3" + uid "" fastboot-express-middleware@^2.0.0: version "2.0.0" @@ -10839,7 +10747,7 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" -glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.0: +glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.0: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -10906,13 +10814,6 @@ globals@^11.1.0, globals@^11.7.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^12.1.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" - integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== - dependencies: - type-fest "^0.8.1" - globals@^13.6.0, globals@^13.9.0: version "13.9.0" resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb" @@ -11651,7 +11552,7 @@ inquirer@^6, inquirer@^6.2.2: strip-ansi "^5.1.0" through "^2.3.6" -inquirer@^7.0.0, inquirer@^7.0.1, inquirer@^7.3.3: +inquirer@^7.3.3: version "7.3.3" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA== @@ -14138,7 +14039,16 @@ npm-package-arg@^6.1.1: semver "^5.6.0" validate-npm-package-name "^3.0.0" -npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.1: +npm-package-arg@^8.0.0: + version "8.1.5" + resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44" + integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q== + dependencies: + hosted-git-info "^4.0.1" + semver "^7.3.4" + validate-npm-package-name "^3.0.0" + +npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.1: version "8.1.4" resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.4.tgz#8001cdbc4363997b8ef6c6cf7aaf543c5805879d" integrity sha512-xLokoCFqj/rPdr3LvcdDL6Kj6ipXGEDHD/QGpzwU6/pibYUOXmp5DBmg76yukFyx4ZDbrXNOTn+BPyd8TD4Jlw== @@ -14319,7 +14229,7 @@ onetime@^5.1.0, onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" -optionator@^0.8.1, optionator@^0.8.2, optionator@^0.8.3: +optionator@^0.8.1, optionator@^0.8.2: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== @@ -16827,7 +16737,7 @@ strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= -strip-json-comments@^3.0.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: +strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== @@ -17046,7 +16956,7 @@ terser@^3.7.5: source-map "~0.6.1" source-map-support "~0.5.10" -terser@^4.1.2, terser@^4.3.9: +terser@^4.1.2: version "4.8.0" resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw== @@ -17485,11 +17395,6 @@ type-fest@^0.21.3: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -18201,11 +18106,6 @@ workerpool@^3.1.1: object-assign "4.1.1" rsvp "^4.8.4" -workerpool@^5.0.1: - version "5.0.4" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-5.0.4.tgz#4f67cb70ff7550a27ab94de25b0b843cd92059a2" - integrity sha512-Sywova24Ow2NQ24JPB68bI89EdqMDjUXo4OpofK/QMD7C2ZVMloYBgQ5J3PChcBJHj2vspsmGx1/3nBKXtUkXQ== - workerpool@^6.0.0, workerpool@^6.0.3, workerpool@^6.1.4: version "6.1.4" resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.4.tgz#6a972b6df82e38d50248ee2820aa98e2d0ad3090"