From 0ce349709b20d1f163516413d49d4cff4e4063db Mon Sep 17 00:00:00 2001 From: Jared Wray Date: Wed, 6 Mar 2024 08:15:48 -0800 Subject: [PATCH] moving to node 18 and ESM --- .gitignore | 1 + LICENSE | 2 +- package.json | 26 +++++++++++--------- tsconfig.json | 66 ++++++++++----------------------------------------- 4 files changed, 29 insertions(+), 66 deletions(-) diff --git a/.gitignore b/.gitignore index 795b9cf..b8b9310 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,4 @@ yarn.lock package-lock.json site/README.md dist-site/ +pnpm-lock.yaml diff --git a/LICENSE b/LICENSE index 01807e7..6edd6f9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021-2022 Jared Wray +Copyright (c) 2021-2024 Jared Wray Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/package.json b/package.json index 5f1f308..3fd743a 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,29 @@ { "name": "ecto", - "version": "2.5.0", + "version": "3.0.0", "description": "Modern Template Consolidation Engine for EJS, Markdown, Pug, Nunjucks, Liquid, and Handlebars", + "type": "module", "main": "./dist/ecto.js", "types": "./dist/ecto.d.ts", + "engines": { + "node": ">=18" + }, "repository": { "type": "git", "url": "git+https://github.com/jaredwray/ecto.git" }, "author": "Jared Wray ", "license": "MIT", + "scripts": { + "watch": "tsc -w -p .", + "clean": "rimraf ./dist yarn.lock package-lock.json ./coverage ./node_modules ./site/readme.md", + "test": "xo --fix && vitest run --coverage", + "compile": "tsc -p .", + "build": "rimraf ./dist && npm install && npm run test && npm run compile", + "prepare": "rimraf ./dist && npm run compile", + "website:build": "rimraf ./site/readme.md && npx -y docula build -s ./site -o ./dist-site", + "website:serve": "rimraf ./site/readme.md && npx -y docula serve -s ./site -o ./dist-site" + }, "keywords": [ "templates", "generator", @@ -30,16 +44,6 @@ "liquid", "liquidjs" ], - "scripts": { - "watch": "tsc -w -p .", - "clean": "rimraf ./dist yarn.lock package-lock.json ./coverage ./node_modules ./site/readme.md", - "test": "xo --fix && vitest run --coverage", - "compile": "tsc -p .", - "build": "rimraf ./dist && yarn && yarn test && yarn compile", - "prepare": "rimraf ./dist && yarn compile", - "website:build": "rimraf ./site/readme.md && npx -y docula build -s ./site -o ./dist-site", - "website:serve": "rimraf ./site/readme.md && npx -y docula serve -s ./site -o ./dist-site" - }, "dependencies": { "@jaredwray/fumanchu": "^1.1.3", "@markdoc/markdoc": "^0.4.0", diff --git a/tsconfig.json b/tsconfig.json index c7466a2..d3ed088 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,58 +1,16 @@ { "compilerOptions": { - /* Basic Options */ - "target": "es2020", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', or 'ESNEXT'. */ - "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */ - "lib": ["es2020"], /* Specify library files to be included in the compilation: */ - // "allowJs": true, /* Allow javascript files to be compiled. */ - // "checkJs": true, /* Report errors in .js files. */ - // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */ - "declaration": true, /* Generates corresponding '.d.ts' file. */ - //"sourceMap": true, /* Generates corresponding '.map' file. */ - //"outFile": "", /* Concatenate and emit output to single file. */ - "outDir": "./dist", /* Redirect output structure to the directory. */ - "skipLibCheck": true, - // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ - // "removeComments": true, /* Do not emit comments to output. */ - // "noEmit": true, /* Do not emit outputs. */ - // "importHelpers": true, /* Import emit helpers from 'tslib'. */ - // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ - // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ - - /* Strict Type-Checking Options */ - "strict": true, /* Enable all strict type-checking options. */ - // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ - // "strictNullChecks": true, /* Enable strict null checks. */ - // "strictFunctionTypes": true, /* Enable strict checking of function types. */ - // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ - // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ - - /* Additional Checks */ - // "noUnusedLocals": true, /* Report errors on unused locals. */ - // "noUnusedParameters": true, /* Report errors on unused parameters. */ - // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ - // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ - - /* Module Resolution Options */ - "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ - // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ - // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ - // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ - // "typeRoots": [], /* List of folders to include type definitions from. */ - // "types": [], /* Type declaration files to be included in compilation. */ - // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ - // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ - - /* Source Map Options */ - // "sourceRoot": "./", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ - // "mapRoot": "./", /* Specify the location where debugger should locate map files instead of generated locations. */ - "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */ - "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */ - - /* Experimental Options */ - // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ - // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ + "target": "ESNext", // Compile down to a version of ECMAScript that supports ES Modules natively + "module": "ESNext", // Use native ECMAScript modules + "moduleResolution": "node", // Use Node.js module resolution mechanism + "strict": true, // Enable all strict type-checking options + "esModuleInterop": true, // Enables compatibility with CommonJS modules for default exports + "forceConsistentCasingInFileNames": true, // Ensure case sensitivity for filenames + "skipLibCheck": true, // Skip type checking of declaration files + "outDir": "./dist", // Output directory for compiled files + "declaration": true, // Generates corresponding '.d.ts' file. + "sourceMap": true // Generates corresponding '.map' file for debugging }, - "include": [ - "src/**/*" ] + "include": ["src/**/*"], // Specify which files to include in compilation + "exclude": ["node_modules", "dist"] // Exclude directories from compilation } \ No newline at end of file