ember-source 4.0.0-beta.6 → 4.0.0-beta.7

package/dist/header/license.js

@@ -5,5 +5,5 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   4.0.0-beta.6
+ * @version   4.0.0-beta.7
  */

package/dist/packages/ember/version.js

@@ -1 +1 @@
-export default "4.0.0-beta.6";
+export default "4.0.0-beta.7";

package/docs/data.json

@@ -3,7 +3,7 @@
     "name": "The Ember API",
     "description": "The Ember API: a framework for building ambitious web applications",
     "url": "https://emberjs.com/",
-    "version": "4.0.0-beta.6"
+    "version": "4.0.0-beta.7"
   },
   "files": {
     "node_modules/rsvp/lib/rsvp/promise/all.js": {

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.0.0-beta.6",
+  "version": "4.0.0-beta.7",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"
@@ -69,7 +69,6 @@
     "ember-cli-version-checker": "^5.1.1",
     "ember-router-generator": "^2.0.0",
     "inflection": "^1.12.0",
-    "jquery": "^3.5.1",
     "resolve": "^1.17.0",
     "semver": "^7.3.4",
     "silent-error": "^1.1.1"
@@ -157,7 +156,7 @@
   "ember-addon": {
     "after": "ember-cli-legacy-blueprints"
   },
-  "_originalVersion": "4.0.0-beta.6",
+  "_originalVersion": "4.0.0-beta.7",
   "_versionPreviouslyCalculated": true,
   "publishConfig": {
     "tag": "beta"

package/dist/packages/jquery/index.js

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