Skip to content

Commit

Permalink
Revert "refactor(cli): rework cli to support import without type modu…
Browse files Browse the repository at this point in the history
…le in package.json (#2509)"

This reverts commit e2f0f5f.
  • Loading branch information
odinr committed Oct 14, 2024
1 parent 2295130 commit 47d261b
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 95 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"scripts": {
"install": "pnpm -r exec genversion --es6 --semi src/version.ts",
"install:clean": "pnpm clean && pnpm install",
"clean": "pnpm -r clean && pnpm clean:build && pnpm clean:npm",
"clean": "pnpm clean:build && pnpm clean:npm",
"clean:npm": "pnpm -r exec rimraf node_modules && pnpm exec rimraf node_modules",
"clean:build": "pnpm -r exec rimraf dist tmp .cache .turbo tsconfig.tsbuildinfo",
"build": "turbo build --filter=!@equinor/fusion-framework-docs",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/bin/cli.mjs
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/usr/bin/env node
import('../dist/bin/main.mjs');
import('../dist/bin/main.js');
13 changes: 5 additions & 8 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,12 @@
}
},
"scripts": {
"build": "pnpm build:lib && pnpm build:dev-proxy && pnpm build:bin",
"prebuild": "pnpm build:source",
"build": "pnpm build:source && pnpm build:dev-server",
"build:clean": "rm -rf dist && rm -f tsconfig.tsbuildinfo && pnpm build",
"build:lib": "tsc -b tsconfig.lib.json",
"build:bin": "rollup -c",
"build:dev-proxy": "vite build",
"prepack": "pnpm build",
"clean": "rimraf dist, tsconfig.tsbuildinfo, tsconfig.lib.tsbuildinfo"
"build:source": "tsc -b",
"build:dev-server": "vite build",
"prepack": "pnpm build"
},
"dependencies": {
"@vitejs/plugin-react": "^4.0.4",
Expand Down Expand Up @@ -93,7 +92,6 @@
"@equinor/fusion-wc-chip": "^1.2.1",
"@equinor/fusion-wc-person": "^3.0.1",
"@material-ui/styles": "^4.11.5",
"@rollup/plugin-typescript": "^12.1.0",
"@types/adm-zip": "^0.5.0",
"@types/loader-utils": "^2.0.6",
"@types/node": "^20.11.14",
Expand All @@ -105,7 +103,6 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.15.0",
"rimraf": "^6.0.0",
"rollup": "^4.22.4",
"rxjs": "^7.8.1",
"styled-components": "^6.0.7",
Expand Down
21 changes: 0 additions & 21 deletions packages/cli/rollup.config.mjs

This file was deleted.

4 changes: 2 additions & 2 deletions packages/cli/src/bin/create-dev-serve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import portFinder from 'portfinder';
import deepmerge from 'deepmerge/index.js';

import ViteRestart from 'vite-plugin-restart';
import { appProxyPlugin } from '@equinor/fusion-framework-cli/app-proxy-plugin.js';
import { externalPublicPlugin } from '@equinor/fusion-framework-cli/external-public-plugin.js';
import { appProxyPlugin } from '../lib/plugins/app-proxy/app-proxy-plugin.js';
import { externalPublicPlugin } from '../lib/plugins/external-public/external-public-plugin.js';

import { supportedExt, type ConfigExecuterEnv } from '../lib/utils/config.js';
import { manifestConfigFilename } from '../lib/app-manifest.js';
Expand Down
7 changes: 1 addition & 6 deletions packages/cli/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,7 @@
"declarationDir": "./dist/types",
"baseUrl": ".",
"jsx": "react-jsx",
"paths": {
"@equinor/fusion-framework-cli/*-plugin.js": [
"./src/lib/plugins/*"
],
}
},
},
"references": [
{
"path": "../utils/observable"
Expand Down
11 changes: 0 additions & 11 deletions packages/cli/tsconfig.lib.json

This file was deleted.

45 changes: 0 additions & 45 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 47d261b

Please sign in to comment.