Skip to content

Commit

Permalink
Merge pull request #182 from Green-Software-Foundation/jsii-removal
Browse files Browse the repository at this point in the history
Remove JSII
  • Loading branch information
jmcook1186 authored Oct 10, 2023
2 parents 239b893 + 8d8bb20 commit a1b0c55
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 50 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/nodejs-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -32,6 +32,3 @@ jobs:

- name: Run tests
run: yarn test

- name: Build
run: yarn build
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ node_modules
.idea
*.tsbuildinfo
dist
tsconfig.json
.jsii
yarn-error.log
build
examples/ompls
44 changes: 0 additions & 44 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,6 @@
"name": "Green Software Foundation",
"email": "[email protected]"
},
"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": "*",
Expand Down Expand Up @@ -49,47 +36,16 @@
"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",
"repository": {
"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",
Expand Down
39 changes: 39 additions & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -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"
],
}

0 comments on commit a1b0c55

Please sign in to comment.