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

[FEATURE] Monté de version TITANESQUE!!!!! (Pix-14472) #732

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open
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
7 changes: 5 additions & 2 deletions .ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@
/**
Ember CLI sends analytics information by default. The data is completely
anonymous, but there are times when you might want to disable this behavior.

Setting `disableAnalytics` to true will prevent any data from being sent.

Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"port": 4204,
"disableAnalytics": false
"disableAnalytics": false,
"isTypeScriptProject": false
}
6 changes: 6 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/vendor/

# compiled output
/declarations/
/dist/
/tmp/

Expand All @@ -13,11 +14,16 @@
# misc
/coverage/
!.*
.*/
.eslintcache

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

# storybook
.storybook/**
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#pack
1024pix-pix-ui-*.tgz
/declarations/

# dependencies
/bower_components/
Expand All @@ -17,6 +18,7 @@
/.pnp*
/.sass-cache
/connect.lock
/.eslintcache
/coverage/
/libpeerconnection.log
/npm-debug.log*
Expand All @@ -30,6 +32,7 @@
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
/npm-shrinkwrap.json.ember-try

# storybook / chromatic
.storybook/preview-head.html
Expand All @@ -41,3 +44,6 @@ build-storybook.log
*.iml
*.code-workspace
.history

# broccoli-debug
/DEBUG/
8 changes: 0 additions & 8 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
Expand All @@ -17,12 +13,9 @@
/.github/
/.gitignore
/.prettierignore
/.prettierrc.js
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/config/ember-try.js
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
Expand All @@ -35,7 +28,6 @@

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
26 changes: 25 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1,25 @@
/blueprints/**
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache
.lint-todo/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
8 changes: 2 additions & 6 deletions blueprints/pix-component/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,8 @@ module.exports = {
};

async function importNewStyleInGlobalStyle(dasherizedName) {
const importName = '@import \'' + dasherizedName + '\';';
const importName = "@import '" + dasherizedName + "';";

await insertIntoFile(
'addon/styles/addon.scss',
importName,
{ before: '\nhtml {' + EOL }
)
await insertIntoFile('addon/styles/addon.scss', importName, { before: '\nhtml {' + EOL });
console.log(' update addon/styles/addon.scss');
}
5 changes: 4 additions & 1 deletion blueprints/pix-component/utilities/insert-into-file.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,10 @@ async function insertIntoFile(fullPath, contentsToInsert, providedOptions) {
}

contentsToWrite =
contentsToWrite.slice(0, insertIndex) + contentsToInsert + EOL + contentsToWrite.slice(insertIndex);
contentsToWrite.slice(0, insertIndex) +
contentsToInsert +
EOL +
contentsToWrite.slice(insertIndex);
}
}
}
Expand Down
28 changes: 28 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use strict';

const getChannelURL = require('ember-source-channel-url');
const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');

const safe = embroiderSafe();
Expand All @@ -16,6 +17,31 @@ module.exports = async function () {
return {
scenarios: [
{
name: 'ember-lts-4.12',
npm: {
devDependencies: {
'ember-source': '~4.12.0',
},
},
},
{
name: 'ember-lts-5.4',
npm: {
devDependencies: {
'ember-source': '~5.4.0',
},
},
},
{
name: 'ember-release',
npm: {
devDependencies: {
'ember-source': await getChannelURL('release'),
},
},
},
{
name: 'ember-beta',
...safe,
npm: {
...safe.npm,
Expand All @@ -35,6 +61,8 @@ module.exports = async function () {
},
},
},
embroiderSafe(),
embroiderOptimized(),
],
};
};
2 changes: 1 addition & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function (defaults) {
let app = new EmberAddon(defaults, {
const app = new EmberAddon(defaults, {
// Add options here
});
/*
Expand Down
Loading