From 9721d3d877e50bc54ea45c973b97e7b96da2aff2 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 1 Nov 2023 13:18:42 -0400 Subject: [PATCH] refactor(react): use ts rollup plugin --- packages/react/package-lock.json | 105 ++++++++++++++++++++++++++++++- packages/react/package.json | 7 +-- packages/react/rollup.config.js | 9 +-- packages/react/tsconfig.json | 2 +- 4 files changed, 109 insertions(+), 14 deletions(-) diff --git a/packages/react/package-lock.json b/packages/react/package-lock.json index 35fe26b039..22b02158e8 100644 --- a/packages/react/package-lock.json +++ b/packages/react/package-lock.json @@ -17,6 +17,7 @@ "@ionic/eslint-config": "^0.3.0", "@ionic/prettier-config": "^2.0.0", "@rollup/plugin-node-resolve": "^8.1.0", + "@rollup/plugin-typescript": "^11.1.5", "@rollup/plugin-virtual": "^2.0.3", "@testing-library/jest-dom": "^5.11.6", "@testing-library/react": "^11.2.2", @@ -1285,6 +1286,66 @@ "rollup": "^1.20.0||^2.0.0" } }, + "node_modules/@rollup/plugin-typescript": { + "version": "11.1.5", + "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-11.1.5.tgz", + "integrity": "sha512-rnMHrGBB0IUEv69Q8/JGRD/n4/n6b3nfpufUu26axhUcboUzv/twfZU8fIBbTOphRAe0v8EyxzeDpKXqGHfyDA==", + "dev": true, + "dependencies": { + "@rollup/pluginutils": "^5.0.1", + "resolve": "^1.22.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^2.14.0||^3.0.0||^4.0.0", + "tslib": "*", + "typescript": ">=3.7.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + }, + "tslib": { + "optional": true + } + } + }, + "node_modules/@rollup/plugin-typescript/node_modules/@rollup/pluginutils": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.5.tgz", + "integrity": "sha512-6aEYR910NyP73oHiJglti74iRyOwgFU4x3meH/H8OJx6Ry0j6cOVZ5X/wTvub7G7Ao6qaHBEaNsV3GLJkSsF+Q==", + "dev": true, + "dependencies": { + "@types/estree": "^1.0.0", + "estree-walker": "^2.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, + "node_modules/@rollup/plugin-typescript/node_modules/@types/estree": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.4.tgz", + "integrity": "sha512-2JwWnHK9H+wUZNorf2Zr6ves96WHoWDJIftkcxPKsS7Djta6Zu519LarhRNljPXkpsZR2ZMwNCPeW7omW07BJw==", + "dev": true + }, + "node_modules/@rollup/plugin-typescript/node_modules/estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "dev": true + }, "node_modules/@rollup/plugin-virtual": { "version": "2.0.3", "dev": true, @@ -8806,9 +8867,10 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "2.3.0", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, - "license": "MIT", "engines": { "node": ">=8.6" }, @@ -12174,6 +12236,41 @@ "resolve": "^1.17.0" } }, + "@rollup/plugin-typescript": { + "version": "11.1.5", + "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-11.1.5.tgz", + "integrity": "sha512-rnMHrGBB0IUEv69Q8/JGRD/n4/n6b3nfpufUu26axhUcboUzv/twfZU8fIBbTOphRAe0v8EyxzeDpKXqGHfyDA==", + "dev": true, + "requires": { + "@rollup/pluginutils": "^5.0.1", + "resolve": "^1.22.1" + }, + "dependencies": { + "@rollup/pluginutils": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.5.tgz", + "integrity": "sha512-6aEYR910NyP73oHiJglti74iRyOwgFU4x3meH/H8OJx6Ry0j6cOVZ5X/wTvub7G7Ao6qaHBEaNsV3GLJkSsF+Q==", + "dev": true, + "requires": { + "@types/estree": "^1.0.0", + "estree-walker": "^2.0.2", + "picomatch": "^2.3.1" + } + }, + "@types/estree": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.4.tgz", + "integrity": "sha512-2JwWnHK9H+wUZNorf2Zr6ves96WHoWDJIftkcxPKsS7Djta6Zu519LarhRNljPXkpsZR2ZMwNCPeW7omW07BJw==", + "dev": true + }, + "estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "dev": true + } + } + }, "@rollup/plugin-virtual": { "version": "2.0.3", "dev": true, @@ -17213,7 +17310,9 @@ "dev": true }, "picomatch": { - "version": "2.3.0", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, "pify": { diff --git a/packages/react/package.json b/packages/react/package.json index 3c150d5e58..45cf9926f3 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -21,14 +21,13 @@ }, "scripts": { "build": "npm run clean && npm run copy && npm run compile", - "clean": "rimraf dist && rimraf dist-transpiled && rimraf routing", - "compile": "npm run tsc && rollup -c", + "clean": "rimraf dist && rimraf routing", + "compile": "rollup -c", "eslint": "eslint src", "prettier": "prettier \"./src/**/*.{html,ts,tsx,js,jsx}\"", "release": "np --any-branch --yolo --no-release-draft", "lint": "npm run eslint && npm run prettier -- --write --cache", "lint.fix": "npm run eslint -- --fix && npm run prettier -- --write --cache", - "tsc": "tsc -p .", "copy": "node scripts/copy.js", "test.spec": "jest --ci", "test.treeshake": "node scripts/treeshaking.js dist/index.esm.js", @@ -53,6 +52,7 @@ "@ionic/eslint-config": "^0.3.0", "@ionic/prettier-config": "^2.0.0", "@rollup/plugin-node-resolve": "^8.1.0", + "@rollup/plugin-typescript": "^11.1.5", "@rollup/plugin-virtual": "^2.0.3", "@testing-library/jest-dom": "^5.11.6", "@testing-library/react": "^11.2.2", @@ -84,7 +84,6 @@ "testPathIgnorePatterns": [ "cypress", "node_modules", - "dist-transpiled", "dist", "test/base/*", "test/apps/*", diff --git a/packages/react/rollup.config.js b/packages/react/rollup.config.js index 1af9f78dc4..a8ebd1eeb4 100644 --- a/packages/react/rollup.config.js +++ b/packages/react/rollup.config.js @@ -1,12 +1,9 @@ import resolve from '@rollup/plugin-node-resolve'; import sourcemaps from 'rollup-plugin-sourcemaps'; -// import json from '@rollup/plugin-json'; +import typescript from '@rollup/plugin-typescript'; export default { - input: { - index: 'dist-transpiled/index', - // 'routing/index': 'dist-transpiled/routing/index' - }, + input: 'src/index.ts', output: [ { dir: 'dist/', @@ -18,8 +15,8 @@ export default { ], external: (id) => !/^(\.|\/)/.test(id), plugins: [ + typescript(), resolve(), sourcemaps(), - // json() ], }; diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json index 4582ca37b6..e0e309a1c9 100644 --- a/packages/react/tsconfig.json +++ b/packages/react/tsconfig.json @@ -15,7 +15,7 @@ "noImplicitReturns": true, "noUnusedLocals": true, "noUnusedParameters": true, - "outDir": "dist-transpiled", + "outDir": "dist", "declarationDir": "dist/types", "removeComments": false, "inlineSources": true,