diff --git a/nx.json b/nx.json index 3833b6b3..7488ff80 100644 --- a/nx.json +++ b/nx.json @@ -1,7 +1,7 @@ { "tasksRunnerOptions": { "default": { - "runner": "nx/tasks-runners/default", + "runner": "nx-cloud", "options": { "cacheableOperations": [ "build", @@ -14,7 +14,8 @@ "generateDevIndexHTML" ], "cacheDirectory": ".cache/nx", - "parallel": 1 + "parallel": 1, + "nxCloudId": "681a220b646ee9953edfaaa1" } }, "ci": { @@ -30,19 +31,38 @@ "codegen/frontend-client", "generateDevIndexHTML" ], - "nxCloudId": "64e4eb6a54304f090734e8df" + "nxCloudId": "681a220b646ee9953edfaaa1" } }, "docker-test": { "runner": "@nx/workspace/tasks-runners/default", - "options": { "cacheableOperations": [], "cacheDirectory": ".cache/nx" } + "options": { + "cacheableOperations": [], + "cacheDirectory": ".cache/nx" + } } }, "generators": { - "@nrwl/nx-plugin": { "plugin": { "linter": "eslint" } }, - "@nx/workspace": { "library": { "linter": "eslint" } }, - "@nx/cypress": { "cypress-project": { "linter": "eslint" } }, - "@nx/web": { "application": { "linter": "eslint" } }, + "@nrwl/nx-plugin": { + "plugin": { + "linter": "eslint" + } + }, + "@nx/workspace": { + "library": { + "linter": "eslint" + } + }, + "@nx/cypress": { + "cypress-project": { + "linter": "eslint" + } + }, + "@nx/web": { + "application": { + "linter": "eslint" + } + }, "@nx/react": { "application": { "style": "scss", @@ -51,7 +71,9 @@ "pascalCaseFiles": true, "babel": true }, - "component": { "style": "scss" }, + "component": { + "style": "scss" + }, "library": { "style": "scss", "linter": "eslint", @@ -59,15 +81,32 @@ } }, "@nx/node": { - "application": { "linter": "eslint" }, - "library": { "linter": "eslint" } + "application": { + "linter": "eslint" + }, + "library": { + "linter": "eslint" + } }, "@nx/express": { - "application": { "linter": "eslint" }, - "library": { "linter": "eslint" } + "application": { + "linter": "eslint" + }, + "library": { + "linter": "eslint" + } + }, + "@nx/nest": { + "application": { + "linter": "eslint" + } }, - "@nx/nest": { "application": { "linter": "eslint" } }, - "@nx/next": { "application": { "style": "scss", "linter": "eslint" } } + "@nx/next": { + "application": { + "style": "scss", + "linter": "eslint" + } + } }, "$schema": "./node_modules/nx/schemas/nx-schema.json", "targetDefaults": { @@ -75,8 +114,13 @@ "dependsOn": ["^build"], "inputs": ["production", "^production", "DevOps"] }, - "e2e": { "inputs": ["default", "^production"], "cache": true }, - "lint": { "inputs": ["default", "{workspaceRoot}/.eslintrc.json"] }, + "e2e": { + "inputs": ["default", "^production"], + "cache": true + }, + "lint": { + "inputs": ["default", "{workspaceRoot}/.eslintrc.json"] + }, "test": { "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"] }, @@ -104,8 +148,15 @@ "@nx/jest:jest": { "cache": true, "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"], - "options": { "passWithNoTests": true }, - "configurations": { "ci": { "ci": true, "codeCoverage": true } } + "options": { + "passWithNoTests": true + }, + "configurations": { + "ci": { + "ci": true, + "codeCoverage": true + } + } }, "@nx/eslint:lint": { "inputs": ["default", "{workspaceRoot}/.eslintrc.json"], @@ -124,8 +175,16 @@ }, "namedInputs": { "default": ["{projectRoot}/**/*", "sharedGlobals"], - "forceRebuild": [{ "runtime": "node .github/actions/force-build.mjs" }], - "nodeVersion": [{ "runtime": "node --version" }], + "forceRebuild": [ + { + "runtime": "node .github/actions/force-build.mjs" + } + ], + "nodeVersion": [ + { + "runtime": "node --version" + } + ], "DevOps": ["CI", "Dockerfiles", "{workspaceRoot}/scripts/**/*"], "CI": [ "{workspaceRoot}/.github/actions/", @@ -156,17 +215,22 @@ "!{projectRoot}/src/test-setup.[jt]s" ], "graphql-files": [ - { "runtime": "node scripts/hash-files apps/api/src/api.graphql" }, + { + "runtime": "node scripts/hash-files apps/api/src/api.graphql" + }, "{projectRoot}/codegen.yml", "{projectRoot}/**/*.graphql" ], "schema-files": [ "{projectRoot}/**/clientConfig.@(yml|yaml|json)", - { "dependentTasksOutputFiles": "**/openapi.@(yml|yaml|json)" }, - { "dependentTasksOutputFiles": "**/api.graphql" } + { + "dependentTasksOutputFiles": "**/openapi.@(yml|yaml|json)" + }, + { + "dependentTasksOutputFiles": "**/api.graphql" + } ] }, "useInferencePlugins": false, - "defaultBase": "main", - "nxCloudAccessToken": "Yzg2YjljMTktMzQ0YS00YmE2LThmMTMtY2ZhOTY3ODNiZDJjfHJlYWQtd3JpdGU=" + "defaultBase": "main" } diff --git a/package.json b/package.json index 8c2ad077..55d60fe8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "island.is", - "version": "0.0.6", + "name": "island.tax.demo", + "version": "0.0.1", "license": "MIT", "engines": { "npm": "please-use-yarn", @@ -9,10 +9,10 @@ }, "repository": { "type": "git", - "url": "https://github.com/island-is/island.is.git" + "url": "https://github.com/1xINTERNET/island.tax" }, "workspaces": [ - "apps/native/*" + "apps/tax/*" ], "scripts": { "nx": "nx", @@ -476,6 +476,7 @@ "next-secure-headers": "2.1.0", "nodemailer-mock": "2.0.6", "nx": "19.4.0", + "nx-cloud": "latest", "prettier": "2.6.2", "react-native-svg": "15.2.0", "react-native-svg-transformer": "1.3.0", diff --git a/yarn.lock b/yarn.lock index 234835d9..a2f086ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15628,6 +15628,15 @@ __metadata: languageName: node linkType: hard +"@nrwl/nx-cloud@npm:19.1.0": + version: 19.1.0 + resolution: "@nrwl/nx-cloud@npm:19.1.0" + dependencies: + nx-cloud: "npm:19.1.0" + checksum: 10/ecae86aa0af80fb5d82f7f1cfc8e985231624f19b0131237a891895804def6f20a3c69fb2dbab020889b0351361ba9e9108a104c6f40243b029a7f98868a0042 + languageName: node + linkType: hard + "@nrwl/react-native@npm:19.4.0": version: 19.4.0 resolution: "@nrwl/react-native@npm:19.4.0" @@ -38252,6 +38261,13 @@ __metadata: languageName: node linkType: hard +"ini@npm:4.1.3": + version: 4.1.3 + resolution: "ini@npm:4.1.3" + checksum: 10/f536b414d1442e5b233429e2b56efcdb354109b2d65ddd489e5939d8f0f5ad23c88aa2b19c92987249d0dd63ba8192e9aeb1a02b0459549c5a9ff31acd729a5d + languageName: node + linkType: hard + "ini@npm:^1.3.4, ini@npm:~1.3.0": version: 1.3.8 resolution: "ini@npm:1.3.8" @@ -39864,6 +39880,7 @@ __metadata: nodemailer: "npm:6.10.0" nodemailer-mock: "npm:2.0.6" nx: "npm:19.4.0" + nx-cloud: "npm:latest" oidc-client-ts: "npm:2.4.0" openapi3-ts: "npm:2.0.0" opossum: "npm:6.1.0" @@ -46474,7 +46491,7 @@ __metadata: languageName: node linkType: hard -"node-machine-id@npm:1.1.12": +"node-machine-id@npm:1.1.12, node-machine-id@npm:^1.1.12": version: 1.1.12 resolution: "node-machine-id@npm:1.1.12" checksum: 10/46bf3d4fab8d0e63b24c42bcec2b6975c7ec5bc16e53d7a589d095668d0fdf0bfcbcdc28246dd1ef74cf95a37fbd774cd4b17b41f518d79dfad7fdc99f995903 @@ -46787,6 +46804,26 @@ __metadata: languageName: node linkType: hard +"nx-cloud@npm:19.1.0, nx-cloud@npm:latest": + version: 19.1.0 + resolution: "nx-cloud@npm:19.1.0" + dependencies: + "@nrwl/nx-cloud": "npm:19.1.0" + axios: "npm:^1.6.0" + chalk: "npm:^4.1.0" + dotenv: "npm:~10.0.0" + fs-extra: "npm:^11.1.0" + ini: "npm:4.1.3" + node-machine-id: "npm:^1.1.12" + open: "npm:~8.4.0" + tar: "npm:6.2.1" + yargs-parser: "npm:>=21.1.1" + bin: + nx-cloud: bin/nx-cloud.js + checksum: 10/c4cfaac8b048580e6d0b18d1cc6c94107762c91fc9530806465a7286f2fff924bc98914883ddb052c53c4066fbe2bfe19674f69729e28fe4928e25dd1e911828 + languageName: node + linkType: hard + "nx@npm:12.10.1": version: 12.10.1 resolution: "nx@npm:12.10.1" @@ -47354,7 +47391,7 @@ __metadata: languageName: node linkType: hard -"open@npm:^8.0.4, open@npm:^8.0.9, open@npm:^8.3.0": +"open@npm:^8.0.4, open@npm:^8.0.9, open@npm:^8.3.0, open@npm:~8.4.0": version: 8.4.2 resolution: "open@npm:8.4.2" dependencies: @@ -59634,7 +59671,7 @@ __metadata: languageName: node linkType: hard -"yargs-parser@npm:21.1.1, yargs-parser@npm:^21.0.1, yargs-parser@npm:^21.1.1": +"yargs-parser@npm:21.1.1, yargs-parser@npm:>=21.1.1, yargs-parser@npm:^21.0.1, yargs-parser@npm:^21.1.1": version: 21.1.1 resolution: "yargs-parser@npm:21.1.1" checksum: 10/9dc2c217ea3bf8d858041252d43e074f7166b53f3d010a8c711275e09cd3d62a002969a39858b92bbda2a6a63a585c7127014534a560b9c69ed2d923d113406e