Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
onechiporenko authored Sep 15, 2024
1 parent 9a501ab commit 059693c
Show file tree
Hide file tree
Showing 43 changed files with 16,129 additions and 15,504 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
/pnpm.lock.ember-try.yaml

/docs/
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
- `ember-data` version:
- `ember-cli` version:
- `node` version:
- `npm` or `yarn` version:
- `npm` or `pnpm` version:


* **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. stackoverflow, gitter, etc)
61 changes: 41 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,20 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 9
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 18
cache: yarn
cache: pnpm
- name: Install Dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Lint
run: yarn lint
run: pnpm lint
- name: Run Tests
run: yarn test:ember
run: pnpm test:ember

floating:
name: "Floating Dependencies"
Expand All @@ -38,14 +41,17 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 18
cache: yarn
cache: pnpm
- name: Install Dependencies
run: yarn install --no-lockfile
run: pnpm install --no-lockfile
- name: Run Tests
run: yarn test:ember
run: pnpm test:ember

node-tests:
name: "Node Tests"
Expand All @@ -54,14 +60,17 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 18
cache: yarn
cache: pnpm
- name: Install Dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Run Node Tests
run: yarn run nodetest
run: pnpm run nodetest

docs:
name: "Docs"
Expand All @@ -70,14 +79,17 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 18
cache: yarn
cache: pnpm
- name: Install Dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Generate docs
run: yarn run docs
run: pnpm run docs

try-scenarios:
name: ${{ matrix.try-scenario }}, ${{ matrix.browser}}
Expand Down Expand Up @@ -124,13 +136,16 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 9
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 18
cache: yarn
cache: pnpm
- name: Install Dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }} --skip-cleanup=true --- ember test --launch ${{ matrix.browser }}

Expand All @@ -152,15 +167,18 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 9
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 18
cache: yarn
cache: pnpm
- name: Install Dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Generate Coverage Report
run: yarn run test:cov:${{ matrix.try-scenario }}
run: pnpm run test:cov:${{ matrix.try-scenario }}
- uses: actions/upload-artifact@v3
with:
name: lcov-${{ matrix.try-scenario }}.info
Expand All @@ -173,13 +191,16 @@ jobs:
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 9
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 18
cache: yarn
cache: pnpm
- name: Install Dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Download coverage report parts
uses: actions/download-artifact@v3
with:
Expand Down
16 changes: 11 additions & 5 deletions .github/workflows/deploy-demo-and-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,20 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 9
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 18.x
cache: yarn
cache: pnpm
- name: Install Dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Generate Production Build
run: |
sed -i "s|.*ENV\.rootURL.*|\t\tENV.rootURL = '/ember-models-table/v.5/${{ matrix.try-scenario }}/';|" ./tests/dummy/config/environment.js
yarn run build:gh-pages:${{ matrix.try-scenario }}
pnpm run build:gh-pages:${{ matrix.try-scenario }}
tar -zcvf ${{ matrix.try-scenario }}.tar.gz dist
- name: Upload built project to artifacts
uses: actions/upload-artifact@v3
Expand All @@ -44,13 +47,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 9
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 18.x
cache: yarn
cache: pnpm
- name: Install Dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Download builds
uses: actions/download-artifact@v3
with:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@
/npm-debug.log*
/testem.log
/yarn-error.log
/pnpm-error.log

# ember-try
/.node_modules.ember-try/
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
/pnpm.lock.ember-try.yaml

# broccoli-debug
/DEBUG/
Expand Down
3 changes: 3 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
/tsconfig.json
/yarn-error.log
/yarn.lock
/pnpm-error.log
/pnpm.lock
.gitkeep

# ember-try
Expand All @@ -35,6 +37,7 @@
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
/pnpm.lock.ember-try.yaml

/docs
/.idea
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
/pnpm.lock.ember-try.yaml
20 changes: 10 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

## Installation

* `git clone <repository-url>`
* `cd ember-models-table`
* `yarn install`
- `git clone <repository-url>`
- `cd ember-models-table`
- `pnpm install`

## Linting

* `yarn lint`
* `yarn lint:fix`
- `pnpm lint`
- `pnpm lint:fix`

## Running tests

* `yarn test` – Runs the test suite on the current Ember version
* `yarn test:ember --server` – Runs the test suite in "watch mode"
* `yarn test:ember-compatibility` – Runs the test suite against multiple Ember versions
- `pnpm test` – Runs the test suite on the current Ember version
- `pnpm test:ember --server` – Runs the test suite in "watch mode"
- `pnpm test:ember-compatibility` – Runs the test suite against multiple Ember versions

## Running the dummy application

* `yarn start`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
- `pnpm start`
- Visit the dummy application at [http://localhost:4200](http://localhost:4200).

For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
2 changes: 1 addition & 1 deletion config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = function (/* environment, appConfig */) {
const ENV = {
APP: {},
};
ENV.APP.uiFramework = process.env.EMT_UI;
ENV.APP.uiFramework = process?.env.EMT_UI;

ENV['ember-a11y-testing'] = {
componentOptions: {
Expand Down
4 changes: 2 additions & 2 deletions coverage.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

yarn run ember:reset
yarn run test:cov:$1
pnpm run ember:reset
pnpm run test:cov:$1
mv coverage/lcov.info lcov-$1.info
rm -rf coverage
13 changes: 9 additions & 4 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict';

const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function (defaults) {
module.exports = async function (defaults) {
const { setConfig } = await import('@warp-drive/build-config');
const options = {
babel: {
sourceMaps: 'inline',
Expand Down Expand Up @@ -41,7 +41,7 @@ module.exports = function (defaults) {
only: ['html-safe'],
},
};
switch (process.env.EMT_UI) {
switch (process?.env.EMT_UI) {
case 'plain-html': {
options.outputPaths.app.css['plain-html'] = '/assets/plain-html.css';
options['ember-models-table-floating-filter'] = {
Expand Down Expand Up @@ -73,7 +73,12 @@ module.exports = function (defaults) {
}
}
let app = new EmberAddon(defaults, options);
if (process.env.EMT_UI === 'plain-html') {

setConfig(app, __dirname, {
___legacy_support: true,
});

if (process?.env.EMT_UI === 'plain-html') {
app.import('vendor/ember-models-table/plain-html.css');
}
/*
Expand Down
Loading

0 comments on commit 059693c

Please sign in to comment.