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

Updates publish step to publish JavaScript + *.d.ts vs. .ts files. #293

Merged
merged 2 commits into from
Aug 16, 2021
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
/addon/**/*.js

/**/*.d.ts
!/types/**/*.d.ts
6 changes: 5 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,8 @@

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

# TS
**/*.ts
!**/*.d.ts
24 changes: 24 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# 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

addon/**/*.js
**/*.d.ts
Empty file removed app/.gitkeep
Empty file.
11 changes: 10 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@ module.exports = {
*/
let babel = this.addons.find((a) => a.name === 'ember-cli-babel');

return babel.transpileTree(tree);
let input;

// ember-cli-typescript should ultimately handle this for us.
if (this.isDevelopingAddon()) {
const { BroccoliBabelPresetTypeScript } = require('broccoli-babel-preset-typescript'); // eslint-disable-line node/no-unpublished-require
input = new BroccoliBabelPresetTypeScript([tree]);
} else {
input = tree;
}
return babel.transpileTree(input);
},
};
9 changes: 7 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
"lint:js": "eslint --ext ts,js .",
"lint:js:fix": "eslint --ext ts,js . --fix",
"lint:ts": "tsc -p tsconfig.json --noEmit",
"prepack": "ember ts:precompile",
"prepack": "npm-run-all prepack:*",
"prepack:d.ts": "ember ts:precompile",
"prepack:addon": "babel --extensions '.ts' --presets @babel/preset-typescript addon --out-dir addon --ignore '**/*.d.ts'",
"postpack": "ember ts:clean",
"start": "ember serve",
"test": "npm-run-all lint \"test:!(ember-compatibility|prod)\"",
Expand All @@ -36,11 +38,12 @@
"dependencies": {
"calculate-cache-key-for-tree": "^2.0.0",
"ember-cli-babel": "^7.26.6",
"ember-cli-typescript": "^4.1.0",
"ember-cli-version-checker": "^5.1.2",
"semver": "^7.3.5"
},
"devDependencies": {
"@babel/cli": "^7.14.8",
"@babel/preset-typescript": "^7.15.0",
"@ember/optional-features": "^2.0.0",
"@glimmer/env": "^0.1.7",
"@types/ember": "^3.16.5",
Expand All @@ -51,6 +54,7 @@
"@types/rsvp": "^4.0.3",
"@typescript-eslint/eslint-plugin": "^2.34.0",
"@typescript-eslint/parser": "^2.34.0",
"broccoli-babel-preset-typescript": "^1.0.0",
"co": "^4.6.0",
"ember-auto-import": "^1.11.3",
"ember-cli": "~3.27.0",
Expand All @@ -59,6 +63,7 @@
"ember-cli-inject-live-reload": "^2.0.2",
"ember-cli-sri": "^2.1.1",
"ember-cli-test-loader": "^3.0.0",
"ember-cli-typescript": "^4.2.1",
"ember-cli-typescript-blueprints": "^3.0.0",
"ember-cli-uglify": "^3.0.0",
"ember-concurrency": "^2.1.2",
Expand Down
Loading