Skip to content
Merged
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
27 changes: 18 additions & 9 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Continuous Integration

on:
Expand All @@ -13,7 +12,7 @@ jobs:
name: "Lint"
runs-on: ubuntu-latest
timeout-minutes: 10

strategy:
matrix:
node-version: [18.x]
Expand All @@ -24,11 +23,14 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: npm
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: latest
- name: Install Dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Lint
run: yarn run lint
run: pnpm run lint

build:
runs-on: ubuntu-latest
Expand All @@ -40,9 +42,16 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- run: yarn install --frozen-lockfile
- run: yarn build
- run: yarn test
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: latest
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- name: Build
run: pnpm build
- name: Test
run: pnpm test
9 changes: 9 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
engine-strict=true
auto-install-peers=true
strict-peer-dependencies=false
shamefully-hoist=true
public-hoist-pattern[]=*ember*
public-hoist-pattern[]=*fastboot*
public-hoist-pattern[]=@glimmer/*
public-hoist-pattern[]=**/ember-cli-htmlbars
public-hoist-pattern[]=**/htmlbars-inline-precompile
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Now you should install the required packages to run this project by doing:

```
yarn or yarn install
pnpm install
```

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ You will need the following things properly installed on your computer.

- `git clone <repository-url>` this repository
- `cd website-www`
- `yarn install`
- `pnpm install`

## Running / Development

Expand All @@ -35,8 +35,8 @@ Make use of the many generators for code, try `ember help generate` for more det

### Linting

- `npm run lint`
- `npm run lint:fix`
- `pnpm run lint`
- `pnpm run lint:fix`

### Building

Expand Down
257 changes: 130 additions & 127 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,127 +1,130 @@
{
"name": "website-www",
"version": "0.0.0",
"private": true,
"description": "Landing Page of the Real Dev Squad",
"repository": "",
"license": "MIT",
"author": "",
"directories": {
"doc": "doc",
"test": "tests"
},
"scripts": {
"build": "ember build --environment=production",
"build:staging": "ember build --environment=staging",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"**/*.css\"",
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"dev": "concurrently \"npm:dev:*\" --names \"dev:\"",
"dev:ember": "ember server -p 4200",
"dev:reverse-ssl": "local-ssl-proxy --source 443 --target 4200",
"start": "ember serve",
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
"test:ember": "ember test"
},
"dependencies": {
"@100mslive/hms-video-store": "0.10.6",
"cropperjs": "^1.5.12",
"d3-cloud": "1.2.7",
"dotenv": "16.0.2",
"ember-cli-fastboot": "4.1.1",
"ember-d3": "0.5.1",
"ember-phone-input": "^10.0.0",
"exists-sync": "0.1.0",
"fastboot-app-server": "3.3.2"
},
"devDependencies": {
"@babel/core": "7.24.7",
"@babel/eslint-parser": "7.24.7",
"@babel/plugin-proposal-decorators": "7.24.7",
"@ember/jquery": "2.0.0",
"@ember/optional-features": "2.1.0",
"@ember/render-modifiers": "2.0.5",
"@ember/string": "3.1.1",
"@ember/test-helpers": "3.3.0",
"@embroider/compat": "3.0.0",
"@embroider/core": "3.0.0",
"@embroider/webpack": "3.0.0",
"@fortawesome/ember-fontawesome": "0.4.1",
"@fortawesome/free-solid-svg-icons": "6.2.0",
"@glimmer/component": "1.1.2",
"@glimmer/tracking": "1.1.2",
"@iconify/ember": "2.1.0",
"broccoli-asset-rev": "3.0.0",
"concurrently": "8.2.2",
"ember-auto-import": "2.7.3",
"ember-cli": "5.9.0",
"ember-cli-app-version": "6.0.1",
"ember-cli-babel": "8.2.0",
"ember-cli-clean-css": "3.0.0",
"ember-cli-clipboard": "1.0.0",
"ember-cli-dependency-checker": "3.3.2",
"ember-cli-htmlbars": "6.3.0",
"ember-cli-inject-live-reload": "2.1.0",
"ember-cli-sri": "2.1.1",
"ember-cli-terser": "4.0.2",
"ember-click-outside": "5.0.1",
"ember-composable-helpers": "5.0.0",
"ember-data": "5.3.3",
"ember-fetch": "8.1.2",
"ember-in-viewport": "4.1.0",
"ember-keyboard": "8.2.0",
"ember-load-initializers": "2.1.2",
"ember-modifier": "4.1.0",
"ember-page-title": "8.2.3",
"ember-qunit": "8.0.2",
"ember-ref-bucket": "5.0.1",
"ember-resolver": "11.0.1",
"ember-set-helper": "2.0.1",
"ember-sinon-qunit": "^7.5.0",
"ember-source": "5.9.0",
"ember-template-lint": "5.13.0",
"ember-toastr": "3.0.1",
"ember-truth-helpers": "3.1.1",
"ember-welcome-page": "7.0.2",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-ember": "11.12.0",
"eslint-plugin-n": "16.6.2",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-qunit": "8.1.1",
"loader.js": "4.7.0",
"local-ssl-proxy": "2.0.5",
"pre-commit": "1.2.2",
"prettier": "3.3.1",
"qunit": "2.21.0",
"qunit-dom": "2.0.0",
"sinon": "^18.0.0",
"stylelint": "15.11.0",
"stylelint-config-standard": "34.0.0",
"stylelint-prettier": "4.1.0",
"toastr": "2.1.4",
"tracked-built-ins": "3.3.0",
"webpack": "5.91.0"
},
"fastbootDependencies": [
"crypto"
],
"engines": {
"node": ">= 18"
},
"ember": {
"edition": "octane"
},
"volta": {
"node": "18.19.1",
"yarn": "1.22.19"
},
"pre-commit": {
"run": "lint"
}
}
{
"name": "website-www",
"version": "0.0.0",
"private": true,
"description": "Landing Page of the Real Dev Squad",
"repository": "",
"license": "MIT",
"author": "",
"directories": {
"doc": "doc",
"test": "tests"
},
"scripts": {
"build": "ember build --environment=production",
"build:staging": "ember build --environment=staging",
"lint": "concurrently \"pnpm:lint:*\" --names \"lint:\"",
"lint:css": "stylelint \"**/*.css\"",
"lint:css:fix": "pnpm run lint:css -- --fix",
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"dev": "concurrently \"pnpm:dev:*\" --names \"dev:\"",
"dev:ember": "ember server -p 4200",
"dev:reverse-ssl": "local-ssl-proxy --source 443 --target 4200",
"start": "ember serve",
"test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\"",
"test:ember": "ember test",
"preinstall": "npx only-allow pnpm"
},
"dependencies": {
"@100mslive/hms-video-store": "0.10.6",
"cropperjs": "^1.5.12",
"d3-cloud": "1.2.7",
"dotenv": "16.0.2",
"ember-cli-fastboot": "4.1.5",
"ember-d3": "0.5.1",
"ember-phone-input": "^10.0.0",
"exists-sync": "0.1.0",
"fastboot-app-server": "4.1.4"
},
"devDependencies": {
"@babel/core": "7.24.7",
"@babel/eslint-parser": "7.24.7",
"@babel/plugin-proposal-decorators": "7.24.7",
"@ember/jquery": "2.0.0",
"@ember/optional-features": "2.1.0",
"@ember/render-modifiers": "2.0.5",
"@ember/string": "3.1.1",
"@ember/test-helpers": "3.3.0",
"@embroider/compat": "^3.0.0",
"@embroider/core": "^3.0.0",
"@embroider/webpack": "^3.0.0",
"@fortawesome/ember-fontawesome": "0.4.1",
"@fortawesome/free-solid-svg-icons": "6.2.0",
"@glimmer/component": "1.1.2",
"@glimmer/tracking": "1.1.2",
"@iconify/ember": "2.1.0",
"broccoli-asset-rev": "3.0.0",
"concurrently": "8.2.2",
"ember-auto-import": "2.7.3",
"ember-cli": "5.9.0",
"ember-cli-app-version": "6.0.1",
"ember-cli-babel": "8.2.0",
"ember-cli-clean-css": "3.0.0",
"ember-cli-clipboard": "1.0.0",
"ember-cli-dependency-checker": "3.3.2",
"ember-cli-htmlbars": "6.3.0",
"ember-cli-inject-live-reload": "2.1.0",
"ember-cli-sri": "2.1.1",
"ember-cli-terser": "4.0.2",
"ember-click-outside": "5.0.1",
"ember-composable-helpers": "5.0.0",
"ember-data": "5.3.3",
"ember-fetch": "8.1.2",
"ember-in-viewport": "4.1.0",
"ember-keyboard": "8.2.0",
"ember-load-initializers": "2.1.2",
"ember-modifier": "4.1.0",
"ember-page-title": "8.2.3",
"ember-qunit": "8.0.2",
"ember-ref-bucket": "5.0.1",
"ember-resolver": "11.0.1",
"ember-set-helper": "2.0.1",
"ember-sinon-qunit": "^7.5.0",
"ember-source": "5.9.0",
"ember-template-lint": "5.13.0",
"ember-toastr": "3.0.1",
"ember-truth-helpers": "3.1.1",
"ember-welcome-page": "7.0.2",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-ember": "11.12.0",
"eslint-plugin-n": "16.6.2",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-qunit": "8.1.1",
"loader.js": "4.7.0",
"local-ssl-proxy": "2.0.5",
"pre-commit": "1.2.2",
"prettier": "3.3.1",
"qunit": "2.21.0",
"qunit-dom": "2.0.0",
"sinon": "^18.0.0",
"stylelint": "15.11.0",
"stylelint-config-standard": "34.0.0",
"stylelint-prettier": "4.1.0",
"toastr": "2.1.4",
"tracked-built-ins": "3.3.0",
"webpack": "5.91.0"
},
"fastbootDependencies": [
"crypto"
],
"engines": {
"node": ">= 18"
},
"ember": {
"edition": "octane"
},
"volta": {
"node": "18.19.1"
},
"pre-commit": {
"run": "lint"
},
"resolutions": {
"ember-cli-htmlbars": "6.3.0"
}
}
Loading