From a044044768e890de3a01e8dce70dcb63808a5424 Mon Sep 17 00:00:00 2001 From: Gnanakeethan Balasubramaniam Date: Mon, 2 Oct 2023 11:22:31 +0530 Subject: [PATCH 1/3] Remove JSII Signed-off-by: Gnanakeethan Balasubramaniam --- .github/workflows/nodejs-ci.yml | 3 --- .gitignore | 2 -- package.json | 44 --------------------------------- 3 files changed, 49 deletions(-) diff --git a/.github/workflows/nodejs-ci.yml b/.github/workflows/nodejs-ci.yml index 4c82818a2..4d580ad47 100644 --- a/.github/workflows/nodejs-ci.yml +++ b/.github/workflows/nodejs-ci.yml @@ -32,6 +32,3 @@ jobs: - name: Run tests run: yarn test - - - name: Build - run: yarn build diff --git a/.gitignore b/.gitignore index 2171655e4..4fd3f4d95 100644 --- a/.gitignore +++ b/.gitignore @@ -6,8 +6,6 @@ node_modules .idea *.tsbuildinfo dist -tsconfig.json -.jsii yarn-error.log build examples/ompls diff --git a/package.json b/package.json index 3922b6c5c..3c2a6192c 100644 --- a/package.json +++ b/package.json @@ -6,19 +6,6 @@ "name": "Green Software Foundation", "email": "info@gsf.com" }, - "bundledDependencies": [ - "node-fetch", - "axios", - "typescript", - "ts-sync-request", - "@cloud-carbon-footprint/core", - "@cloud-carbon-footprint/aws", - "typescript-cubic-spline", - "js-yaml", - "@types/node", - "dayjs", - "ts-command-line-args" - ], "dependencies": { "@cloud-carbon-footprint/core": "*", "@cloud-carbon-footprint/aws": "*", @@ -49,34 +36,6 @@ "node": "18.17.1", "yarn": "1.22.19" }, - "jsii": { - "versionFormat": "full", - "tsc": { - "rootDir": "./src" - }, - "targets": { - "java": { - "package": "org.greensoftware.carbonql", - "maven": { - "groupId": "org.greensoftware", - "artifactId": "carbonql" - } - }, - "python": { - "distName": "carbon-ql.core", - "module": "carbon_ql" - }, - "go": { - "moduleName": "github.com/Green-Software-Foundation", - "packageName": "carbonql", - "versionSuffix": "-devprefix" - }, - "dotnet": { - "namespace": "GreenSoftwareFoundation.CarbonQL", - "packageId": "GreenSoftwareFoundation.CarbonQL" - } - } - }, "keywords": [], "license": "ISC", "main": "src/index.ts", @@ -84,12 +43,9 @@ "url": "https://github.com/Green-Software-Foundation/carbon-ql.git" }, "scripts": { - "build": "jsii", - "build:watch": "jsii --watch", "fix": "gts fix", "fix:package": "fixpack", "lint": "gts lint", - "package": "jsii-pacmak", "test": "jest" }, "stability": "stable", From fd60f43511b67e3f4ee569237c076965c91bc374 Mon Sep 17 00:00:00 2001 From: Gnanakeethan Balasubramaniam Date: Mon, 2 Oct 2023 11:24:45 +0530 Subject: [PATCH 2/3] Fix version Signed-off-by: Gnanakeethan Balasubramaniam --- .github/workflows/nodejs-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nodejs-ci.yml b/.github/workflows/nodejs-ci.yml index 4d580ad47..d864d5acd 100644 --- a/.github/workflows/nodejs-ci.yml +++ b/.github/workflows/nodejs-ci.yml @@ -13,7 +13,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 18.17.1 cache: 'yarn' - name: 'setup python' From 8d8bb20ec57ad4e3ddae05286f8c2994c3d9e7b3 Mon Sep 17 00:00:00 2001 From: Gnanakeethan Balasubramaniam Date: Tue, 10 Oct 2023 05:41:47 +0530 Subject: [PATCH 3/3] Adding tsconfig Signed-off-by: Gnanakeethan Balasubramaniam --- tsconfig.json | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 tsconfig.json diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 000000000..4ca342cb0 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,39 @@ +{ + "compilerOptions": { + "rootDir": "./src", + "declarationMap": false, + "inlineSourceMap": true, + "inlineSources": true, + "alwaysStrict": true, + "declaration": true, + "experimentalDecorators": true, + "incremental": true, + "lib": [ + "es2020" + ], + "module": "CommonJS", + "noEmitOnError": true, + "noFallthroughCasesInSwitch": true, + "noImplicitAny": true, + "noImplicitReturns": true, + "noImplicitThis": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "strict": true, + "strictNullChecks": true, + "strictPropertyInitialization": true, + "stripInternal": false, + "target": "ES2020", + "composite": false, + "tsBuildInfoFile": "tsconfig.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "exclude": [ + "node_modules", + ".types-compat" + ], +}