Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move @glimmer/tracking to actual @glimmer/tracking #20815

Draft
wants to merge 10 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion broccoli/amd-compat-entrypoints/ember.debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ d('@glimmer/reference', glimmerReference);
import * as glimmerRuntime from '@glimmer/runtime';
d('@glimmer/runtime', glimmerRuntime);

import * as glimmerTrackingIndex from '@glimmer/tracking/index';
import * as glimmerTrackingIndex from '@glimmer/tracking';
d('@glimmer/tracking/index', glimmerTrackingIndex);

import * as glimmerTrackingPrimitivesCache from '@glimmer/tracking/primitives/cache';
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"url": "git+https://github.com/emberjs/ember.js.git"
},
"scripts": {
"prepare": "pnpm build",
"build:js": "rollup --config",
"build:types": "node types/publish.mjs",
"build": "npm-run-all build:*",
Expand Down Expand Up @@ -113,6 +114,7 @@
"@babel/types": "^7.22.5",
"@embroider/shared-internals": "^2.5.0",
"@glimmer/component": "workspace:^",
"@glimmer/tracking": "workspace:^",
"@rollup/plugin-babel": "^6.0.4",
"@simple-dom/document": "^1.4.0",
"@swc-node/register": "^1.6.8",
Expand Down Expand Up @@ -343,8 +345,6 @@
"@glimmer/program/index.js": "ember-source/@glimmer/program/index.js",
"@glimmer/reference/index.js": "ember-source/@glimmer/reference/index.js",
"@glimmer/runtime/index.js": "ember-source/@glimmer/runtime/index.js",
"@glimmer/tracking/index.js": "ember-source/@glimmer/tracking/index.js",
"@glimmer/tracking/primitives/cache.js": "ember-source/@glimmer/tracking/primitives/cache.js",
"@glimmer/util/index.js": "ember-source/@glimmer/util/index.js",
"@glimmer/validator/index.js": "ember-source/@glimmer/validator/index.js",
"@glimmer/vm/index.js": "ember-source/@glimmer/vm/index.js",
Expand Down Expand Up @@ -399,4 +399,4 @@
"node": "16.20.0",
"pnpm": "8.10.0"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { tracked } from '@ember/-internals/metal';
import { tracked } from '@glimmer/tracking';

Check failure on line 1 in packages/@ember/-internals/glimmer/lib/components/abstract-input.ts

View workflow job for this annotation

GitHub Actions / Linting

Unable to resolve path to module '@glimmer/tracking'
import { assert } from '@ember/debug';
import { action } from '@ember/object';
import type { Reference } from '@glimmer/reference';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import Route from '@ember/routing/route';
import { service } from '@ember/service';
import { Component } from '@ember/-internals/glimmer';
import { tracked } from '@ember/-internals/metal';
import { tracked } from '@glimmer/tracking';

Check failure on line 7 in packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js

View workflow job for this annotation

GitHub Actions / Linting

Unable to resolve path to module '@glimmer/tracking'
import { set } from '@ember/object';
import { backtrackingMessageFor } from '../../utils/debug-stack';
import { runTask } from '../../../../../../internal-test-helpers/lib/run';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import { action } from '@ember/object';
import { run } from '@ember/runloop';
import { DEBUG } from '@glimmer/env';
import { tracked } from '@ember/-internals/metal';
import { tracked } from '@glimmer/tracking';

Check failure on line 16 in packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js

View workflow job for this annotation

GitHub Actions / Linting

Unable to resolve path to module '@glimmer/tracking'
import { alias } from '@ember/object/computed';
import { on } from '@ember/object/evented';
import Service, { service } from '@ember/service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { A } from '@ember/array';
import ArrayProxy from '@ember/array/proxy';
import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
import { tracked } from '@ember/-internals/metal';
import { tracked } from '@glimmer/tracking';

Check failure on line 5 in packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js

View workflow job for this annotation

GitHub Actions / Linting

Unable to resolve path to module '@glimmer/tracking'
import { computed, get, set } from '@ember/object';
import { Promise } from 'rsvp';
import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import { Component } from '@ember/-internals/glimmer';
import { setModifierManager, modifierCapabilities } from '@glimmer/manager';
import EmberObject, { set } from '@ember/object';
import { tracked } from '@ember/-internals/metal';
import { tracked } from '@glimmer/tracking';

Check failure on line 13 in packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js

View workflow job for this annotation

GitHub Actions / Linting

Unable to resolve path to module '@glimmer/tracking'
import { backtrackingMessageFor } from '../utils/debug-stack';

class ModifierManagerTest extends RenderingTestCase {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { DEBUG } from '@glimmer/env';
import { helperCapabilities, setHelperManager, setModifierManager } from '@glimmer/manager';
import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
import { tracked } from '@ember/-internals/metal';
import { tracked } from '@glimmer/tracking';

Check failure on line 4 in packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js

View workflow job for this annotation

GitHub Actions / Linting

Unable to resolve path to module '@glimmer/tracking'
import { set } from '@ember/object';
import { setOwner } from '@ember/-internals/owner';
import Service, { service } from '@ember/service';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
import { helperCapabilities, setHelperManager } from '@glimmer/manager';
import { Helper, helper, Component as EmberComponent } from '@ember/-internals/glimmer';
import { tracked } from '@ember/-internals/metal';
import { tracked } from '@glimmer/tracking';

Check failure on line 4 in packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js

View workflow job for this annotation

GitHub Actions / Linting

Unable to resolve path to module '@glimmer/tracking'
import { set } from '@ember/object';
import { getOwner } from '@ember/-internals/owner';
import Service, { service } from '@ember/service';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import EmberObject from '@ember/object';
import { A } from '@ember/array';
import MutableArray from '@ember/array/mutable';
import {
tracked,
nativeDescDecorator as descriptor,
notifyPropertyChange,
} from '@ember/-internals/metal';
import { nativeDescDecorator as descriptor, notifyPropertyChange } from '@ember/-internals/metal';
import { tracked } from '@glimmer/tracking';

Check failure on line 5 in packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js

View workflow job for this annotation

GitHub Actions / Linting

Unable to resolve path to module '@glimmer/tracking'
import Service, { service } from '@ember/service';
import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';

Expand Down
2 changes: 0 additions & 2 deletions packages/@ember/-internals/metal/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ export {
} from './lib/observer';
export { default as inject, DEBUG_INJECTION_FUNCTIONS } from './lib/injected_property';
export { tagForProperty, tagForObject, markObjectAsDirty } from './lib/tags';
export { tracked, TrackedDescriptor } from './lib/tracked';
export { cached } from './lib/cached';
export { createCache, getValue, isConst } from './lib/cache';

export {
Expand Down
146 changes: 0 additions & 146 deletions packages/@ember/-internals/metal/lib/cached.ts

This file was deleted.

Loading
Loading