ember-source 4.1.0-alpha.2 → 4.1.0-alpha.6

package/lib/index.js

@@ -3,7 +3,6 @@
 const MergeTrees = require('broccoli-merge-trees');
 const Funnel = require('broccoli-funnel');
 const path = require('path');
-const resolve = require('resolve');
 const concatBundle = require('./concat-bundle');
 const buildDebugMacroPlugin = require('./build-debug-macro-plugin');
 const buildStripClassCallcheckPlugin = require('./build-strip-class-callcheck-plugin');
@@ -33,7 +32,6 @@ function add(paths, name, path) {
 add(paths, 'prod', 'vendor/ember/ember.js');
 add(paths, 'debug', 'vendor/ember/ember.js');
 add(paths, 'testing', 'vendor/ember/ember-testing.js');
-add(paths, 'jquery', 'vendor/ember/jquery/jquery.js');
 
 add(
   absolutePaths,
@@ -65,7 +63,6 @@ module.exports = {
   name: 'ember-source',
   paths,
   absolutePaths,
-  _jqueryIntegrationEnabled: true,
   _overrideTree: undefined,
 
   included() {
@@ -95,25 +92,6 @@ module.exports = {
         );
       }
 
-      if (
-        optionalFeaturesMissing ||
-        typeof optionalFeatures.isFeatureExplicitlySet !== 'function'
-      ) {
-        message.push(
-          '* Unable to detect if jquery-integration is explicitly set to a value, please update `@ember/optional-features` to the latest version'
-        );
-      }
-
-      if (
-        optionalFeaturesMissing ||
-        (typeof optionalFeatures.isFeatureExplicitlySet === 'function' &&
-          !optionalFeatures.isFeatureExplicitlySet('jquery-integration'))
-      ) {
-        message.push(
-          `* The jquery-integration optional feature should be explicitly set to a value under Octane, run \`ember feature:disable jquery-integration\` to disable it, or \`ember feature:enable jquery-integration\` to explicitly enable it`
-        );
-      }
-
       if (
         optionalFeaturesMissing ||
         optionalFeatures.isFeatureEnabled('application-template-wrapper')
@@ -164,12 +142,15 @@ module.exports = {
       }
     }
 
-    this._jqueryIntegrationEnabled =
-      optionalFeaturesMissing || optionalFeatures.isFeatureEnabled('jquery-integration');
-
-    if (this._jqueryIntegrationEnabled) {
-      this.ui.writeWarnLine(
-        'Setting the `jquery-integration` optional feature flag to `true`, or not providing a setting at all, has been deprecated. You must add the `@ember/optional-features` addon and set this feature to `false`. This warning will become an error in Ember 4.0.0.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_optional-feature-jquery-integration'
+    if (
+      !optionalFeaturesMissing &&
+      optionalFeatures.isFeatureEnabled('jquery-integration') &&
+      typeof optionalFeatures.isFeatureExplicitlySet === 'function' &&
+      optionalFeatures.isFeatureExplicitlySet('jquery-integration')
+    ) {
+      const SilentError = require('silent-error');
+      throw new SilentError(
+        'Setting the `jquery-integration` optional feature flag to `true` was deprecated in Ember 3.x and removed in Ember 4.0.0. You must add the `@ember/optional-features` addon and set this feature to `false`.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_optional-feature-jquery-integration'
       );
     }
   },
@@ -237,10 +218,7 @@ module.exports = {
       false
     );
 
-    let exclude = [
-      isProduction ? 'ember-testing/**' : null,
-      !this._jqueryIntegrationEnabled ? 'jquery' : null,
-    ].filter((value) => value !== null);
+    let exclude = isProduction ? ['ember-testing/**'] : [];
 
     let emberFiles = new MergeTrees([new Funnel(packages, { exclude }), dependencies, headerFiles]);
 
@@ -270,21 +248,6 @@ module.exports = {
   },
 
   treeForVendor(tree) {
-    let jqueryPath;
-
-    try {
-      jqueryPath = path.dirname(
-        resolve.sync('jquery/package.json', { basedir: this.project.root })
-      );
-    } catch (error) {
-      jqueryPath = path.dirname(require.resolve('jquery/package.json'));
-    }
-
-    let jquery = new Funnel(jqueryPath + '/dist', {
-      destDir: 'ember/jquery',
-      files: ['jquery.js'],
-    });
-
     let templateCompiler = new Funnel(tree, {
       destDir: 'ember',
       include: ['ember-template-compiler.js', 'ember-template-compiler.map'],
@@ -319,6 +282,6 @@ module.exports = {
       });
     }
 
-    return debugTree(new MergeTrees([ember, templateCompiler, jquery]), 'vendor:final');
+    return debugTree(new MergeTrees([ember, templateCompiler]), 'vendor:final');
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.1.0-alpha.2",
+  "version": "4.1.0-alpha.6",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"
@@ -47,18 +47,19 @@
     "test:browserstack": "node bin/run-browserstack-tests.js"
   },
   "dependencies": {
-    "@babel/helper-module-imports": "^7.8.3",
-    "@babel/plugin-transform-block-scoping": "^7.8.3",
+    "@babel/helper-module-imports": "^7.16.0",
+    "@babel/plugin-transform-block-scoping": "^7.16.0",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.80.0",
-    "babel-plugin-debug-macros": "^0.3.3",
+    "@glimmer/vm-babel-plugins": "0.80.2",
+    "babel-plugin-debug-macros": "^0.3.4",
     "babel-plugin-filter-imports": "^4.0.0",
-    "broccoli-concat": "^4.2.4",
+    "broccoli-concat": "^4.2.5",
     "broccoli-debug": "^0.6.4",
     "broccoli-file-creator": "^2.1.1",
     "broccoli-funnel": "^2.0.2",
     "broccoli-merge-trees": "^4.2.0",
     "chalk": "^4.0.0",
+    "ember-auto-import": "^2.2.0",
     "ember-cli-babel": "^7.23.0",
     "ember-cli-get-component-path-option": "^1.0.0",
     "ember-cli-is-package-missing": "^1.0.0",
@@ -67,30 +68,29 @@
     "ember-cli-string-utils": "^1.1.0",
     "ember-cli-version-checker": "^5.1.1",
     "ember-router-generator": "^2.0.0",
-    "inflection": "^1.12.0",
-    "jquery": "^3.5.1",
+    "inflection": "^1.13.1",
     "resolve": "^1.17.0",
     "semver": "^7.3.4",
     "silent-error": "^1.1.1"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.80.0",
-    "@glimmer/destroyable": "0.80.0",
+    "@glimmer/compiler": "0.80.2",
+    "@glimmer/destroyable": "0.80.2",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.80.0",
-    "@glimmer/interfaces": "0.80.0",
-    "@glimmer/manager": "0.80.0",
-    "@glimmer/node": "0.80.0",
-    "@glimmer/opcode-compiler": "0.80.0",
-    "@glimmer/owner": "0.80.0",
-    "@glimmer/program": "0.80.0",
-    "@glimmer/reference": "0.80.0",
-    "@glimmer/runtime": "0.80.0",
-    "@glimmer/validator": "0.80.0",
+    "@glimmer/global-context": "0.80.2",
+    "@glimmer/interfaces": "0.80.2",
+    "@glimmer/manager": "0.80.2",
+    "@glimmer/node": "0.80.2",
+    "@glimmer/opcode-compiler": "0.80.2",
+    "@glimmer/owner": "0.80.2",
+    "@glimmer/program": "0.80.2",
+    "@glimmer/reference": "0.80.2",
+    "@glimmer/runtime": "0.80.2",
+    "@glimmer/validator": "0.80.2",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.1",
-    "@types/rsvp": "^4.0.3",
+    "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^4.3.0",
     "@typescript-eslint/parser": "^4.3.0",
     "auto-dist-tag": "^1.0.0",
@@ -101,7 +101,7 @@
     "broccoli-persistent-filter": "^2.3.1",
     "broccoli-plugin": "^4.0.3",
     "broccoli-rollup": "^2.1.1",
-    "broccoli-source": "^3.0.0",
+    "broccoli-source": "^3.0.1",
     "broccoli-string-replace": "^0.1.2",
     "broccoli-typescript-compiler": "^7.0.0",
     "broccoli-uglify-sourcemap": "^3.2.0",
@@ -110,27 +110,27 @@
     "dag-map": "^2.0.2",
     "ember-cli": "^3.12.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
-    "ember-cli-browserstack": "^1.1.0",
+    "ember-cli-browserstack": "^2.0.1",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-yuidoc": "^0.9.1",
     "ember-publisher": "0.0.7",
-    "eslint": "^7.9.0",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-import-resolver-node": "^0.3.3",
     "eslint-plugin-disable-features": "^0.1.3",
-    "eslint-plugin-ember-internal": "^1.1.1",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-ember-internal": "^2.0.0",
+    "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.3.1",
-    "eslint-plugin-qunit": "^4.0.0",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-qunit": "^6.2.0",
     "execa": "^5.1.1",
-    "expect-type": "^0.11.0",
+    "expect-type": "^0.12.0",
     "express": "^4.17.1",
     "finalhandler": "^1.1.2",
     "fs-extra": "^9.1.0",
     "git-repo-info": "^2.1.1",
     "github": "^0.2.3",
-    "glob": "^7.1.7",
+    "glob": "^7.2.0",
     "html-differ": "^1.4.0",
     "lodash.uniq": "^4.5.0",
     "mkdirp": "^1.0.4",
@@ -145,18 +145,18 @@
     "rsvp": "^4.8.5",
     "serve-static": "^1.14.1",
     "simple-dom": "^1.4.0",
-    "testem": "^3.1.0",
+    "testem": "^3.6.0",
     "testem-failure-only-reporter": "^0.0.1",
     "tslint": "^5.20.1",
     "typescript": "^4.2.4"
   },
   "engines": {
-    "node": "10.* || >= 12.*"
+    "node": ">= 12.*"
   },
   "ember-addon": {
     "after": "ember-cli-legacy-blueprints"
   },
-  "_originalVersion": "4.1.0-alpha.2",
+  "_originalVersion": "4.1.0-alpha.6",
   "_versionPreviouslyCalculated": true,
   "publishConfig": {
     "tag": "alpha"

package/dist/packages/@ember/-internals/views/lib/system/jquery.js

@@ -1,26 +0,0 @@
-import { context } from '@ember/-internals/environment';
-import { hasDOM } from '@ember/-internals/browser-environment';
-import { ENV } from '@ember/-internals/environment';
-import { JQUERY_INTEGRATION } from '@ember/deprecated-features';
-export let jQuery;
-export let jQueryDisabled = !JQUERY_INTEGRATION || ENV._JQUERY_INTEGRATION === false;
-
-if (JQUERY_INTEGRATION && hasDOM) {
-  jQuery = context.imports.jQuery;
-
-  if (!jQueryDisabled && jQuery) {
-    if (jQuery.event.addProp) {
-      jQuery.event.addProp('dataTransfer');
-    } else {
-      // http://www.whatwg.org/specs/web-apps/current-work/multipage/dnd.html#dndevents
-      ['dragstart', 'drag', 'dragenter', 'dragleave', 'dragover', 'drop', 'dragend'].forEach(eventName => {
-        jQuery.event.fixHooks[eventName] = {
-          props: ['dataTransfer']
-        };
-      });
-    }
-  } else {
-    jQuery = undefined;
-    jQueryDisabled = true;
-  }
-}

package/dist/packages/jquery/index.js

@@ -1,2 +0,0 @@
-import { jQuery } from '@ember/-internals/views';
-export default jQuery;