Merge pull request #19463 from emberjs/add-remaining-real-ember-modules

lib/index.js

@@ -64,6 +64,7 @@ module.exports = {
   name: 'ember-source',
   paths,
   absolutePaths,
+  _jqueryIntegrationEnabled: true,
 
   included() {
     this._super.included.apply(this, arguments);
@@ -151,7 +152,10 @@ module.exports = {
       }
     }
 
-    if (optionalFeaturesMissing || optionalFeatures.isFeatureEnabled('jquery-integration')) {
+    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'
       );
@@ -218,7 +222,10 @@ module.exports = {
       false
     );
 
-    let exclude = isProduction ? ['ember-testing/**'] : [];
+    let exclude = [
+      isProduction ? 'ember-testing/**' : null,
+      !this._jqueryIntegrationEnabled ? 'jquery' : null,
+    ].filter((value) => value !== null);
 
     let emberFiles = new MergeTrees([new Funnel(packages, { exclude }), dependencies, headerFiles]);
 

packages/@ember/-internals/glimmer/lib/utils/string.ts

@@ -75,7 +75,7 @@ export function escapeExpression(string: any): string {
   @return {SafeString} A string that will not be HTML escaped by Handlebars.
   @public
 */
-export function htmlSafe(str: string) {
+export function htmlSafe(str: string): SafeString {
   if (str === null || str === undefined) {
     str = '';
   } else if (typeof str !== 'string') {

packages/@ember/application/deprecations.ts

@@ -0,0 +1,39 @@
+import {
+  deprecate as _deprecate,
+  deprecateFunc as _deprecateFunc,
+  DeprecationOptions,
+} from '@ember/debug';
+
+export function deprecate(message: string, condition: boolean, options: DeprecationOptions): void {
+  deprecate(
+    "`import { deprecate } from '@ember/application/deprecations';` has been deprecated, please update to `import { deprecate } from '@ember/debug';`",
+    false,
+    {
+      id: 'old-deprecate-method-paths',
+      until: '4.0.0',
+      for: 'ember-source',
+      since: {
+        enabled: '3.0.0',
+      },
+    }
+  );
+
+  _deprecate(message, condition, options);
+}
+
+export function deprecateFunc(message: string, options: DeprecationOptions, func: Function): void {
+  deprecate(
+    "`import { deprecateFunc } from '@ember/application/deprecations';` has been deprecated, please update to `import { deprecateFunc } from '@ember/debug';`",
+    false,
+    {
+      id: 'old-deprecate-method-paths',
+      until: '4.0.0',
+      for: 'ember-source',
+      since: {
+        enabled: '3.0.0',
+      },
+    }
+  );
+
+  _deprecateFunc(message, options, func);
+}

packages/@ember/application/namespace.js

@@ -0,0 +1 @@
+export { Namespace as default } from '@ember/-internals/runtime';

packages/@ember/application/resolver.js

@@ -0,0 +1 @@
+export { default } from './globals-resolver';

packages/@ember/array/index.js

@@ -0,0 +1,2 @@
+export { Array as default, isArray, A } from '@ember/-internals/runtime';
+export { makeArray } from '@ember/-internals/utils';

packages/@ember/array/mutable.js

@@ -0,0 +1 @@
+export { MutableArray as default } from '@ember/-internals/runtime';

packages/@ember/array/proxy.js

@@ -0,0 +1 @@
+export { ArrayProxy as default } from '@ember/-internals/runtime';

packages/@ember/component/checkbox.ts

@@ -0,0 +1,21 @@
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { deprecate } from '@ember/debug';
+
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  deprecate(
+    `Using Ember.Checkbox or importing from 'Checkbox' has been deprecated, install the ` +
+      `\`ember-legacy-built-in-components\` addon and use \`import { Checkbox } from ` +
+      `'ember-legacy-built-in-components';\` instead`,
+    false,
+    {
+      id: 'ember.legacy-built-in-components',
+      until: '4.0.0',
+      for: 'ember-source',
+      since: {
+        // TODO: update this when enabling the feature
+      },
+    }
+  );
+}
+
+export { Checkbox as default } from '@ember/-internals/glimmer';

packages/@ember/component/helper.ts

@@ -0,0 +1 @@
+export { Helper as default, helper } from '@ember/-internals/glimmer';

packages/@ember/component/index.ts

@@ -1 +1,6 @@
-export { Component } from '@ember/-internals/glimmer';
+export { setComponentTemplate, getComponentTemplate } from '@glimmer/manager';
+export { Component as default, Input } from '@ember/-internals/glimmer';
+export {
+  componentCapabilities as capabilities,
+  setComponentManager,
+} from '@ember/-internals/glimmer';

packages/@ember/component/text-area.ts

@@ -0,0 +1,21 @@
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { deprecate } from '@ember/debug';
+
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  deprecate(
+    `Using Ember.TextArea or importing from 'TextArea' has been deprecated, install the ` +
+      `\`ember-legacy-built-in-components\` addon and use \`import { TextArea } from ` +
+      `'ember-legacy-built-in-components';\` instead`,
+    false,
+    {
+      id: 'ember.legacy-built-in-components',
+      until: '4.0.0',
+      for: 'ember-source',
+      since: {
+        // TODO: update this when enabling the feature
+      },
+    }
+  );
+}
+
+export { TextArea as default } from '@ember/-internals/glimmer';

packages/@ember/component/text-field.ts

@@ -0,0 +1,21 @@
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { deprecate } from '@ember/debug';
+
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  deprecate(
+    `Using Ember.TextField or importing from 'TextField' has been deprecated, install the ` +
+      `\`ember-legacy-built-in-components\` addon and use \`import { TextField } from ` +
+      `'ember-legacy-built-in-components';\` instead`,
+    false,
+    {
+      id: 'ember.legacy-built-in-components',
+      until: '4.0.0',
+      for: 'ember-source',
+      since: {
+        // TODO: update this when enabling the feature
+      },
+    }
+  );
+}
+
+export { TextField as default } from '@ember/-internals/glimmer';

packages/@ember/debug/container-debug-adapter.js

@@ -0,0 +1 @@
+export { ContainerDebugAdapter as default } from '@ember/-internals/extension-support';

packages/@ember/debug/data-adapter.js

@@ -0,0 +1 @@
+export { DataAdapter as default } from '@ember/-internals/extension-support';

packages/@ember/debug/index.ts

@@ -5,10 +5,12 @@ import _deprecate, { DeprecateFunc, DeprecationOptions } from './lib/deprecate';
 import { isTesting } from './lib/testing';
 import _warn, { WarnFunc } from './lib/warn';
 
+export { inspect } from '@ember/-internals/utils';
 export { registerHandler as registerWarnHandler } from './lib/warn';
 export { registerHandler as registerDeprecationHandler } from './lib/deprecate';
 export { isTesting, setTesting } from './lib/testing';
 export { default as captureRenderTree } from './lib/capture-render-tree';
+export { DeprecationOptions } from './lib/deprecate';
 
 export type DebugFunctionType =
   | 'assert'

packages/@ember/enumerable/index.js

@@ -0,0 +1 @@
+export { Enumerable as default } from '@ember/-internals/runtime';

packages/@ember/helper/index.ts

@@ -304,5 +304,5 @@
   @public
 */
 
-export { setHelperManager, helperCapabilities as capabilties } from '@glimmer/manager';
-export { invokeHelper } from '@glimmer/runtime';
+export { setHelperManager, helperCapabilities as capabilities } from '@glimmer/manager';
+export { invokeHelper, hash, array, concat, get, on, fn } from '@glimmer/runtime';

packages/@ember/modifier/index.ts

@@ -1 +1,2 @@
-export { setModifierManager, modifierCapabilities as capabilties } from '@glimmer/manager';
+export { setModifierManager } from '@glimmer/manager';
+export { modifierCapabilities as capabilities } from '@ember/-internals/glimmer';

packages/@ember/object/computed.js

@@ -1,3 +1,5 @@
+export { ComputedProperty as default, expandProperties, alias } from '@ember/-internals/metal';
+
 export {
   empty,
   notEmpty,
@@ -11,6 +13,7 @@ export {
   lt,
   lte,
   oneWay,
+  oneWay as reads,
   readOnly,
   deprecatingAlias,
   and,

packages/@ember/object/core.js

@@ -0,0 +1 @@
+export { CoreObject as default } from '@ember/-internals/runtime';

packages/@ember/object/evented.js

@@ -0,0 +1,2 @@
+export { Evented as default } from '@ember/-internals/runtime';
+export { on } from '@ember/-internals/metal';

packages/@ember/object/events.js

@@ -0,0 +1 @@
+export { addListener, removeListener, sendEvent } from '@ember/-internals/metal';

packages/@ember/object/index.js

@@ -2,6 +2,22 @@ import { assert } from '@ember/debug';
 import { assign } from '@ember/polyfills';
 import { isElementDescriptor, setClassicDecorator } from '@ember/-internals/metal';
 
+export { Object as default } from '@ember/-internals/runtime';
+
+export {
+  notifyPropertyChange,
+  defineProperty,
+  get,
+  set,
+  getProperties,
+  setProperties,
+  getWithDefault,
+  observer,
+  computed,
+  trySet,
+  aliasMethod,
+} from '@ember/-internals/metal';
+
 /**
   Decorator that turns the target function into an Action which can be accessed
   directly by reference.

packages/@ember/object/internals.js

@@ -0,0 +1,3 @@
+export { getCachedValueFor as cacheFor } from '@ember/-internals/metal';
+export { copy } from '@ember/-internals/runtime';
+export { guidFor } from '@ember/-internals/utils';

packages/@ember/object/mixin.js

@@ -0,0 +1 @@
+export { Mixin as default } from '@ember/-internals/metal';

packages/@ember/object/observable.js

@@ -0,0 +1 @@
+export { Observable as default } from '@ember/-internals/runtime';

packages/@ember/object/observers.js

@@ -0,0 +1 @@
+export { addObserver, removeObserver } from '@ember/-internals/metal';

packages/@ember/object/promise-proxy-mixin.js

@@ -0,0 +1 @@
+export { PromiseProxyMixin as default } from '@ember/-internals/runtime';

packages/@ember/object/proxy.js

@@ -0,0 +1 @@
+export { ObjectProxy as default } from '@ember/-internals/runtime';

packages/@ember/polyfills/index.ts

@@ -6,3 +6,5 @@ let merge = MERGE ? deprecatedMerge : undefined;
 // Export `assignPolyfill` for testing
 export { default as assign, assign as assignPolyfill } from './lib/assign';
 export { merge };
+
+export const hasPropertyAccessors = true;

packages/@ember/routing/auto-location.js

@@ -0,0 +1 @@
+export { AutoLocation as default } from '@ember/-internals/routing';

packages/@ember/routing/hash-location.js

@@ -0,0 +1 @@
+export { HashLocation as default } from '@ember/-internals/routing';

packages/@ember/routing/history-location.js

@@ -0,0 +1 @@
+export { HistoryLocation as default } from '@ember/-internals/routing';

packages/@ember/routing/index.ts

@@ -0,0 +1 @@
+export { LinkComponent as LinkTo } from '@ember/-internals/glimmer';

packages/@ember/routing/link-component.ts

@@ -0,0 +1,21 @@
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { deprecate } from '@ember/debug';
+
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  deprecate(
+    `Using Ember.LinkComponent or importing from 'LinkComponent' has been deprecated, install the ` +
+      `\`ember-legacy-built-in-components\` addon and use \`import { LinkComponent } from ` +
+      `'ember-legacy-built-in-components';\` instead`,
+    false,
+    {
+      id: 'ember.legacy-built-in-components',
+      until: '4.0.0',
+      for: 'ember-source',
+      since: {
+        // TODO: update this when enabling the feature
+      },
+    }
+  );
+}
+
+export { LinkComponent as default } from '@ember/-internals/glimmer';

packages/@ember/routing/location.js

@@ -0,0 +1 @@
+export { Location as default } from '@ember/-internals/routing';

packages/@ember/routing/none-location.js

@@ -0,0 +1 @@
+export { NoneLocation as default } from '@ember/-internals/routing';

packages/@ember/routing/route.js

@@ -0,0 +1 @@
+export { Route as default } from '@ember/-internals/routing';

packages/@ember/routing/router.js

@@ -0,0 +1 @@
+export { Router as default } from '@ember/-internals/routing';

packages/@ember/string/index.ts

@@ -9,6 +9,12 @@ import { Cache } from '@ember/-internals/utils';
 import { deprecate } from '@ember/debug';
 import { getString } from './lib/string_registry';
 
+import {
+  htmlSafe as internalHtmlSafe,
+  isHTMLSafe as internalIsHtmlSafe,
+  SafeString,
+} from '@ember/-internals/glimmer';
+
 const STRING_DASHERIZE_REGEXP = /[ _]/g;
 
 const STRING_DASHERIZE_CACHE = new Cache<string, string>(1000, (key) =>
@@ -294,6 +300,35 @@ export function capitalize(str: string): string {
   return CAPITALIZE_CACHE.get(str);
 }
 
+function deprecateImportFromString(
+  name: string,
+  message = `Importing ${name} from '@ember/string' is deprecated. Please import ${name} from '@ember/template' instead.`
+) {
+  // Disabling this deprecation due to unintended errors in 3.25
+  // See https://github.com/emberjs/ember.js/issues/19393 fo more information.
+  deprecate(message, true, {
+    id: 'ember-string.htmlsafe-ishtmlsafe',
+    for: 'ember-source',
+    since: {
+      enabled: '3.25',
+    },
+    until: '4.0.0',
+    url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-string-htmlsafe-ishtmlsafe',
+  });
+}
+
+export function htmlSafe(str: string): SafeString {
+  deprecateImportFromString('htmlSafe');
+
+  return internalHtmlSafe(str);
+}
+
+export function isHTMLSafe(str: any | null | undefined): str is SafeString {
+  deprecateImportFromString('isHTMLSafe');
+
+  return internalIsHtmlSafe(str);
+}
+
 if (ENV.EXTEND_PROTOTYPES.String) {
   let deprecateEmberStringPrototypeExtension = function (
     name: string,

packages/@ember/template-compilation/index.js

@@ -0,0 +1,13 @@
+import { DEBUG } from '@glimmer/env';
+
+export { compile as compileTemplate } from 'ember-template-compiler';
+
+export let precompileTemplate;
+
+if (DEBUG) {
+  precompileTemplate = () => {
+    throw new Error(
+      'Attempted to call `precompileTemplate` at runtime, but this API is meant to be used at compile time. You should use `compileTemplate` instead.'
+    );
+  };
+}

packages/@ember/template-factory/index.js

@@ -0,0 +1 @@
+export { templateFactory as createTemplateFactory } from '@glimmer/opcode-compiler';

packages/@ember/template/index.ts

@@ -0,0 +1 @@
+export { htmlSafe, isHTMLSafe } from '@ember/-internals/glimmer';

packages/@ember/test/adapter.js

@@ -0,0 +1,3 @@
+import { Test } from 'ember-testing';
+
+export default Test.Adapter;

packages/@ember/test/index.js

@@ -0,0 +1,11 @@
+import { Test } from 'ember-testing';
+
+const {
+  registerAsyncHelper,
+  registerHelper,
+  registerWaiter,
+  unregisterHelper,
+  unregisterWaiter,
+} = Test;
+
+export { registerAsyncHelper, registerHelper, registerWaiter, unregisterHelper, unregisterWaiter };

packages/@ember/utils/index.js

@@ -0,0 +1,3 @@
+export { isNone, isBlank, isEmpty, isPresent } from '@ember/-internals/metal';
+export { tryInvoke } from '@ember/-internals/utils';
+export { compare, isEqual, typeOf } from '@ember/-internals/runtime';

packages/@ember/version/index.js

@@ -0,0 +1 @@
+export { default as VERSION } from 'ember/version';

packages/@glimmer/tracking/index.ts

@@ -0,0 +1 @@
+export { tracked } from '@ember/-internals/metal';

packages/@glimmer/tracking/primitives/cache.ts

@@ -0,0 +1 @@
+export { createCache, getValue, isConst } from '@ember/-internals/metal';