Skip to content

Commit

Permalink
Output is only to ES modules
Browse files Browse the repository at this point in the history
  • Loading branch information
gius committed Sep 3, 2023
1 parent 620a2aa commit b3c6f5c
Show file tree
Hide file tree
Showing 16 changed files with 545 additions and 227 deletions.
6 changes: 3 additions & 3 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"request": "launch",
"name": "Debug generator",
"cwd": "C:\\_Projects\\tuito\\frontend",
"runtimeArgs": ["-r", "${workspaceFolder}/node_modules/ts-node/register/transpile-only"],
"args": ["${workspaceFolder}/packages/generator/src/index.ts", "openapi", "-cgenerator-openapi-propertyinsurance.json"],
"preLaunchTask": "npm: build - packages/generator",
"args": ["${workspaceFolder}/packages/generator/dist/generator.js", "openapi", "-cgenerator-openapi-propertyinsurance.json"],
"env": {
"TS_NODE_PROJECT": "${workspaceFolder}/packages/generator/tsconfig.json"
"DEBUG": "true"
}
},
{
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"validate": "yarn run cleanbuild && yarn run test --run && yarn run lint && yarn run publish:all"
},
"devDependencies": {
"@emanprague/eslint-config": "^3.2.1",
"@emanprague/eslint-config": "^3.3.0",
"@testing-library/react": "14.0.0",
"cross-env": "^7.0.3",
"eslint": "^8.48.0",
Expand All @@ -52,9 +52,10 @@
"mobx": "6.10.2",
"prettier": "^3.0.3",
"rimraf": "^5.0.1",
"typedoc": "^0.24.8",
"rollup-plugin-preserve-directives": "0.2.0",
"typedoc": "^0.25.0",
"vite": "^4.4.9",
"vitest": "^0.34.3",
"vitest-mock-extended": "^1.2.0"
"vitest-mock-extended": "^1.2.1"
}
}
1 change: 1 addition & 0 deletions packages/apiclient/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import packageFile from "./package.json";
export default defineConfig({
build: {
lib: {
formats: ["es"],
entry: path.resolve(__dirname, "src/index.ts"),
name: "fruits-apiclient",
fileName: format => `index.${format}.js`,
Expand Down
1 change: 1 addition & 0 deletions packages/data/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { defineConfig } from "vite";
export default defineConfig({
build: {
lib: {
formats: ["es"],
entry: path.resolve(__dirname, "src/index.ts"),
name: "fruits-data",
fileName: format => `index.${format}.js`,
Expand Down
1 change: 1 addition & 0 deletions packages/datascreens/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import packageFile from "./package.json";
export default defineConfig({
build: {
lib: {
formats: ["es"],
entry: path.resolve(__dirname, "src/index.ts"),
name: "fruits-datascreens",
fileName: format => `index.${format}.js`,
Expand Down
1 change: 1 addition & 0 deletions packages/dataviews/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import packageFile from "./package.json";
export default defineConfig({
build: {
lib: {
formats: ["es"],
entry: path.resolve(__dirname, "src/index.ts"),
name: "fruits-dataviews",
fileName: format => `index.${format}.js`,
Expand Down
1 change: 1 addition & 0 deletions packages/dirtycheck/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import packageFile from "./package.json";
export default defineConfig({
build: {
lib: {
formats: ["es"],
entry: path.resolve(__dirname, "src/index.ts"),
name: "fruits-dirtycheck",
fileName: format => `index.${format}.js`,
Expand Down
4 changes: 2 additions & 2 deletions packages/generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
"devDependencies": {
"@types/cli-progress": "^3.11.0",
"@types/lodash-es": "4.17.9",
"@types/node": "20.5.7",
"nodemon": "2.0.22",
"@types/node": "20.5.9",
"nodemon": "3.0.1",
"rimraf": "^5.0.1",
"shx": "^0.3.4",
"ts-node": "^10.9.1",
Expand Down
6 changes: 5 additions & 1 deletion packages/generator/src/openapi/fileGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import Handlebars from "handlebars";
import { camelCase, groupBy } from "lodash-es";
import path from "path";
import type { Project } from "ts-morph";
import { fileURLToPath } from "url";
import { getRelativePath, pascalCase } from "../helpers";
import { createProgressBar } from "../progressBar";
import type Endpoint from "./models/endpoint";
Expand Down Expand Up @@ -145,11 +146,14 @@ export default class FileGenerator {
private getFullPath(filePath: string) {
if (filePath.startsWith("@")) {
// use built-in template
const templatesRoot = __filename.endsWith(".ts") ? "./templates/" : "./openapi/templates/"; // fix for local debugging
const templatesRoot = "./openapi/templates/";
const templatesFolder = path.join(templatesRoot, this.config.templatesFolder ?? ".", "/");
return path.resolve(__dirname, filePath.replace("@", templatesFolder));
} else {
return path.resolve(process.cwd(), filePath);
}
}
}

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
2 changes: 1 addition & 1 deletion packages/generator/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default defineConfig({
name: "fruits-generator",
},
rollupOptions: {
external: ["path", "fs", ...Object.keys(packageFile.dependencies)],
external: ["path", "fs", "url", ...Object.keys(packageFile.dependencies)],
output: {
sourcemap: true,
inlineDynamicImports: true,
Expand Down
1 change: 1 addition & 0 deletions packages/helpers/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import packageFile from "./package.json";
export default defineConfig({
build: {
lib: {
formats: ["es"],
entry: path.resolve(__dirname, "src/index.ts"),
name: "fruits-helpers",
fileName: format => `index.${format}.js`,
Expand Down
1 change: 1 addition & 0 deletions packages/htmlcontrols/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import packageFile from "./package.json";
export default defineConfig({
build: {
lib: {
formats: ["es"],
entry: path.resolve(__dirname, "src/index.ts"),
name: "fruits-htmlcontrols",
fileName: format => `index.${format}.js`,
Expand Down
1 change: 1 addition & 0 deletions packages/validation/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import packageFile from "./package.json";
export default defineConfig({
build: {
lib: {
formats: ["es"],
entry: path.resolve(__dirname, "src/index.ts"),
name: "fruits-validation",
fileName: format => `index.${format}.js`,
Expand Down
4 changes: 4 additions & 0 deletions packages/views/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
import path from "path";
import { defineConfig } from "vite";
import packageFile from "./package.json";
import preserveDirectives from "rollup-plugin-preserve-directives";

export default defineConfig({
build: {
lib: {
formats: ["es"],
entry: path.resolve(__dirname, "src/index.ts"),
name: "fruits-views",
fileName: format => `index.${format}.js`,
},
rollupOptions: {
external: [...Object.keys(packageFile.dependencies), ...Object.keys(packageFile.peerDependencies)],
plugins: [preserveDirectives()],
output: {
sourcemap: true,
preserveModules: true,
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion tsconfig-base.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@

"declaration": true,
"inlineSources": true,
"skipLibCheck": true // fix for lodash - TS2428: All declarations of 'WeakMap' must have identical type parameters
"skipLibCheck": true // fix for lodash - TS2428: All declarations of 'WeakMap' must have identical type parameters. You can try to remove it from time to time.
}
}

0 comments on commit b3c6f5c

Please sign in to comment.