Skip to content

Commit

Permalink
Merge pull request #227 from ember-cli/monorepo
Browse files Browse the repository at this point in the history
Refactoring into a monorepo
  • Loading branch information
ef4 authored Feb 2, 2022
2 parents 993541d + 8fb1efb commit 99c8ed8
Show file tree
Hide file tree
Showing 109 changed files with 3,329 additions and 3,259 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ jobs:
- uses: volta-cli/action@v1
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Lint
- name: Lint Addon
run: yarn lint
working-directory: addon
- name: Lint Test App
run: yarn lint
working-directory: test-app

test:
name: Tests
Expand All @@ -40,6 +44,7 @@ jobs:
run: yarn install --frozen-lockfile
- name: Test
run: yarn test:ember --launch ${{ matrix.browser }}
working-directory: test-app

floating-dependencies:
name: Floating Dependencies
Expand All @@ -61,6 +66,7 @@ jobs:
run: yarn install --no-lockfile --non-interactive
- name: Test
run: yarn test:ember --launch ${{ matrix.browser }}
working-directory: test-app

try-scenarios:
name: Tests - ${{ matrix.ember-try-scenario }}
Expand Down Expand Up @@ -99,3 +105,4 @@ jobs:
env:
EMBER_TRY_SCENARIO: ${{ matrix.ember-try-scenario }}
run: node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
working-directory: test-app
32 changes: 3 additions & 29 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,29 +1,3 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try

# editors
/.idea/
node_modules
yarn-error.log
.DS_Store
File renamed without changes.
45 changes: 45 additions & 0 deletions addon/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
'use strict';

module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 2018,
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true,
},
},
plugins: ['ember'],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
env: {
browser: true,
},
rules: {},
overrides: [
// node files
{
files: [
'./.eslintrc.js',
'./.prettierrc.js',
'./.template-lintrc.js',
'./index.js',
'./blueprints/*/index.js',
'./config/**/*.js',
],
parserOptions: {
sourceType: 'script',
},
env: {
browser: false,
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
},
],
};
29 changes: 29 additions & 0 deletions addon/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try

# editors
/.idea/
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
54 changes: 54 additions & 0 deletions addon/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"name": "ember-page-title",
"version": "8.0.0-alpha.0",
"description": "Page Titles for Ember applications",
"keywords": [
"ember-addon",
"page title",
"title",
"component",
"fastboot"
],
"license": "MIT",
"author": "Tim Evans <[email protected]>",
"directories": {
"doc": "doc",
"test": "tests"
},
"repository": "https://github.com/ember-cli/ember-page-title",
"scripts": {
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix"
},
"dependencies": {
"ember-cli-babel": "^7.26.6"
},
"devDependencies": {
"babel-eslint": "^10.1.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.5.4",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.4.1",
"ember-template-lint": "^3.6.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.3.2"
},
"engines": {
"node": "12.* || 14.* || >= 16"
},
"ember": {
"edition": "octane"
},
"ember-addon": {
"demoURL": "https://ember-cli.github.io/ember-page-title"
},
"homepage": "https://ember-cli.github.io/ember-page-title",
"volta": {
"extends": "../package.json"
}
}
107 changes: 10 additions & 97 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,98 +1,11 @@
{
"name": "ember-page-title",
"version": "7.0.0",
"description": "Page Titles for Ember applications",
"keywords": [
"ember-addon",
"page title",
"title",
"component",
"fastboot"
],
"license": "MIT",
"author": "Tim Evans <[email protected]>",
"directories": {
"doc": "doc",
"test": "tests"
},
"repository": "https://github.com/ember-cli/ember-page-title",
"scripts": {
"build": "ember build --environment=production",
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"start": "ember serve",
"test": "npm-run-all lint test:*",
"test:ember": "ember test",
"test:ember-compatibility": "ember try:each",
"format:hbs": "prettier **/*.hbs --write --parser=glimmer",
"format:js": "prettier **/*.js --write",
"release": "standard-version"
},
"dependencies": {
"ember-cli-babel": "^7.26.6"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.4.2",
"@embroider/test-setup": "^0.47.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.0.0",
"ember-cli": "~3.28.3",
"ember-cli-code-coverage": "^1.0.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-fastboot": "^3.2.0-beta.4",
"ember-cli-fastboot-testing": "^0.5.0",
"ember-cli-github-pages": "^0.2.2",
"ember-cli-htmlbars": "^5.7.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sass": "^10.0.1",
"ember-cli-terser": "^4.0.2",
"ember-cli-update": "^1.0.1",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-inline-svg": "^1.0.0",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "^1.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "~3.28.3",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^3.6.0",
"ember-truth-helpers": "^3.0.0",
"ember-try": "^1.4.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.5.4",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.4.1",
"eslint-plugin-qunit": "^6.2.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.3.2",
"qunit": "^2.16.0",
"sass": "^1.43.3",
"standard-version": "^9.3.2",
"webpack": "^5.0.0"
},
"engines": {
"node": "12.* || 14.* || >= 16"
},
"ember": {
"edition": "octane"
},
"ember-addon": {
"configPath": "tests/dummy/config",
"demoURL": "https://ember-cli.github.io/ember-page-title"
},
"homepage": "https://ember-cli.github.io/ember-page-title",
"volta": {
"node": "12.22.6",
"yarn": "1.22.15"
}
}
"private": true,
"workspaces": [
"addon",
"test-app"
],
"volta": {
"node": "12.22.10",
"yarn": "1.22.17"
}
}
File renamed without changes.
File renamed without changes.
22 changes: 22 additions & 0 deletions test-app/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.*/
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
1 change: 0 additions & 1 deletion .eslintrc.js → test-app/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ module.exports = {
'./testem.js',
'./blueprints/*/index.js',
'./config/**/*.js',
'./tests/dummy/config/**/*.js',
],
parserOptions: {
sourceType: 'script',
Expand Down
29 changes: 29 additions & 0 deletions test-app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try

# editors
/.idea/
File renamed without changes.
21 changes: 21 additions & 0 deletions test-app/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
5 changes: 5 additions & 0 deletions test-app/.prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use strict';

module.exports = {
singleQuote: true,
};
Loading

0 comments on commit 99c8ed8

Please sign in to comment.