From f4f1c90306d1b408b8ad7f2b83045ecf2cfc7794 Mon Sep 17 00:00:00 2001 From: Chris Thoburn Date: Sat, 13 Apr 2024 02:31:59 -0700 Subject: [PATCH] more addon conversion --- .../{babel.config.js => babel.config.mjs} | 6 +-- packages/active-record/babel.config.json | 8 ---- packages/active-record/babel.config.mjs | 11 +++++ packages/active-record/package.json | 10 +--- packages/active-record/rollup.config.mjs | 13 +++--- .../{babel.config.js => babel.config.mjs} | 6 +-- packages/adapter/package.json | 10 ++-- packages/adapter/rollup.config.mjs | 13 +++--- .../{babel.config.js => babel.config.mjs} | 0 .../{babel.config.js => babel.config.mjs} | 2 +- .../{babel.config.js => babel.config.mjs} | 5 +- packages/request-utils/babel.config.json | 8 ---- packages/request-utils/babel.config.mjs | 11 +++++ packages/rest/babel.config.json | 8 ---- packages/rest/babel.config.mjs | 11 +++++ pnpm-lock.yaml | 46 +++++-------------- 16 files changed, 74 insertions(+), 94 deletions(-) rename packages/-ember-data/{babel.config.js => babel.config.mjs} (76%) delete mode 100644 packages/active-record/babel.config.json create mode 100644 packages/active-record/babel.config.mjs rename packages/adapter/{babel.config.js => babel.config.mjs} (76%) rename packages/build-config/{babel.config.js => babel.config.mjs} (100%) rename packages/core-types/{babel.config.js => babel.config.mjs} (81%) rename packages/ember/{babel.config.js => babel.config.mjs} (83%) delete mode 100644 packages/request-utils/babel.config.json create mode 100644 packages/request-utils/babel.config.mjs delete mode 100644 packages/rest/babel.config.json create mode 100644 packages/rest/babel.config.mjs diff --git a/packages/-ember-data/babel.config.js b/packages/-ember-data/babel.config.mjs similarity index 76% rename from packages/-ember-data/babel.config.js rename to packages/-ember-data/babel.config.mjs index 6a948154baf..0676d3284f0 100644 --- a/packages/-ember-data/babel.config.js +++ b/packages/-ember-data/babel.config.mjs @@ -1,8 +1,8 @@ -const macros = require('@warp-drive/build-config/babel-macros'); +import { macros } from '@warp-drive/build-config/babel-macros'; -module.exports = { +export default { plugins: [ - ...macros, + ...macros(), ['@babel/plugin-transform-runtime', { loose: true }], [ '@babel/plugin-transform-typescript', diff --git a/packages/active-record/babel.config.json b/packages/active-record/babel.config.json deleted file mode 100644 index 0e04314a08c..00000000000 --- a/packages/active-record/babel.config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "plugins": [ - "@babel/plugin-transform-runtime", - ["@babel/plugin-transform-typescript", { "allowDeclareFields": true }], - ["@babel/plugin-proposal-decorators", { "legacy": true }], - "@babel/plugin-transform-class-properties" - ] -} diff --git a/packages/active-record/babel.config.mjs b/packages/active-record/babel.config.mjs new file mode 100644 index 00000000000..89e6a46e8a2 --- /dev/null +++ b/packages/active-record/babel.config.mjs @@ -0,0 +1,11 @@ +import { macros } from '@warp-drive/build-config/babel-macros'; + +export default { + plugins: [ + ...macros(), + [ + '@babel/plugin-transform-typescript', + { allExtensions: true, onlyRemoveTypeImports: true, allowDeclareFields: true }, + ], + ], +}; diff --git a/packages/active-record/package.json b/packages/active-record/package.json index 6017fca5b02..46532b52c1a 100644 --- a/packages/active-record/package.json +++ b/packages/active-record/package.json @@ -75,8 +75,7 @@ }, "scripts": { "lint": "eslint . --quiet --cache --cache-strategy=content --ext .js,.ts,.mjs,.cjs --report-unused-disable-directives", - "build:client": "rollup --config", - "_build": "bun run build:client", + "_build": "rollup --config", "prepack": "bun run _build", "_syncPnpm": "bun run sync-dependencies-meta-injected" }, @@ -86,10 +85,7 @@ "version": 2 }, "devDependencies": { - "@babel/cli": "^7.24.1", "@babel/core": "^7.24.4", - "@babel/plugin-proposal-decorators": "^7.24.1", - "@babel/plugin-transform-class-properties": "^7.24.1", "@babel/plugin-transform-runtime": "^7.24.3", "@babel/plugin-transform-typescript": "^7.24.4", "@babel/preset-env": "^7.24.4", @@ -102,15 +98,13 @@ "@ember/string": "^3.1.1", "@embroider/addon-dev": "^4.3.1", "@glimmer/component": "^1.1.2", - "@rollup/plugin-babel": "^6.0.4", - "@rollup/plugin-node-resolve": "^15.2.3", "@warp-drive/core-types": "workspace:0.0.0-alpha.39", "@warp-drive/internal-config": "workspace:5.4.0-alpha.53", "ember-inflector": "^4.0.2", "ember-source": "~5.7.0", "rollup": "^4.14.1", + "rollup-plugin-ts": "^3.4.5", "typescript": "^5.4.5", - "walk-sync": "^3.0.0", "pnpm-sync-dependencies-meta-injected": "0.0.10" }, "ember": { diff --git a/packages/active-record/rollup.config.mjs b/packages/active-record/rollup.config.mjs index 5ca2509aa89..10c9b8b6b0b 100644 --- a/packages/active-record/rollup.config.mjs +++ b/packages/active-record/rollup.config.mjs @@ -1,6 +1,6 @@ import { Addon } from '@embroider/addon-dev/rollup'; -import babel from '@rollup/plugin-babel'; -import { nodeResolve } from '@rollup/plugin-node-resolve'; +import ts from 'rollup-plugin-ts'; +import babelConfig from './babel.config.mjs'; import { external } from '@warp-drive/internal-config/rollup/external.js'; @@ -21,10 +21,11 @@ export default { // addon. Anything not listed here may get optimized away. addon.publicEntrypoints(['request.js']), - nodeResolve({ extensions: ['.ts'] }), - babel({ - extensions: ['.ts'], - babelHelpers: 'runtime', // we should consider "external", + ts({ + transpiler: 'babel', + babelConfig, + // transpileOnly: true, + browserslist: false, }), // Remove leftover build artifacts when starting a new build. diff --git a/packages/adapter/babel.config.js b/packages/adapter/babel.config.mjs similarity index 76% rename from packages/adapter/babel.config.js rename to packages/adapter/babel.config.mjs index 6a948154baf..0676d3284f0 100644 --- a/packages/adapter/babel.config.js +++ b/packages/adapter/babel.config.mjs @@ -1,8 +1,8 @@ -const macros = require('@warp-drive/build-config/babel-macros'); +import { macros } from '@warp-drive/build-config/babel-macros'; -module.exports = { +export default { plugins: [ - ...macros, + ...macros(), ['@babel/plugin-transform-runtime', { loose: true }], [ '@babel/plugin-transform-typescript', diff --git a/packages/adapter/package.json b/packages/adapter/package.json index 4314eb4067c..5331796827e 100644 --- a/packages/adapter/package.json +++ b/packages/adapter/package.json @@ -15,8 +15,7 @@ "directories": {}, "scripts": { "lint": "eslint . --quiet --cache --cache-strategy=content --ext .js,.ts,.mjs,.cjs --report-unused-disable-directives", - "build:client": "rollup --config", - "_build": "bun run build:client", + "_build": "rollup --config", "prepack": "bun run _build", "_syncPnpm": "bun run sync-dependencies-meta-injected" }, @@ -90,7 +89,6 @@ "ember-cli-test-info": "^1.0.0" }, "devDependencies": { - "@babel/cli": "^7.24.1", "@babel/core": "^7.24.4", "@babel/plugin-transform-runtime": "^7.24.3", "@babel/plugin-transform-typescript": "^7.24.4", @@ -107,18 +105,16 @@ "@ember/string": "^3.1.1", "@embroider/addon-dev": "^4.3.1", "@glimmer/component": "^1.1.2", - "@rollup/plugin-babel": "^6.0.4", - "@rollup/plugin-node-resolve": "^15.2.3", "decorator-transforms": "1.1.0", "@types/jquery": "^3.5.29", "@warp-drive/core-types": "workspace:0.0.0-alpha.39", "@warp-drive/internal-config": "workspace:5.4.0-alpha.53", + "@warp-drive/build-config": "workspace:0.0.0-alpha.1", "ember-inflector": "^4.0.2", "ember-source": "~5.7.0", "rollup": "^4.14.1", + "rollup-plugin-ts": "^3.4.5", "typescript": "^5.4.5", - "walk-sync": "^3.0.0", - "webpack": "^5.91.0", "pnpm-sync-dependencies-meta-injected": "0.0.10" }, "engines": { diff --git a/packages/adapter/rollup.config.mjs b/packages/adapter/rollup.config.mjs index 4d4b1b93ee5..85fceadc66e 100644 --- a/packages/adapter/rollup.config.mjs +++ b/packages/adapter/rollup.config.mjs @@ -1,6 +1,6 @@ import { Addon } from '@embroider/addon-dev/rollup'; -import babel from '@rollup/plugin-babel'; -import { nodeResolve } from '@rollup/plugin-node-resolve'; +import ts from 'rollup-plugin-ts'; +import babelConfig from './babel.config.mjs'; import { external } from '@warp-drive/internal-config/rollup/external.js'; @@ -29,10 +29,11 @@ export default { // addon. Anything not listed here may get optimized away. addon.publicEntrypoints(['index.js', 'error.js', 'json-api.js', 'rest.js', '-private.js']), - nodeResolve({ extensions: ['.ts', '.js'] }), - babel({ - extensions: ['.ts', '.js'], - babelHelpers: 'runtime', // we should consider "external", + ts({ + transpiler: 'babel', + babelConfig, + transpileOnly: true, + browserslist: false, }), // Remove leftover build artifacts when starting a new build. diff --git a/packages/build-config/babel.config.js b/packages/build-config/babel.config.mjs similarity index 100% rename from packages/build-config/babel.config.js rename to packages/build-config/babel.config.mjs diff --git a/packages/core-types/babel.config.js b/packages/core-types/babel.config.mjs similarity index 81% rename from packages/core-types/babel.config.js rename to packages/core-types/babel.config.mjs index 0e8cac86651..eba0be86353 100644 --- a/packages/core-types/babel.config.js +++ b/packages/core-types/babel.config.mjs @@ -1,3 +1,3 @@ -module.exports = { +export default { plugins: [['@babel/plugin-transform-typescript', { allowDeclareFields: true }]], }; diff --git a/packages/ember/babel.config.js b/packages/ember/babel.config.mjs similarity index 83% rename from packages/ember/babel.config.js rename to packages/ember/babel.config.mjs index 3a61dfee6d2..fe33d8602ba 100644 --- a/packages/ember/babel.config.js +++ b/packages/ember/babel.config.mjs @@ -1,5 +1,8 @@ -module.exports = { +import { macros } from '@warp-drive/build-config/babel-macros'; + +export default { plugins: [ + ...macros(), ['@babel/plugin-transform-runtime', { loose: true }], [ '@babel/plugin-transform-typescript', diff --git a/packages/request-utils/babel.config.json b/packages/request-utils/babel.config.json deleted file mode 100644 index 0e04314a08c..00000000000 --- a/packages/request-utils/babel.config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "plugins": [ - "@babel/plugin-transform-runtime", - ["@babel/plugin-transform-typescript", { "allowDeclareFields": true }], - ["@babel/plugin-proposal-decorators", { "legacy": true }], - "@babel/plugin-transform-class-properties" - ] -} diff --git a/packages/request-utils/babel.config.mjs b/packages/request-utils/babel.config.mjs new file mode 100644 index 00000000000..89e6a46e8a2 --- /dev/null +++ b/packages/request-utils/babel.config.mjs @@ -0,0 +1,11 @@ +import { macros } from '@warp-drive/build-config/babel-macros'; + +export default { + plugins: [ + ...macros(), + [ + '@babel/plugin-transform-typescript', + { allExtensions: true, onlyRemoveTypeImports: true, allowDeclareFields: true }, + ], + ], +}; diff --git a/packages/rest/babel.config.json b/packages/rest/babel.config.json deleted file mode 100644 index 0e04314a08c..00000000000 --- a/packages/rest/babel.config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "plugins": [ - "@babel/plugin-transform-runtime", - ["@babel/plugin-transform-typescript", { "allowDeclareFields": true }], - ["@babel/plugin-proposal-decorators", { "legacy": true }], - "@babel/plugin-transform-class-properties" - ] -} diff --git a/packages/rest/babel.config.mjs b/packages/rest/babel.config.mjs new file mode 100644 index 00000000000..89e6a46e8a2 --- /dev/null +++ b/packages/rest/babel.config.mjs @@ -0,0 +1,11 @@ +import { macros } from '@warp-drive/build-config/babel-macros'; + +export default { + plugins: [ + ...macros(), + [ + '@babel/plugin-transform-typescript', + { allExtensions: true, onlyRemoveTypeImports: true, allowDeclareFields: true }, + ], + ], +}; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a1527388574..11a6c74d59a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -305,18 +305,9 @@ importers: specifier: workspace:0.0.0-alpha.1 version: file:packages/build-config devDependencies: - '@babel/cli': - specifier: ^7.24.1 - version: 7.24.1(@babel/core@7.24.4) '@babel/core': specifier: ^7.24.4 version: 7.24.4(supports-color@8.1.1) - '@babel/plugin-proposal-decorators': - specifier: ^7.24.1 - version: 7.24.1(@babel/core@7.24.4) - '@babel/plugin-transform-class-properties': - specifier: ^7.24.1 - version: 7.24.1(@babel/core@7.24.4) '@babel/plugin-transform-runtime': specifier: ^7.24.3 version: 7.24.3(@babel/core@7.24.4) @@ -353,12 +344,6 @@ importers: '@glimmer/component': specifier: ^1.1.2 version: 1.1.2(@babel/core@7.24.4) - '@rollup/plugin-babel': - specifier: ^6.0.4 - version: 6.0.4(@babel/core@7.24.4)(rollup@4.14.1) - '@rollup/plugin-node-resolve': - specifier: ^15.2.3 - version: 15.2.3(rollup@4.14.1) '@warp-drive/core-types': specifier: workspace:0.0.0-alpha.39 version: file:packages/core-types(@glint/template@1.4.0) @@ -377,12 +362,12 @@ importers: rollup: specifier: ^4.14.1 version: 4.14.1 + rollup-plugin-ts: + specifier: ^3.4.5 + version: 3.4.5(@babel/core@7.24.4)(@babel/plugin-transform-runtime@7.24.3)(@babel/preset-env@7.24.4)(@babel/preset-typescript@7.24.1)(@babel/runtime@7.24.4)(rollup@4.14.1)(typescript@5.4.5) typescript: specifier: ^5.4.5 version: 5.4.5 - walk-sync: - specifier: ^3.0.0 - version: 3.0.0 dependenciesMeta: '@ember-data/request': injected: true @@ -413,9 +398,6 @@ importers: specifier: ^1.0.0 version: 1.0.0 devDependencies: - '@babel/cli': - specifier: ^7.24.1 - version: 7.24.1(@babel/core@7.24.4) '@babel/core': specifier: ^7.24.4 version: 7.24.4(supports-color@8.1.1) @@ -464,15 +446,12 @@ importers: '@glimmer/component': specifier: ^1.1.2 version: 1.1.2(@babel/core@7.24.4) - '@rollup/plugin-babel': - specifier: ^6.0.4 - version: 6.0.4(@babel/core@7.24.4)(rollup@4.14.1) - '@rollup/plugin-node-resolve': - specifier: ^15.2.3 - version: 15.2.3(rollup@4.14.1) '@types/jquery': specifier: ^3.5.29 version: 3.5.29 + '@warp-drive/build-config': + specifier: workspace:0.0.0-alpha.1 + version: link:../build-config '@warp-drive/core-types': specifier: workspace:0.0.0-alpha.39 version: file:packages/core-types(@glint/template@1.4.0) @@ -487,22 +466,19 @@ importers: version: 4.0.2(@babel/core@7.24.4) ember-source: specifier: ~5.7.0 - version: 5.7.0(@babel/core@7.24.4)(@glimmer/component@1.1.2)(@glint/template@1.4.0)(webpack@5.91.0) + version: 5.7.0(@babel/core@7.24.4)(@glimmer/component@1.1.2)(@glint/template@1.4.0) pnpm-sync-dependencies-meta-injected: specifier: 0.0.10 version: 0.0.10 rollup: specifier: ^4.14.1 version: 4.14.1 + rollup-plugin-ts: + specifier: ^3.4.5 + version: 3.4.5(@babel/core@7.24.4)(@babel/plugin-transform-runtime@7.24.3)(@babel/preset-env@7.24.4)(@babel/preset-typescript@7.24.1)(@babel/runtime@7.24.4)(rollup@4.14.1)(typescript@5.4.5) typescript: specifier: ^5.4.5 version: 5.4.5 - walk-sync: - specifier: ^3.0.0 - version: 3.0.0 - webpack: - specifier: ^5.91.0 - version: 5.91.0 dependenciesMeta: '@ember-data/graph': injected: true @@ -2129,7 +2105,7 @@ importers: specifier: ^3.0.0 version: 3.0.0 dependenciesMeta: - '@ember-data/private-build-infra': + '@warp-drive/build-config': injected: true packages/unpublished-eslint-rules: