diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b315f558..4993a260e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,7 +67,7 @@ jobs: - uses: ./.github/actions/download-built-package - name: 'Change TS to ${{ matrix.typescript-scenario }}' run: 'pnpm add --save-dev ${{ matrix.typescript-scenario}}' - working-directory: ./testing/ember-app + working-directory: ./test-app - name: 'Type checking' run: | @@ -129,7 +129,7 @@ jobs: - uses: ./.github/actions/pnpm - uses: ./.github/actions/download-built-package - name: Run Tests - working-directory: ./testing/ember-app + working-directory: ./test-app run: >- node_modules/.bin/ember try:one ${{ matrix.try-scenario }} --skip-cleanup @@ -178,12 +178,12 @@ jobs: - uses: ./.github/actions/pnpm - uses: ./.github/actions/download-built-package - name: measure asset sizes - run: node ./build/estimate-bytes/index.js + run: node ./dev/estimate-bytes/index.js - name: comment on PR uses: marocchino/sticky-pull-request-comment@v2 with: header: asset-sizes - path: ./build/estimate-bytes/comment.txt + path: ./dev/estimate-bytes/comment.txt PublishDocstoCloudflarePages: diff --git a/ci.yml b/ci.yml deleted file mode 100644 index d4b993643..000000000 --- a/ci.yml +++ /dev/null @@ -1,66 +0,0 @@ -provider: github -template: "v2-addon" - -# --------------------- - -addon: './ember-resources' -testApp: './testing/ember-app' - -lint: - cmd: 'pnpm lint' - -build: - run: 'pnpm build:js' - expect: | - core/index.js - core/class-based/index.js - core/function-based/index.js - util/map.js - util/helper.js - util/debounce.js - util/function.js - util/ember-concurrency.js - index.js - index.js.map - index.d.ts - -support: - ember-try: true - glint: true - typescript: - - typescript@4.5 - - typescript@4.6 - - typescript@4.7 - # - typescript@4.8 - -release: - changeset: true - -extra: - - name: Measure Asset Sizes - needs: ['build'] - steps: - # ember-ci-update inserts preamble here - - name: 'measure asset sizes' - run: node ./dev/estimate-bytes/index.js - - name: comment on PR - uses: marocchino/sticky-pull-request-comment@v2 - with: - path: ./dev/estimate-bytes/comment.txt - - # Pending: ability to comment on PRs - # Pending: actually working (mising styles) - # - name: Build and Deploy Docs - # needs: ['build'] - # steps: - # - name: 'Build' - # run: pnpm docs:collect - # working-directory: './docs' - # - name: Publish - # uses: cloudflare/pages-action@1 - # with: - # apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} - # accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - # projectName: 'ember-resources' - # directory: 'docs/dist' - # gitHubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/package.json b/package.json index 5c91b1753..cc97d93d5 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "release": "changeset publish", "dev": "concurrently 'npm:dev:*' --restart-after 5000 --prefix-colors cyan,white,yellow", - "dev:ember": "pnpm run --filter ember-app start", + "dev:ember": "pnpm run --filter test-app start", "dev:addon": "pnpm run --filter ember-resources start --no-watch.clearScreen", "dev:docs": "pnpm run --filter docs docs:watch --preserveWatchOutput", "ci:update": "npx ember-ci-update", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4c4d8d6b4..54bb31f53 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -157,7 +157,7 @@ importers: tslib: 2.5.0 typescript: 4.9.5 - testing/ember-app: + test-app: specifiers: '@babel/core': ^7.0.0 '@babel/eslint-parser': ^7.19.1 @@ -2051,6 +2051,7 @@ packages: resolve-package-path: 4.0.3 semver: 7.3.8 typescript-memoize: 1.1.1 + dev: true /@embroider/shared-internals/2.0.0: resolution: {integrity: sha512-qZ2/xky9mWm5YC6noOa6AiAwgISEQ78YTZNv4SNu2PFgEK/H+Ha/3ddngzGSsnXkVnIHZyxIBzhxETonQYHY9g==} @@ -3388,7 +3389,7 @@ packages: resolution: {integrity: sha512-LrnsgZIfJaysFkv9rRJp4/uAyqw87oVed3s1hhF83nwbo9c7MG9g5DqR0seHP+lkX4ldmMrVolPjQSe2ZfD0yA==} deprecated: This is a stub types definition for source-map (https://github.com/mozilla/source-map). source-map provides its own type definitions, so you don't need @types/source-map installed! dependencies: - source-map: 0.7.4 + source-map: 0.6.1 dev: true /@types/supports-color/8.1.1: @@ -4069,7 +4070,7 @@ packages: resolution: {integrity: sha512-H3LU5RLiSsGXPhN+Nipar0iR0IofH+8r89G2y1tBKxQ/agagKyAjhkAFDRBfodP2caPrNKHpAWNIM/c9yeL7uA==} /array-flatten/1.1.1: - resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==} + resolution: {integrity: sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=} dev: true /array-includes/3.1.6: @@ -5077,7 +5078,7 @@ packages: dev: true /bower-endpoint-parser/0.2.2: - resolution: {integrity: sha512-YWZHhWkPdXtIfH3VRu3QIV95sa75O9vrQWBOHjexWCLBCTy5qJvRr36LXTqFwTchSXVlzy5piYJOjzHr7qhsNg==} + resolution: {integrity: sha1-ALVlrb+rby01rd3pd+l5Yqy8s/Y=} engines: {node: '>=0.8.0'} dev: true @@ -6420,7 +6421,7 @@ packages: resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} /cookie-signature/1.0.6: - resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==} + resolution: {integrity: sha1-4wOogrNCzD7oylE6eZmXNNqzriw=} dev: true /cookie/0.4.2: @@ -7029,7 +7030,7 @@ packages: semver: 6.3.0 /ee-first/1.1.1: - resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} + resolution: {integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=} dev: true /electron-to-chromium/1.4.320: @@ -7147,6 +7148,7 @@ packages: transitivePeerDependencies: - supports-color - webpack + dev: true /ember-auto-import/2.6.1: resolution: {integrity: sha512-3bCRi/pXp4QslmuCXGlSz9xwR7DF5oDx3zZO5OXKzNZihtkqAM1xvGuRIdQSl46pvbAXOkp8Odl5fOen1i0dRw==} @@ -7187,6 +7189,44 @@ packages: - webpack dev: true + /ember-auto-import/2.6.1_webpack@5.75.0: + resolution: {integrity: sha512-3bCRi/pXp4QslmuCXGlSz9xwR7DF5oDx3zZO5OXKzNZihtkqAM1xvGuRIdQSl46pvbAXOkp8Odl5fOen1i0dRw==} + engines: {node: 12.* || 14.* || >= 16} + dependencies: + '@babel/core': 7.21.0 + '@babel/plugin-proposal-class-properties': 7.18.6_@babel+core@7.21.0 + '@babel/plugin-proposal-decorators': 7.21.0_@babel+core@7.21.0 + '@babel/preset-env': 7.20.2_@babel+core@7.21.0 + '@embroider/macros': 1.10.0 + '@embroider/shared-internals': 2.0.0 + babel-loader: 8.3.0_qoaxtqicpzj5p3ubthw53xafqm + babel-plugin-ember-modules-api-polyfill: 3.5.0 + babel-plugin-htmlbars-inline-precompile: 5.3.1 + babel-plugin-syntax-dynamic-import: 6.18.0 + broccoli-debug: 0.6.5 + broccoli-funnel: 3.0.8 + broccoli-merge-trees: 4.2.0 + broccoli-plugin: 4.0.7 + broccoli-source: 3.0.1 + css-loader: 5.2.7_webpack@5.75.0 + debug: 4.3.4 + fs-extra: 10.1.0 + fs-tree-diff: 2.0.1 + handlebars: 4.7.7 + js-string-escape: 1.0.1 + lodash: 4.17.21 + mini-css-extract-plugin: 2.7.2_webpack@5.75.0 + parse5: 6.0.1 + resolve: 1.22.1 + resolve-package-path: 4.0.3 + semver: 7.3.8 + style-loader: 2.0.0_webpack@5.75.0 + typescript-memoize: 1.1.1 + walk-sync: 3.0.0 + transitivePeerDependencies: + - supports-color + - webpack + /ember-cli-app-version/5.0.0: resolution: {integrity: sha512-afhx/CXDOMNXzoe4NDPy5WUfxWmYYHUzMCiTyvPBxCDBXYcMrtxNWxvgaSaeqcoHVEmqzeyBj8V82tzmT1dcyw==} engines: {node: 10.* || >= 12} @@ -7849,7 +7889,7 @@ packages: broccoli-funnel: 2.0.2 broccoli-merge-trees: 4.2.0 chalk: 4.1.2 - ember-auto-import: 2.4.0_webpack@5.75.0 + ember-auto-import: 2.6.1_webpack@5.75.0 ember-cli-babel: 7.26.11 ember-cli-get-component-path-option: 1.0.0 ember-cli-is-package-missing: 1.0.0 @@ -9345,7 +9385,7 @@ packages: dev: true /fresh/0.5.2: - resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==} + resolution: {integrity: sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=} engines: {node: '>= 0.6'} dev: true @@ -9372,7 +9412,6 @@ packages: graceful-fs: 4.2.10 jsonfile: 6.1.0 universalify: 2.0.0 - dev: true /fs-extra/4.0.3: resolution: {integrity: sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==} @@ -9395,6 +9434,7 @@ packages: graceful-fs: 4.2.10 jsonfile: 4.0.0 universalify: 0.1.2 + dev: true /fs-extra/7.0.1: resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==} @@ -10601,7 +10641,7 @@ packages: has-symbols: 1.0.3 /is-type/0.0.1: - resolution: {integrity: sha512-YwJh/zBVrcJ90aAnPBM0CbHvm7lG9ao7lIFeqTZ1UQj4iFLpM5CikdaU+dGGesrMJwxLqPGmjjrUrQ6Kn3Zh+w==} + resolution: {integrity: sha1-9lHYXDZdRJVdFKUdjXBh8/a0d5w=} dependencies: core-util-is: 1.0.3 dev: true @@ -10966,7 +11006,7 @@ packages: dev: true /leek/0.0.24: - resolution: {integrity: sha512-6PVFIYXxlYF0o6hrAsHtGpTmi06otkwNrMcmQ0K96SeSRHPREPa9J3nJZ1frliVH7XT0XFswoJFQoXsDukzGNQ==} + resolution: {integrity: sha1-5ADlfw5g2O8r1NBo3EKKVDRdvNo=} dependencies: debug: 2.6.9 lodash.assign: 3.2.0 @@ -11426,7 +11466,7 @@ packages: dev: true /media-typer/0.3.0: - resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==} + resolution: {integrity: sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=} engines: {node: '>= 0.6'} dev: true @@ -11468,7 +11508,7 @@ packages: dev: true /merge-descriptors/1.0.1: - resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==} + resolution: {integrity: sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=} dev: true /merge-stream/2.0.0: @@ -11756,7 +11796,7 @@ packages: dev: true /mute-stream/0.0.7: - resolution: {integrity: sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==} + resolution: {integrity: sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=} dev: true /mute-stream/0.0.8: @@ -12712,7 +12752,7 @@ packages: dev: true /querystring/0.2.0: - resolution: {integrity: sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==} + resolution: {integrity: sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=} engines: {node: '>=0.4.x'} deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead. dev: true @@ -13761,11 +13801,6 @@ packages: resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} engines: {node: '>=0.10.0'} - /source-map/0.7.4: - resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==} - engines: {node: '>= 8'} - dev: true - /sourcemap-codec/1.4.8: resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==} deprecated: Please use @jridgewell/sourcemap-codec instead @@ -14065,7 +14100,7 @@ packages: webpack: 5.75.0 /styled_string/0.0.1: - resolution: {integrity: sha512-DU2KZiB6VbPkO2tGSqQ9n96ZstUPjW7X4sGO6V2m1myIQluX0p1Ol8BrA/l6/EesqhMqXOIXs3cJNOy1UuU2BA==} + resolution: {integrity: sha1-0ieCvYEpVFm8Tx3xjEutjpTdEko=} dev: true /sum-up/1.0.3: @@ -14610,7 +14645,7 @@ packages: dev: true /tty-browserify/0.0.0: - resolution: {integrity: sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==} + resolution: {integrity: sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=} dev: true /tty-table/4.1.6: @@ -14965,7 +15000,7 @@ packages: dev: true /utils-merge/1.0.1: - resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==} + resolution: {integrity: sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=} engines: {node: '>= 0.4.0'} dev: true diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 71d9d3c65..d53bcd78a 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,5 +1,5 @@ packages: - "ember-resources" - "docs" - - "testing/*" + - "test-app" - "dev/*" diff --git a/testing/ember-app/.editorconfig b/test-app/.editorconfig similarity index 100% rename from testing/ember-app/.editorconfig rename to test-app/.editorconfig diff --git a/testing/ember-app/.ember-cli b/test-app/.ember-cli similarity index 100% rename from testing/ember-app/.ember-cli rename to test-app/.ember-cli diff --git a/testing/ember-app/.eslintignore b/test-app/.eslintignore similarity index 100% rename from testing/ember-app/.eslintignore rename to test-app/.eslintignore diff --git a/testing/ember-app/.eslintrc.js b/test-app/.eslintrc.js similarity index 100% rename from testing/ember-app/.eslintrc.js rename to test-app/.eslintrc.js diff --git a/testing/ember-app/.gitignore b/test-app/.gitignore similarity index 100% rename from testing/ember-app/.gitignore rename to test-app/.gitignore diff --git a/testing/ember-app/.prettierignore b/test-app/.prettierignore similarity index 100% rename from testing/ember-app/.prettierignore rename to test-app/.prettierignore diff --git a/testing/ember-app/.prettierrc.js b/test-app/.prettierrc.js similarity index 100% rename from testing/ember-app/.prettierrc.js rename to test-app/.prettierrc.js diff --git a/testing/ember-app/.template-lintrc.js b/test-app/.template-lintrc.js similarity index 100% rename from testing/ember-app/.template-lintrc.js rename to test-app/.template-lintrc.js diff --git a/testing/ember-app/.watchmanconfig b/test-app/.watchmanconfig similarity index 100% rename from testing/ember-app/.watchmanconfig rename to test-app/.watchmanconfig diff --git a/testing/ember-app/app/app.ts b/test-app/app/app.ts similarity index 87% rename from testing/ember-app/app/app.ts rename to test-app/app/app.ts index d03600ae6..83bc0d2b3 100644 --- a/testing/ember-app/app/app.ts +++ b/test-app/app/app.ts @@ -1,8 +1,8 @@ import Application from '@ember/application'; -import config from 'ember-app/config/environment'; import loadInitializers from 'ember-load-initializers'; import Resolver from 'ember-resolver'; +import config from 'test-app/config/environment'; export default class App extends Application { modulePrefix = config.modulePrefix; diff --git a/testing/ember-app/app/components/-resources.ts b/test-app/app/components/-resources.ts similarity index 100% rename from testing/ember-app/app/components/-resources.ts rename to test-app/app/components/-resources.ts diff --git a/testing/ember-app/app/components/glint-colocated.hbs b/test-app/app/components/glint-colocated.hbs similarity index 100% rename from testing/ember-app/app/components/glint-colocated.hbs rename to test-app/app/components/glint-colocated.hbs diff --git a/testing/ember-app/app/components/glint-colocated.ts b/test-app/app/components/glint-colocated.ts similarity index 100% rename from testing/ember-app/app/components/glint-colocated.ts rename to test-app/app/components/glint-colocated.ts diff --git a/testing/ember-app/app/components/glint-gts.gts b/test-app/app/components/glint-gts.gts similarity index 100% rename from testing/ember-app/app/components/glint-gts.gts rename to test-app/app/components/glint-gts.gts diff --git a/testing/ember-app/app/components/util/debounce.gts b/test-app/app/components/util/debounce.gts similarity index 100% rename from testing/ember-app/app/components/util/debounce.gts rename to test-app/app/components/util/debounce.gts diff --git a/testing/ember-app/app/components/util/function.gts b/test-app/app/components/util/function.gts similarity index 100% rename from testing/ember-app/app/components/util/function.gts rename to test-app/app/components/util/function.gts diff --git a/testing/ember-app/app/components/util/helper.gts b/test-app/app/components/util/helper.gts similarity index 100% rename from testing/ember-app/app/components/util/helper.gts rename to test-app/app/components/util/helper.gts diff --git a/testing/ember-app/app/components/util/map.gts b/test-app/app/components/util/map.gts similarity index 100% rename from testing/ember-app/app/components/util/map.gts rename to test-app/app/components/util/map.gts diff --git a/testing/ember-app/app/components/util/remote-data.gts b/test-app/app/components/util/remote-data.gts similarity index 100% rename from testing/ember-app/app/components/util/remote-data.gts rename to test-app/app/components/util/remote-data.gts diff --git a/testing/ember-app/app/config/environment.d.ts b/test-app/app/config/environment.d.ts similarity index 100% rename from testing/ember-app/app/config/environment.d.ts rename to test-app/app/config/environment.d.ts diff --git a/testing/ember-app/app/index.html b/test-app/app/index.html similarity index 89% rename from testing/ember-app/app/index.html rename to test-app/app/index.html index 53e33ed64..861578847 100644 --- a/testing/ember-app/app/index.html +++ b/test-app/app/index.html @@ -10,7 +10,7 @@ {{content-for "head"}} - + {{content-for "head-footer"}} @@ -18,7 +18,7 @@ {{content-for "body"}} - + {{content-for "body-footer"}} diff --git a/testing/ember-app/app/router.ts b/test-app/app/router.ts similarity index 80% rename from testing/ember-app/app/router.ts rename to test-app/app/router.ts index bf5aa914f..ae1d4bca7 100644 --- a/testing/ember-app/app/router.ts +++ b/test-app/app/router.ts @@ -1,6 +1,6 @@ import EmberRouter from '@ember/routing/router'; -import config from 'ember-app/config/environment'; +import config from 'test-app/config/environment'; export default class Router extends EmberRouter { location = config.locationType; diff --git a/testing/ember-app/app/styles/app.css b/test-app/app/styles/app.css similarity index 100% rename from testing/ember-app/app/styles/app.css rename to test-app/app/styles/app.css diff --git a/testing/ember-app/app/templates/application.hbs b/test-app/app/templates/application.hbs similarity index 100% rename from testing/ember-app/app/templates/application.hbs rename to test-app/app/templates/application.hbs diff --git a/testing/ember-app/config/dependency-lint.js b/test-app/config/dependency-lint.js similarity index 100% rename from testing/ember-app/config/dependency-lint.js rename to test-app/config/dependency-lint.js diff --git a/testing/ember-app/config/ember-cli-update.json b/test-app/config/ember-cli-update.json similarity index 100% rename from testing/ember-app/config/ember-cli-update.json rename to test-app/config/ember-cli-update.json diff --git a/testing/ember-app/config/ember-try.js b/test-app/config/ember-try.js similarity index 100% rename from testing/ember-app/config/ember-try.js rename to test-app/config/ember-try.js diff --git a/testing/ember-app/config/environment.js b/test-app/config/environment.js similarity index 97% rename from testing/ember-app/config/environment.js rename to test-app/config/environment.js index da0c47a7d..f0f6af760 100644 --- a/testing/ember-app/config/environment.js +++ b/test-app/config/environment.js @@ -4,7 +4,7 @@ let isTestCli = process.argv.includes('test'); module.exports = function (environment) { let ENV = { - modulePrefix: 'ember-app', + modulePrefix: 'test-app', environment, rootURL: '/', locationType: 'auto', diff --git a/testing/ember-app/config/optional-features.json b/test-app/config/optional-features.json similarity index 100% rename from testing/ember-app/config/optional-features.json rename to test-app/config/optional-features.json diff --git a/testing/ember-app/config/targets.js b/test-app/config/targets.js similarity index 100% rename from testing/ember-app/config/targets.js rename to test-app/config/targets.js diff --git a/testing/ember-app/ember-cli-build.js b/test-app/ember-cli-build.js similarity index 97% rename from testing/ember-app/ember-cli-build.js rename to test-app/ember-cli-build.js index 44e6fad42..0016dc6e6 100644 --- a/testing/ember-app/ember-cli-build.js +++ b/test-app/ember-cli-build.js @@ -33,7 +33,7 @@ module.exports = function (defaults) { return maybeEmbroider(app, { packageRules: [ { - package: 'ember-app', + package: 'test-app', // Pre-strict mode, helpers and components are ambiguous helpers: { '{{step}}': { safeToIgnore: true }, diff --git a/testing/ember-app/package.json b/test-app/package.json similarity index 98% rename from testing/ember-app/package.json rename to test-app/package.json index b029a53de..666d8ff41 100644 --- a/testing/ember-app/package.json +++ b/test-app/package.json @@ -1,8 +1,8 @@ { - "name": "ember-app", + "name": "test-app", "version": "0.0.0", "private": true, - "description": "Small description for ember-app goes here", + "description": "Small description for test-app goes here", "repository": "", "license": "MIT", "author": "", diff --git a/testing/ember-app/public/mockServiceWorker.js b/test-app/public/mockServiceWorker.js similarity index 100% rename from testing/ember-app/public/mockServiceWorker.js rename to test-app/public/mockServiceWorker.js diff --git a/testing/ember-app/public/robots.txt b/test-app/public/robots.txt similarity index 100% rename from testing/ember-app/public/robots.txt rename to test-app/public/robots.txt diff --git a/testing/ember-app/testem.js b/test-app/testem.js similarity index 100% rename from testing/ember-app/testem.js rename to test-app/testem.js diff --git a/testing/ember-app/tests/core/js-test.ts b/test-app/tests/core/js-test.ts similarity index 100% rename from testing/ember-app/tests/core/js-test.ts rename to test-app/tests/core/js-test.ts diff --git a/testing/ember-app/tests/core/rendering-test.gts b/test-app/tests/core/rendering-test.gts similarity index 100% rename from testing/ember-app/tests/core/rendering-test.gts rename to test-app/tests/core/rendering-test.gts diff --git a/testing/ember-app/tests/index.html b/test-app/tests/index.html similarity index 89% rename from testing/ember-app/tests/index.html rename to test-app/tests/index.html index 4dfda4878..f5c81fb72 100644 --- a/testing/ember-app/tests/index.html +++ b/test-app/tests/index.html @@ -10,7 +10,7 @@ {{content-for "head"}} {{content-for "test-head"}} - + {{content-for "head-footer"}} {{content-for "test-head-footer"}} @@ -28,7 +28,7 @@ - + {{content-for "body-footer"}} {{content-for "test-body-footer"}} diff --git a/testing/ember-app/tests/msw.ts b/test-app/tests/msw.ts similarity index 96% rename from testing/ember-app/tests/msw.ts rename to test-app/tests/msw.ts index eb552a7f4..cf0ffab95 100644 --- a/testing/ember-app/tests/msw.ts +++ b/test-app/tests/msw.ts @@ -1,7 +1,7 @@ import * as QUnit from 'qunit'; -import ENV from 'ember-app/config/environment'; import { rest, setupWorker } from 'msw'; +import ENV from 'test-app/config/environment'; import type { SetupWorkerApi } from 'msw'; diff --git a/testing/ember-app/tests/test-helper.ts b/test-app/tests/test-helper.ts similarity index 86% rename from testing/ember-app/tests/test-helper.ts rename to test-app/tests/test-helper.ts index c474119d6..ea5e2ca53 100644 --- a/testing/ember-app/tests/test-helper.ts +++ b/test-app/tests/test-helper.ts @@ -4,8 +4,8 @@ import * as QUnit from 'qunit'; import { setup } from 'qunit-dom'; import { start } from 'ember-qunit'; -import Application from 'ember-app/app'; -import config from 'ember-app/config/environment'; +import Application from 'test-app/app'; +import config from 'test-app/config/environment'; setApplication(Application.create(config.APP)); diff --git a/testing/ember-app/tests/type-tests/class-based.ts b/test-app/tests/type-tests/class-based.ts similarity index 100% rename from testing/ember-app/tests/type-tests/class-based.ts rename to test-app/tests/type-tests/class-based.ts diff --git a/testing/ember-app/tests/type-tests/function-based.ts b/test-app/tests/type-tests/function-based.ts similarity index 100% rename from testing/ember-app/tests/type-tests/function-based.ts rename to test-app/tests/type-tests/function-based.ts diff --git a/testing/ember-app/tests/type-tests/types.ts b/test-app/tests/type-tests/types.ts similarity index 100% rename from testing/ember-app/tests/type-tests/types.ts rename to test-app/tests/type-tests/types.ts diff --git a/testing/ember-app/tests/type-tests/util/debounce.ts b/test-app/tests/type-tests/util/debounce.ts similarity index 100% rename from testing/ember-app/tests/type-tests/util/debounce.ts rename to test-app/tests/type-tests/util/debounce.ts diff --git a/testing/ember-app/tests/type-tests/util/ember-concurrency.ts b/test-app/tests/type-tests/util/ember-concurrency.ts similarity index 100% rename from testing/ember-app/tests/type-tests/util/ember-concurrency.ts rename to test-app/tests/type-tests/util/ember-concurrency.ts diff --git a/testing/ember-app/tests/type-tests/util/function-resource.ts b/test-app/tests/type-tests/util/function-resource.ts similarity index 100% rename from testing/ember-app/tests/type-tests/util/function-resource.ts rename to test-app/tests/type-tests/util/function-resource.ts diff --git a/testing/ember-app/tests/type-tests/util/function.ts b/test-app/tests/type-tests/util/function.ts similarity index 100% rename from testing/ember-app/tests/type-tests/util/function.ts rename to test-app/tests/type-tests/util/function.ts diff --git a/testing/ember-app/tests/type-tests/util/helper.ts b/test-app/tests/type-tests/util/helper.ts similarity index 100% rename from testing/ember-app/tests/type-tests/util/helper.ts rename to test-app/tests/type-tests/util/helper.ts diff --git a/testing/ember-app/tests/type-tests/util/map.ts b/test-app/tests/type-tests/util/map.ts similarity index 100% rename from testing/ember-app/tests/type-tests/util/map.ts rename to test-app/tests/type-tests/util/map.ts diff --git a/testing/ember-app/tests/type-tests/util/remote-data.ts b/test-app/tests/type-tests/util/remote-data.ts similarity index 100% rename from testing/ember-app/tests/type-tests/util/remote-data.ts rename to test-app/tests/type-tests/util/remote-data.ts diff --git a/testing/ember-app/tests/utils/cell/rendering-test.gts b/test-app/tests/utils/cell/rendering-test.gts similarity index 100% rename from testing/ember-app/tests/utils/cell/rendering-test.gts rename to test-app/tests/utils/cell/rendering-test.gts diff --git a/testing/ember-app/tests/utils/debounce/js-test.ts b/test-app/tests/utils/debounce/js-test.ts similarity index 100% rename from testing/ember-app/tests/utils/debounce/js-test.ts rename to test-app/tests/utils/debounce/js-test.ts diff --git a/testing/ember-app/tests/utils/ember-concurrency/js-test.ts b/test-app/tests/utils/ember-concurrency/js-test.ts similarity index 100% rename from testing/ember-app/tests/utils/ember-concurrency/js-test.ts rename to test-app/tests/utils/ember-concurrency/js-test.ts diff --git a/testing/ember-app/tests/utils/ember-concurrency/rendering-test.gts b/test-app/tests/utils/ember-concurrency/rendering-test.gts similarity index 100% rename from testing/ember-app/tests/utils/ember-concurrency/rendering-test.gts rename to test-app/tests/utils/ember-concurrency/rendering-test.gts diff --git a/testing/ember-app/tests/utils/function-resource/clock-test.gts b/test-app/tests/utils/function-resource/clock-test.gts similarity index 100% rename from testing/ember-app/tests/utils/function-resource/clock-test.gts rename to test-app/tests/utils/function-resource/clock-test.gts diff --git a/testing/ember-app/tests/utils/function-resource/js-test.ts b/test-app/tests/utils/function-resource/js-test.ts similarity index 100% rename from testing/ember-app/tests/utils/function-resource/js-test.ts rename to test-app/tests/utils/function-resource/js-test.ts diff --git a/testing/ember-app/tests/utils/function-resource/rendering-test.gts b/test-app/tests/utils/function-resource/rendering-test.gts similarity index 100% rename from testing/ember-app/tests/utils/function-resource/rendering-test.gts rename to test-app/tests/utils/function-resource/rendering-test.gts diff --git a/testing/ember-app/tests/utils/function/js-test.ts b/test-app/tests/utils/function/js-test.ts similarity index 100% rename from testing/ember-app/tests/utils/function/js-test.ts rename to test-app/tests/utils/function/js-test.ts diff --git a/testing/ember-app/tests/utils/function/rendering-test.gts b/test-app/tests/utils/function/rendering-test.gts similarity index 100% rename from testing/ember-app/tests/utils/function/rendering-test.gts rename to test-app/tests/utils/function/rendering-test.gts diff --git a/testing/ember-app/tests/utils/function/state-test.ts b/test-app/tests/utils/function/state-test.ts similarity index 100% rename from testing/ember-app/tests/utils/function/state-test.ts rename to test-app/tests/utils/function/state-test.ts diff --git a/testing/ember-app/tests/utils/helper/js-test.ts b/test-app/tests/utils/helper/js-test.ts similarity index 100% rename from testing/ember-app/tests/utils/helper/js-test.ts rename to test-app/tests/utils/helper/js-test.ts diff --git a/testing/ember-app/tests/utils/keep-latest/js-test.ts b/test-app/tests/utils/keep-latest/js-test.ts similarity index 100% rename from testing/ember-app/tests/utils/keep-latest/js-test.ts rename to test-app/tests/utils/keep-latest/js-test.ts diff --git a/testing/ember-app/tests/utils/keep-latest/rendering-test.gts b/test-app/tests/utils/keep-latest/rendering-test.gts similarity index 100% rename from testing/ember-app/tests/utils/keep-latest/rendering-test.gts rename to test-app/tests/utils/keep-latest/rendering-test.gts diff --git a/testing/ember-app/tests/utils/map/js-test.ts b/test-app/tests/utils/map/js-test.ts similarity index 100% rename from testing/ember-app/tests/utils/map/js-test.ts rename to test-app/tests/utils/map/js-test.ts diff --git a/testing/ember-app/tests/utils/map/rendering-test.gts b/test-app/tests/utils/map/rendering-test.gts similarity index 100% rename from testing/ember-app/tests/utils/map/rendering-test.gts rename to test-app/tests/utils/map/rendering-test.gts diff --git a/testing/ember-app/tests/utils/remote-data/js-test.ts b/test-app/tests/utils/remote-data/js-test.ts similarity index 99% rename from testing/ember-app/tests/utils/remote-data/js-test.ts rename to test-app/tests/utils/remote-data/js-test.ts index a06670085..e1c4c34e0 100644 --- a/testing/ember-app/tests/utils/remote-data/js-test.ts +++ b/test-app/tests/utils/remote-data/js-test.ts @@ -4,9 +4,9 @@ import { settled } from '@ember/test-helpers'; import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; -import { setupMSW } from 'ember-app/tests/msw'; import { resource, use } from 'ember-resources'; import { RemoteData, remoteData } from 'ember-resources/util/remote-data'; +import { setupMSW } from 'test-app/tests/msw'; let data = [ { id: '1', type: 'blogs', attributes: { name: `name:1` } }, diff --git a/testing/ember-app/tests/utils/remote-data/rendering-test.gts b/test-app/tests/utils/remote-data/rendering-test.gts similarity index 97% rename from testing/ember-app/tests/utils/remote-data/rendering-test.gts rename to test-app/tests/utils/remote-data/rendering-test.gts index 50e834b34..d4475ebac 100644 --- a/testing/ember-app/tests/utils/remote-data/rendering-test.gts +++ b/test-app/tests/utils/remote-data/rendering-test.gts @@ -5,7 +5,7 @@ import { on } from '@ember/modifier'; import { module, test } from 'qunit'; import { setupRenderingTest } from 'ember-qunit'; -import { setupMSW } from 'ember-app/tests/msw'; +import { setupMSW } from 'test-app/tests/msw'; import { RemoteData } from 'ember-resources/util/remote-data'; let data = [ diff --git a/testing/ember-app/tsconfig.json b/test-app/tsconfig.json similarity index 80% rename from testing/ember-app/tsconfig.json rename to test-app/tsconfig.json index 7543d24df..3afe8b29a 100644 --- a/testing/ember-app/tsconfig.json +++ b/test-app/tsconfig.json @@ -7,8 +7,8 @@ "compilerOptions": { "baseUrl": ".", "paths": { - "ember-app/tests/*": ["tests/*"], - "ember-app/*": ["app/*"], + "test-app/tests/*": ["tests/*"], + "test-app/*": ["app/*"], "*": ["types/*"] } } diff --git a/testing/ember-app/types/ember-app/index.d.ts b/test-app/types/ember-app/index.d.ts similarity index 100% rename from testing/ember-app/types/ember-app/index.d.ts rename to test-app/types/ember-app/index.d.ts diff --git a/testing/ember-app/types/ember-data/types/registries/model.d.ts b/test-app/types/ember-data/types/registries/model.d.ts similarity index 100% rename from testing/ember-app/types/ember-data/types/registries/model.d.ts rename to test-app/types/ember-data/types/registries/model.d.ts diff --git a/testing/ember-app/types/glint-registry.d.ts b/test-app/types/glint-registry.d.ts similarity index 100% rename from testing/ember-app/types/glint-registry.d.ts rename to test-app/types/glint-registry.d.ts diff --git a/testing/ember-app/types/global.d.ts b/test-app/types/global.d.ts similarity index 79% rename from testing/ember-app/types/global.d.ts rename to test-app/types/global.d.ts index 9e38be63b..a2addbe6e 100644 --- a/testing/ember-app/types/global.d.ts +++ b/test-app/types/global.d.ts @@ -1,5 +1,5 @@ // Types for compiled templates -declare module 'ember-app/templates/*' { +declare module 'test-app/templates/*' { import type { TemplateFactory } from 'htmlbars-inline-precompile'; const tmpl: TemplateFactory; export default tmpl; diff --git a/testing/ember-app/vendor/.gitkeep b/test-app/vendor/.gitkeep similarity index 100% rename from testing/ember-app/vendor/.gitkeep rename to test-app/vendor/.gitkeep