diff --git a/src/010-typescript-in-the-build-process/013-setting-up-a-frontend-app-with-vite.solution/tsconfig.json b/src/010-typescript-in-the-build-process/013-setting-up-a-frontend-app-with-vite.solution/tsconfig.json index f54ef55..3c0ca0d 100644 --- a/src/010-typescript-in-the-build-process/013-setting-up-a-frontend-app-with-vite.solution/tsconfig.json +++ b/src/010-typescript-in-the-build-process/013-setting-up-a-frontend-app-with-vite.solution/tsconfig.json @@ -4,7 +4,7 @@ "useDefineForClassFields": true, "module": "ESNext", "lib": [ - "ES2020", + "ES2022", "DOM", "DOM.Iterable" ], diff --git a/src/010-typescript-in-the-build-process/014-typescript-as-a-linter.problem/tsconfig.json b/src/010-typescript-in-the-build-process/014-typescript-as-a-linter.problem/tsconfig.json index f54ef55..3c0ca0d 100644 --- a/src/010-typescript-in-the-build-process/014-typescript-as-a-linter.problem/tsconfig.json +++ b/src/010-typescript-in-the-build-process/014-typescript-as-a-linter.problem/tsconfig.json @@ -4,7 +4,7 @@ "useDefineForClassFields": true, "module": "ESNext", "lib": [ - "ES2020", + "ES2022", "DOM", "DOM.Iterable" ], diff --git a/src/010-typescript-in-the-build-process/014-typescript-as-a-linter.solution/tsconfig.json b/src/010-typescript-in-the-build-process/014-typescript-as-a-linter.solution/tsconfig.json index f54ef55..3c0ca0d 100644 --- a/src/010-typescript-in-the-build-process/014-typescript-as-a-linter.solution/tsconfig.json +++ b/src/010-typescript-in-the-build-process/014-typescript-as-a-linter.solution/tsconfig.json @@ -4,7 +4,7 @@ "useDefineForClassFields": true, "module": "ESNext", "lib": [ - "ES2020", + "ES2022", "DOM", "DOM.Iterable" ], diff --git a/src/010-typescript-in-the-build-process/015-typescript-on-ci.explainer/tsconfig.json b/src/010-typescript-in-the-build-process/015-typescript-on-ci.explainer/tsconfig.json index f54ef55..3c0ca0d 100644 --- a/src/010-typescript-in-the-build-process/015-typescript-on-ci.explainer/tsconfig.json +++ b/src/010-typescript-in-the-build-process/015-typescript-on-ci.explainer/tsconfig.json @@ -4,7 +4,7 @@ "useDefineForClassFields": true, "module": "ESNext", "lib": [ - "ES2020", + "ES2022", "DOM", "DOM.Iterable" ], diff --git a/src/010-typescript-in-the-build-process/016-blocking-your-dev-server-with-typescript.problem/tsconfig.json b/src/010-typescript-in-the-build-process/016-blocking-your-dev-server-with-typescript.problem/tsconfig.json index f54ef55..3c0ca0d 100644 --- a/src/010-typescript-in-the-build-process/016-blocking-your-dev-server-with-typescript.problem/tsconfig.json +++ b/src/010-typescript-in-the-build-process/016-blocking-your-dev-server-with-typescript.problem/tsconfig.json @@ -4,7 +4,7 @@ "useDefineForClassFields": true, "module": "ESNext", "lib": [ - "ES2020", + "ES2022", "DOM", "DOM.Iterable" ], diff --git a/src/010-typescript-in-the-build-process/016-blocking-your-dev-server-with-typescript.solution.1/tsconfig.json b/src/010-typescript-in-the-build-process/016-blocking-your-dev-server-with-typescript.solution.1/tsconfig.json index f54ef55..3c0ca0d 100644 --- a/src/010-typescript-in-the-build-process/016-blocking-your-dev-server-with-typescript.solution.1/tsconfig.json +++ b/src/010-typescript-in-the-build-process/016-blocking-your-dev-server-with-typescript.solution.1/tsconfig.json @@ -4,7 +4,7 @@ "useDefineForClassFields": true, "module": "ESNext", "lib": [ - "ES2020", + "ES2022", "DOM", "DOM.Iterable" ], diff --git a/src/010-typescript-in-the-build-process/016-blocking-your-dev-server-with-typescript.solution.2/tsconfig.json b/src/010-typescript-in-the-build-process/016-blocking-your-dev-server-with-typescript.solution.2/tsconfig.json index f54ef55..3c0ca0d 100644 --- a/src/010-typescript-in-the-build-process/016-blocking-your-dev-server-with-typescript.solution.2/tsconfig.json +++ b/src/010-typescript-in-the-build-process/016-blocking-your-dev-server-with-typescript.solution.2/tsconfig.json @@ -4,7 +4,7 @@ "useDefineForClassFields": true, "module": "ESNext", "lib": [ - "ES2020", + "ES2022", "DOM", "DOM.Iterable" ], diff --git a/src/010-typescript-in-the-build-process/018-using-tsx-to-create-quick-scripts.problem/tsconfig.json b/src/010-typescript-in-the-build-process/018-using-tsx-to-create-quick-scripts.problem/tsconfig.json index f54ef55..3c0ca0d 100644 --- a/src/010-typescript-in-the-build-process/018-using-tsx-to-create-quick-scripts.problem/tsconfig.json +++ b/src/010-typescript-in-the-build-process/018-using-tsx-to-create-quick-scripts.problem/tsconfig.json @@ -4,7 +4,7 @@ "useDefineForClassFields": true, "module": "ESNext", "lib": [ - "ES2020", + "ES2022", "DOM", "DOM.Iterable" ], diff --git a/src/010-typescript-in-the-build-process/018-using-tsx-to-create-quick-scripts.solution/tsconfig.json b/src/010-typescript-in-the-build-process/018-using-tsx-to-create-quick-scripts.solution/tsconfig.json index f54ef55..3c0ca0d 100644 --- a/src/010-typescript-in-the-build-process/018-using-tsx-to-create-quick-scripts.solution/tsconfig.json +++ b/src/010-typescript-in-the-build-process/018-using-tsx-to-create-quick-scripts.solution/tsconfig.json @@ -4,7 +4,7 @@ "useDefineForClassFields": true, "module": "ESNext", "lib": [ - "ES2020", + "ES2022", "DOM", "DOM.Iterable" ], diff --git a/src/080-configuring-typescript/201-creating-declaration-files.problem/package.json b/src/065-types-you-dont-control/171-lib-d-ts.problem/package.json similarity index 100% rename from src/080-configuring-typescript/201-creating-declaration-files.problem/package.json rename to src/065-types-you-dont-control/171-lib-d-ts.problem/package.json diff --git a/src/065-types-you-dont-control/171-lib-d-ts.problem/src/index.ts b/src/065-types-you-dont-control/171-lib-d-ts.problem/src/index.ts new file mode 100644 index 0000000..6feb237 --- /dev/null +++ b/src/065-types-you-dont-control/171-lib-d-ts.problem/src/index.ts @@ -0,0 +1,3 @@ +const str = "Hello, world!"; + +str.replaceAll("Hello", "Goodbye"); diff --git a/src/065-types-you-dont-control/171-lib-d-ts.problem/tsconfig.json b/src/065-types-you-dont-control/171-lib-d-ts.problem/tsconfig.json new file mode 100644 index 0000000..10c0948 --- /dev/null +++ b/src/065-types-you-dont-control/171-lib-d-ts.problem/tsconfig.json @@ -0,0 +1,15 @@ +{ + "compilerOptions": { + "target": "ES5", + "module": "NodeNext", + "moduleResolution": "NodeNext", + "esModuleInterop": true, + "outDir": "dist", + "rootDir": "src", + "strict": true, + "skipLibCheck": true, + "isolatedModules": true, + "moduleDetection": "force", + "verbatimModuleSyntax": true + }, +} \ No newline at end of file diff --git a/src/080-configuring-typescript/201-creating-declaration-files.solution/package.json b/src/065-types-you-dont-control/171-lib-d-ts.solution.1/package.json similarity index 100% rename from src/080-configuring-typescript/201-creating-declaration-files.solution/package.json rename to src/065-types-you-dont-control/171-lib-d-ts.solution.1/package.json diff --git a/src/065-types-you-dont-control/171-lib-d-ts.solution.1/src/index.ts b/src/065-types-you-dont-control/171-lib-d-ts.solution.1/src/index.ts new file mode 100644 index 0000000..6feb237 --- /dev/null +++ b/src/065-types-you-dont-control/171-lib-d-ts.solution.1/src/index.ts @@ -0,0 +1,3 @@ +const str = "Hello, world!"; + +str.replaceAll("Hello", "Goodbye"); diff --git a/src/065-types-you-dont-control/171-lib-d-ts.solution.1/tsconfig.json b/src/065-types-you-dont-control/171-lib-d-ts.solution.1/tsconfig.json new file mode 100644 index 0000000..6670f99 --- /dev/null +++ b/src/065-types-you-dont-control/171-lib-d-ts.solution.1/tsconfig.json @@ -0,0 +1,15 @@ +{ + "compilerOptions": { + "target": "ES2022", + "module": "NodeNext", + "moduleResolution": "NodeNext", + "esModuleInterop": true, + "outDir": "dist", + "rootDir": "src", + "strict": true, + "skipLibCheck": true, + "isolatedModules": true, + "moduleDetection": "force", + "verbatimModuleSyntax": true + }, +} \ No newline at end of file diff --git a/src/080-configuring-typescript/202-declaration-maps.problem/package.json b/src/065-types-you-dont-control/171-lib-d-ts.solution.2/package.json similarity index 100% rename from src/080-configuring-typescript/202-declaration-maps.problem/package.json rename to src/065-types-you-dont-control/171-lib-d-ts.solution.2/package.json diff --git a/src/065-types-you-dont-control/171-lib-d-ts.solution.2/src/index.ts b/src/065-types-you-dont-control/171-lib-d-ts.solution.2/src/index.ts new file mode 100644 index 0000000..6feb237 --- /dev/null +++ b/src/065-types-you-dont-control/171-lib-d-ts.solution.2/src/index.ts @@ -0,0 +1,3 @@ +const str = "Hello, world!"; + +str.replaceAll("Hello", "Goodbye"); diff --git a/src/065-types-you-dont-control/171-lib-d-ts.solution.2/tsconfig.json b/src/065-types-you-dont-control/171-lib-d-ts.solution.2/tsconfig.json new file mode 100644 index 0000000..3690be7 --- /dev/null +++ b/src/065-types-you-dont-control/171-lib-d-ts.solution.2/tsconfig.json @@ -0,0 +1,18 @@ +{ + "compilerOptions": { + "target": "ES2022", + "lib": [ + "ES2022", + ], + "module": "NodeNext", + "moduleResolution": "NodeNext", + "esModuleInterop": true, + "outDir": "dist", + "rootDir": "src", + "strict": true, + "skipLibCheck": true, + "isolatedModules": true, + "moduleDetection": "force", + "verbatimModuleSyntax": true + }, +} \ No newline at end of file diff --git a/src/080-configuring-typescript/190-no-unchecked-indexed-access.problem/package.json b/src/065-types-you-dont-control/172-lib-dom.problem/package.json similarity index 100% rename from src/080-configuring-typescript/190-no-unchecked-indexed-access.problem/package.json rename to src/065-types-you-dont-control/172-lib-dom.problem/package.json diff --git a/src/080-configuring-typescript/194-lib-dom.problem/src/index.ts b/src/065-types-you-dont-control/172-lib-dom.problem/src/index.ts similarity index 100% rename from src/080-configuring-typescript/194-lib-dom.problem/src/index.ts rename to src/065-types-you-dont-control/172-lib-dom.problem/src/index.ts diff --git a/src/080-configuring-typescript/196-multiple-tsconfig-json-files.solution/src/server/tsconfig.json b/src/065-types-you-dont-control/172-lib-dom.problem/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/196-multiple-tsconfig-json-files.solution/src/server/tsconfig.json rename to src/065-types-you-dont-control/172-lib-dom.problem/tsconfig.json diff --git a/src/080-configuring-typescript/190-no-unchecked-indexed-access.solution/package.json b/src/065-types-you-dont-control/172-lib-dom.solution/package.json similarity index 100% rename from src/080-configuring-typescript/190-no-unchecked-indexed-access.solution/package.json rename to src/065-types-you-dont-control/172-lib-dom.solution/package.json diff --git a/src/080-configuring-typescript/194-lib-dom.solution/src/index.ts b/src/065-types-you-dont-control/172-lib-dom.solution/src/index.ts similarity index 100% rename from src/080-configuring-typescript/194-lib-dom.solution/src/index.ts rename to src/065-types-you-dont-control/172-lib-dom.solution/src/index.ts diff --git a/src/080-configuring-typescript/194-lib-dom.solution/tsconfig.json b/src/065-types-you-dont-control/172-lib-dom.solution/tsconfig.json similarity index 94% rename from src/080-configuring-typescript/194-lib-dom.solution/tsconfig.json rename to src/065-types-you-dont-control/172-lib-dom.solution/tsconfig.json index 83ec508..79a4b57 100644 --- a/src/080-configuring-typescript/194-lib-dom.solution/tsconfig.json +++ b/src/065-types-you-dont-control/172-lib-dom.solution/tsconfig.json @@ -9,7 +9,7 @@ "skipLibCheck": true, "isolatedModules": true, "lib": [ - "ES2020", + "ES2022", "DOM", ] }, diff --git a/src/080-configuring-typescript/191-module-resolution-bundler-or-nodenext.explainer/package.json b/src/065-types-you-dont-control/173-lib-dom-iterable.problem/package.json similarity index 100% rename from src/080-configuring-typescript/191-module-resolution-bundler-or-nodenext.explainer/package.json rename to src/065-types-you-dont-control/173-lib-dom-iterable.problem/package.json diff --git a/src/080-configuring-typescript/195-lib-dom-iterable.problem/src/index.ts b/src/065-types-you-dont-control/173-lib-dom-iterable.problem/src/index.ts similarity index 100% rename from src/080-configuring-typescript/195-lib-dom-iterable.problem/src/index.ts rename to src/065-types-you-dont-control/173-lib-dom-iterable.problem/src/index.ts diff --git a/src/080-configuring-typescript/195-lib-dom-iterable.problem/tsconfig.json b/src/065-types-you-dont-control/173-lib-dom-iterable.problem/tsconfig.json similarity index 94% rename from src/080-configuring-typescript/195-lib-dom-iterable.problem/tsconfig.json rename to src/065-types-you-dont-control/173-lib-dom-iterable.problem/tsconfig.json index 83ec508..79a4b57 100644 --- a/src/080-configuring-typescript/195-lib-dom-iterable.problem/tsconfig.json +++ b/src/065-types-you-dont-control/173-lib-dom-iterable.problem/tsconfig.json @@ -9,7 +9,7 @@ "skipLibCheck": true, "isolatedModules": true, "lib": [ - "ES2020", + "ES2022", "DOM", ] }, diff --git a/src/080-configuring-typescript/193-no-emit.problem/package.json b/src/065-types-you-dont-control/173-lib-dom-iterable.solution/package.json similarity index 100% rename from src/080-configuring-typescript/193-no-emit.problem/package.json rename to src/065-types-you-dont-control/173-lib-dom-iterable.solution/package.json diff --git a/src/080-configuring-typescript/195-lib-dom-iterable.solution/src/index.ts b/src/065-types-you-dont-control/173-lib-dom-iterable.solution/src/index.ts similarity index 100% rename from src/080-configuring-typescript/195-lib-dom-iterable.solution/src/index.ts rename to src/065-types-you-dont-control/173-lib-dom-iterable.solution/src/index.ts diff --git a/src/080-configuring-typescript/195-lib-dom-iterable.solution/tsconfig.json b/src/065-types-you-dont-control/173-lib-dom-iterable.solution/tsconfig.json similarity index 94% rename from src/080-configuring-typescript/195-lib-dom-iterable.solution/tsconfig.json rename to src/065-types-you-dont-control/173-lib-dom-iterable.solution/tsconfig.json index 8d23177..2e5aad3 100644 --- a/src/080-configuring-typescript/195-lib-dom-iterable.solution/tsconfig.json +++ b/src/065-types-you-dont-control/173-lib-dom-iterable.solution/tsconfig.json @@ -9,7 +9,7 @@ "skipLibCheck": true, "isolatedModules": true, "lib": [ - "ES2020", + "ES2022", "DOM", "DOM.Iterable" ] diff --git a/src/065-four-spaces-of-typescript-declarations/171-lib-d-ts.problem.ts b/src/065-types-you-dont-control/174-definitely-typed.problem.ts similarity index 100% rename from src/065-four-spaces-of-typescript-declarations/171-lib-d-ts.problem.ts rename to src/065-types-you-dont-control/174-definitely-typed.problem.ts diff --git a/src/065-four-spaces-of-typescript-declarations/171-lib-d-ts.solution.ts b/src/065-types-you-dont-control/174-definitely-typed.solution.ts similarity index 100% rename from src/065-four-spaces-of-typescript-declarations/171-lib-d-ts.solution.ts rename to src/065-types-you-dont-control/174-definitely-typed.solution.ts diff --git a/src/065-four-spaces-of-typescript-declarations/172-using-target-to-change-lib-d-ts.problem.ts b/src/065-types-you-dont-control/175-types-that-ship-with-libraries.problem.ts similarity index 100% rename from src/065-four-spaces-of-typescript-declarations/172-using-target-to-change-lib-d-ts.problem.ts rename to src/065-types-you-dont-control/175-types-that-ship-with-libraries.problem.ts diff --git a/src/065-four-spaces-of-typescript-declarations/172-using-target-to-change-lib-d-ts.solution.ts b/src/065-types-you-dont-control/175-types-that-ship-with-libraries.solution.ts similarity index 100% rename from src/065-four-spaces-of-typescript-declarations/172-using-target-to-change-lib-d-ts.solution.ts rename to src/065-types-you-dont-control/175-types-that-ship-with-libraries.solution.ts diff --git a/src/065-four-spaces-of-typescript-declarations/173-lib-dom-d-ts.problem.ts b/src/065-types-you-dont-control/176-declare-module-for-overriding-third-party-libraries.problem.ts similarity index 100% rename from src/065-four-spaces-of-typescript-declarations/173-lib-dom-d-ts.problem.ts rename to src/065-types-you-dont-control/176-declare-module-for-overriding-third-party-libraries.problem.ts diff --git a/src/065-four-spaces-of-typescript-declarations/173-lib-dom-d-ts.solution.ts b/src/065-types-you-dont-control/176-declare-module-for-overriding-third-party-libraries.solution.ts similarity index 100% rename from src/065-four-spaces-of-typescript-declarations/173-lib-dom-d-ts.solution.ts rename to src/065-types-you-dont-control/176-declare-module-for-overriding-third-party-libraries.solution.ts diff --git a/src/065-four-spaces-of-typescript-declarations/plan.md b/src/065-types-you-dont-control/plan.md similarity index 100% rename from src/065-four-spaces-of-typescript-declarations/plan.md rename to src/065-types-you-dont-control/plan.md diff --git a/src/065-four-spaces-of-typescript-declarations/174-third-party-types.problem.ts b/src/075-designing-your-types/177-domain-modelling-in-typescript.problem.ts similarity index 100% rename from src/065-four-spaces-of-typescript-declarations/174-third-party-types.problem.ts rename to src/075-designing-your-types/177-domain-modelling-in-typescript.problem.ts diff --git a/src/065-four-spaces-of-typescript-declarations/174-third-party-types.solution.ts b/src/075-designing-your-types/177-domain-modelling-in-typescript.solution.ts similarity index 100% rename from src/065-four-spaces-of-typescript-declarations/174-third-party-types.solution.ts rename to src/075-designing-your-types/177-domain-modelling-in-typescript.solution.ts diff --git a/src/075-designing-your-types/179-intro-to-helper-types.problem.ts b/src/075-designing-your-types/178-intro-to-helper-types.problem.ts similarity index 100% rename from src/075-designing-your-types/179-intro-to-helper-types.problem.ts rename to src/075-designing-your-types/178-intro-to-helper-types.problem.ts diff --git a/src/075-designing-your-types/179-intro-to-helper-types.solution.ts b/src/075-designing-your-types/178-intro-to-helper-types.solution.ts similarity index 100% rename from src/075-designing-your-types/179-intro-to-helper-types.solution.ts rename to src/075-designing-your-types/178-intro-to-helper-types.solution.ts diff --git a/src/065-four-spaces-of-typescript-declarations/175-type-roots-in-tsconfig.problem.ts b/src/075-designing-your-types/179-multiple-type-parameters.problem.ts similarity index 100% rename from src/065-four-spaces-of-typescript-declarations/175-type-roots-in-tsconfig.problem.ts rename to src/075-designing-your-types/179-multiple-type-parameters.problem.ts diff --git a/src/065-four-spaces-of-typescript-declarations/175-type-roots-in-tsconfig.solution.ts b/src/075-designing-your-types/179-multiple-type-parameters.solution.ts similarity index 100% rename from src/065-four-spaces-of-typescript-declarations/175-type-roots-in-tsconfig.solution.ts rename to src/075-designing-your-types/179-multiple-type-parameters.solution.ts diff --git a/src/075-designing-your-types/181-result-type.explainer.ts b/src/075-designing-your-types/180-result-type.explainer.ts similarity index 100% rename from src/075-designing-your-types/181-result-type.explainer.ts rename to src/075-designing-your-types/180-result-type.explainer.ts diff --git a/src/075-designing-your-types/182-default-type-parameters.problem.ts b/src/075-designing-your-types/181-default-type-parameters.problem.ts similarity index 100% rename from src/075-designing-your-types/182-default-type-parameters.problem.ts rename to src/075-designing-your-types/181-default-type-parameters.problem.ts diff --git a/src/075-designing-your-types/182-default-type-parameters.solution.ts b/src/075-designing-your-types/181-default-type-parameters.solution.ts similarity index 100% rename from src/075-designing-your-types/182-default-type-parameters.solution.ts rename to src/075-designing-your-types/181-default-type-parameters.solution.ts diff --git a/src/065-four-spaces-of-typescript-declarations/176-types-that-ship-with-libraries.problem.ts b/src/075-designing-your-types/182-type-helper-constraints.problem.ts similarity index 100% rename from src/065-four-spaces-of-typescript-declarations/176-types-that-ship-with-libraries.problem.ts rename to src/075-designing-your-types/182-type-helper-constraints.problem.ts diff --git a/src/065-four-spaces-of-typescript-declarations/176-types-that-ship-with-libraries.solution.ts b/src/075-designing-your-types/182-type-helper-constraints.solution.ts similarity index 100% rename from src/065-four-spaces-of-typescript-declarations/176-types-that-ship-with-libraries.solution.ts rename to src/075-designing-your-types/182-type-helper-constraints.solution.ts diff --git a/src/065-four-spaces-of-typescript-declarations/177-declare-module-for-overriding-third-party-libraries.problem.ts b/src/075-designing-your-types/183-tighter-version-of-omit.problem.ts similarity index 100% rename from src/065-four-spaces-of-typescript-declarations/177-declare-module-for-overriding-third-party-libraries.problem.ts rename to src/075-designing-your-types/183-tighter-version-of-omit.problem.ts diff --git a/src/065-four-spaces-of-typescript-declarations/177-declare-module-for-overriding-third-party-libraries.solution.ts b/src/075-designing-your-types/183-tighter-version-of-omit.solution.ts similarity index 100% rename from src/065-four-spaces-of-typescript-declarations/177-declare-module-for-overriding-third-party-libraries.solution.ts rename to src/075-designing-your-types/183-tighter-version-of-omit.solution.ts diff --git a/src/075-designing-your-types/178-domain-modelling-in-typescript.problem.ts b/src/075-designing-your-types/184-template-literal-types.problem.ts similarity index 100% rename from src/075-designing-your-types/178-domain-modelling-in-typescript.problem.ts rename to src/075-designing-your-types/184-template-literal-types.problem.ts diff --git a/src/075-designing-your-types/178-domain-modelling-in-typescript.solution.ts b/src/075-designing-your-types/184-template-literal-types.solution.ts similarity index 100% rename from src/075-designing-your-types/178-domain-modelling-in-typescript.solution.ts rename to src/075-designing-your-types/184-template-literal-types.solution.ts diff --git a/src/075-designing-your-types/180-multiple-type-parameters.problem.ts b/src/075-designing-your-types/185-passing-unions-to-template-literal-types.problem.ts similarity index 100% rename from src/075-designing-your-types/180-multiple-type-parameters.problem.ts rename to src/075-designing-your-types/185-passing-unions-to-template-literal-types.problem.ts diff --git a/src/075-designing-your-types/180-multiple-type-parameters.solution.ts b/src/075-designing-your-types/185-passing-unions-to-template-literal-types.solution.ts similarity index 100% rename from src/075-designing-your-types/180-multiple-type-parameters.solution.ts rename to src/075-designing-your-types/185-passing-unions-to-template-literal-types.solution.ts diff --git a/src/075-designing-your-types/183-type-helper-constraints.problem.ts b/src/075-designing-your-types/186-mapped-types.problem.ts similarity index 100% rename from src/075-designing-your-types/183-type-helper-constraints.problem.ts rename to src/075-designing-your-types/186-mapped-types.problem.ts diff --git a/src/075-designing-your-types/183-type-helper-constraints.solution.ts b/src/075-designing-your-types/186-mapped-types.solution.ts similarity index 100% rename from src/075-designing-your-types/183-type-helper-constraints.solution.ts rename to src/075-designing-your-types/186-mapped-types.solution.ts diff --git a/src/075-designing-your-types/184-tighter-version-of-omit.problem.ts b/src/075-designing-your-types/187-as-in-mapped-types.problem.ts similarity index 100% rename from src/075-designing-your-types/184-tighter-version-of-omit.problem.ts rename to src/075-designing-your-types/187-as-in-mapped-types.problem.ts diff --git a/src/075-designing-your-types/184-tighter-version-of-omit.solution.ts b/src/075-designing-your-types/187-as-in-mapped-types.solution.ts similarity index 100% rename from src/075-designing-your-types/184-tighter-version-of-omit.solution.ts rename to src/075-designing-your-types/187-as-in-mapped-types.solution.ts diff --git a/src/080-configuring-typescript/189-my-recommended-tsconfig-base.explainer/package.json b/src/080-configuring-typescript/188-my-recommended-tsconfig-base.explainer/package.json similarity index 100% rename from src/080-configuring-typescript/189-my-recommended-tsconfig-base.explainer/package.json rename to src/080-configuring-typescript/188-my-recommended-tsconfig-base.explainer/package.json diff --git a/src/080-configuring-typescript/189-my-recommended-tsconfig-base.explainer/tsconfig.json b/src/080-configuring-typescript/188-my-recommended-tsconfig-base.explainer/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/189-my-recommended-tsconfig-base.explainer/tsconfig.json rename to src/080-configuring-typescript/188-my-recommended-tsconfig-base.explainer/tsconfig.json diff --git a/src/080-configuring-typescript/190-no-unchecked-indexed-access.problem/helpers.d.ts b/src/080-configuring-typescript/189-no-unchecked-indexed-access.problem/helpers.d.ts similarity index 100% rename from src/080-configuring-typescript/190-no-unchecked-indexed-access.problem/helpers.d.ts rename to src/080-configuring-typescript/189-no-unchecked-indexed-access.problem/helpers.d.ts diff --git a/src/080-configuring-typescript/193-no-emit.solution/package.json b/src/080-configuring-typescript/189-no-unchecked-indexed-access.problem/package.json similarity index 100% rename from src/080-configuring-typescript/193-no-emit.solution/package.json rename to src/080-configuring-typescript/189-no-unchecked-indexed-access.problem/package.json diff --git a/src/080-configuring-typescript/190-no-unchecked-indexed-access.problem/src/index.ts b/src/080-configuring-typescript/189-no-unchecked-indexed-access.problem/src/index.ts similarity index 100% rename from src/080-configuring-typescript/190-no-unchecked-indexed-access.problem/src/index.ts rename to src/080-configuring-typescript/189-no-unchecked-indexed-access.problem/src/index.ts diff --git a/src/080-configuring-typescript/190-no-unchecked-indexed-access.problem/tsconfig.json b/src/080-configuring-typescript/189-no-unchecked-indexed-access.problem/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/190-no-unchecked-indexed-access.problem/tsconfig.json rename to src/080-configuring-typescript/189-no-unchecked-indexed-access.problem/tsconfig.json diff --git a/src/080-configuring-typescript/190-no-unchecked-indexed-access.solution/helpers.d.ts b/src/080-configuring-typescript/189-no-unchecked-indexed-access.solution/helpers.d.ts similarity index 100% rename from src/080-configuring-typescript/190-no-unchecked-indexed-access.solution/helpers.d.ts rename to src/080-configuring-typescript/189-no-unchecked-indexed-access.solution/helpers.d.ts diff --git a/src/080-configuring-typescript/194-lib-dom.problem/package.json b/src/080-configuring-typescript/189-no-unchecked-indexed-access.solution/package.json similarity index 100% rename from src/080-configuring-typescript/194-lib-dom.problem/package.json rename to src/080-configuring-typescript/189-no-unchecked-indexed-access.solution/package.json diff --git a/src/080-configuring-typescript/190-no-unchecked-indexed-access.solution/src/index.ts b/src/080-configuring-typescript/189-no-unchecked-indexed-access.solution/src/index.ts similarity index 100% rename from src/080-configuring-typescript/190-no-unchecked-indexed-access.solution/src/index.ts rename to src/080-configuring-typescript/189-no-unchecked-indexed-access.solution/src/index.ts diff --git a/src/080-configuring-typescript/190-no-unchecked-indexed-access.solution/tsconfig.json b/src/080-configuring-typescript/189-no-unchecked-indexed-access.solution/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/190-no-unchecked-indexed-access.solution/tsconfig.json rename to src/080-configuring-typescript/189-no-unchecked-indexed-access.solution/tsconfig.json diff --git a/src/080-configuring-typescript/194-lib-dom.solution/package.json b/src/080-configuring-typescript/190-module-resolution-bundler-or-nodenext.explainer/package.json similarity index 100% rename from src/080-configuring-typescript/194-lib-dom.solution/package.json rename to src/080-configuring-typescript/190-module-resolution-bundler-or-nodenext.explainer/package.json diff --git a/src/080-configuring-typescript/191-module-resolution-bundler-or-nodenext.explainer/pnpm-lock.yaml b/src/080-configuring-typescript/190-module-resolution-bundler-or-nodenext.explainer/pnpm-lock.yaml similarity index 100% rename from src/080-configuring-typescript/191-module-resolution-bundler-or-nodenext.explainer/pnpm-lock.yaml rename to src/080-configuring-typescript/190-module-resolution-bundler-or-nodenext.explainer/pnpm-lock.yaml diff --git a/src/080-configuring-typescript/191-module-resolution-bundler-or-nodenext.explainer/src/index.ts b/src/080-configuring-typescript/190-module-resolution-bundler-or-nodenext.explainer/src/index.ts similarity index 100% rename from src/080-configuring-typescript/191-module-resolution-bundler-or-nodenext.explainer/src/index.ts rename to src/080-configuring-typescript/190-module-resolution-bundler-or-nodenext.explainer/src/index.ts diff --git a/src/080-configuring-typescript/191-module-resolution-bundler-or-nodenext.explainer/tsconfig.json b/src/080-configuring-typescript/190-module-resolution-bundler-or-nodenext.explainer/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/191-module-resolution-bundler-or-nodenext.explainer/tsconfig.json rename to src/080-configuring-typescript/190-module-resolution-bundler-or-nodenext.explainer/tsconfig.json diff --git a/src/080-configuring-typescript/191-tsconfig-bases.explainer.ts b/src/080-configuring-typescript/190-tsconfig-bases.explainer.ts similarity index 100% rename from src/080-configuring-typescript/191-tsconfig-bases.explainer.ts rename to src/080-configuring-typescript/190-tsconfig-bases.explainer.ts diff --git a/src/080-configuring-typescript/192-isolated-modules.explainer/package.json b/src/080-configuring-typescript/191-isolated-modules.explainer/package.json similarity index 100% rename from src/080-configuring-typescript/192-isolated-modules.explainer/package.json rename to src/080-configuring-typescript/191-isolated-modules.explainer/package.json diff --git a/src/080-configuring-typescript/192-isolated-modules.explainer/src/index.ts b/src/080-configuring-typescript/191-isolated-modules.explainer/src/index.ts similarity index 100% rename from src/080-configuring-typescript/192-isolated-modules.explainer/src/index.ts rename to src/080-configuring-typescript/191-isolated-modules.explainer/src/index.ts diff --git a/src/080-configuring-typescript/192-isolated-modules.explainer/tsconfig.json b/src/080-configuring-typescript/191-isolated-modules.explainer/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/192-isolated-modules.explainer/tsconfig.json rename to src/080-configuring-typescript/191-isolated-modules.explainer/tsconfig.json diff --git a/src/080-configuring-typescript/195-lib-dom-iterable.problem/package.json b/src/080-configuring-typescript/192-no-emit.problem/package.json similarity index 100% rename from src/080-configuring-typescript/195-lib-dom-iterable.problem/package.json rename to src/080-configuring-typescript/192-no-emit.problem/package.json diff --git a/src/080-configuring-typescript/193-no-emit.problem/pnpm-lock.yaml b/src/080-configuring-typescript/192-no-emit.problem/pnpm-lock.yaml similarity index 100% rename from src/080-configuring-typescript/193-no-emit.problem/pnpm-lock.yaml rename to src/080-configuring-typescript/192-no-emit.problem/pnpm-lock.yaml diff --git a/src/080-configuring-typescript/193-no-emit.problem/src/index.ts b/src/080-configuring-typescript/192-no-emit.problem/src/index.ts similarity index 100% rename from src/080-configuring-typescript/193-no-emit.problem/src/index.ts rename to src/080-configuring-typescript/192-no-emit.problem/src/index.ts diff --git a/src/080-configuring-typescript/193-no-emit.problem/tsconfig.json b/src/080-configuring-typescript/192-no-emit.problem/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/193-no-emit.problem/tsconfig.json rename to src/080-configuring-typescript/192-no-emit.problem/tsconfig.json diff --git a/src/080-configuring-typescript/195-lib-dom-iterable.solution/package.json b/src/080-configuring-typescript/192-no-emit.solution/package.json similarity index 100% rename from src/080-configuring-typescript/195-lib-dom-iterable.solution/package.json rename to src/080-configuring-typescript/192-no-emit.solution/package.json diff --git a/src/080-configuring-typescript/193-no-emit.solution/pnpm-lock.yaml b/src/080-configuring-typescript/192-no-emit.solution/pnpm-lock.yaml similarity index 100% rename from src/080-configuring-typescript/193-no-emit.solution/pnpm-lock.yaml rename to src/080-configuring-typescript/192-no-emit.solution/pnpm-lock.yaml diff --git a/src/080-configuring-typescript/193-no-emit.solution/src/index.ts b/src/080-configuring-typescript/192-no-emit.solution/src/index.ts similarity index 100% rename from src/080-configuring-typescript/193-no-emit.solution/src/index.ts rename to src/080-configuring-typescript/192-no-emit.solution/src/index.ts diff --git a/src/080-configuring-typescript/193-no-emit.solution/tsconfig.json b/src/080-configuring-typescript/192-no-emit.solution/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/193-no-emit.solution/tsconfig.json rename to src/080-configuring-typescript/192-no-emit.solution/tsconfig.json diff --git a/src/080-configuring-typescript/196-multiple-tsconfig-json-files.problem/package.json b/src/080-configuring-typescript/193-multiple-tsconfig-json-files.problem/package.json similarity index 100% rename from src/080-configuring-typescript/196-multiple-tsconfig-json-files.problem/package.json rename to src/080-configuring-typescript/193-multiple-tsconfig-json-files.problem/package.json diff --git a/src/080-configuring-typescript/196-multiple-tsconfig-json-files.problem/src/client.ts b/src/080-configuring-typescript/193-multiple-tsconfig-json-files.problem/src/client.ts similarity index 100% rename from src/080-configuring-typescript/196-multiple-tsconfig-json-files.problem/src/client.ts rename to src/080-configuring-typescript/193-multiple-tsconfig-json-files.problem/src/client.ts diff --git a/src/080-configuring-typescript/196-multiple-tsconfig-json-files.problem/src/server.ts b/src/080-configuring-typescript/193-multiple-tsconfig-json-files.problem/src/server.ts similarity index 100% rename from src/080-configuring-typescript/196-multiple-tsconfig-json-files.problem/src/server.ts rename to src/080-configuring-typescript/193-multiple-tsconfig-json-files.problem/src/server.ts diff --git a/src/080-configuring-typescript/196-multiple-tsconfig-json-files.problem/tsconfig.json b/src/080-configuring-typescript/193-multiple-tsconfig-json-files.problem/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/196-multiple-tsconfig-json-files.problem/tsconfig.json rename to src/080-configuring-typescript/193-multiple-tsconfig-json-files.problem/tsconfig.json diff --git a/src/080-configuring-typescript/196-multiple-tsconfig-json-files.solution/package.json b/src/080-configuring-typescript/193-multiple-tsconfig-json-files.solution/package.json similarity index 100% rename from src/080-configuring-typescript/196-multiple-tsconfig-json-files.solution/package.json rename to src/080-configuring-typescript/193-multiple-tsconfig-json-files.solution/package.json diff --git a/src/080-configuring-typescript/196-multiple-tsconfig-json-files.solution/src/client/index.ts b/src/080-configuring-typescript/193-multiple-tsconfig-json-files.solution/src/client/index.ts similarity index 100% rename from src/080-configuring-typescript/196-multiple-tsconfig-json-files.solution/src/client/index.ts rename to src/080-configuring-typescript/193-multiple-tsconfig-json-files.solution/src/client/index.ts diff --git a/src/080-configuring-typescript/196-multiple-tsconfig-json-files.solution/src/client/tsconfig.json b/src/080-configuring-typescript/193-multiple-tsconfig-json-files.solution/src/client/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/196-multiple-tsconfig-json-files.solution/src/client/tsconfig.json rename to src/080-configuring-typescript/193-multiple-tsconfig-json-files.solution/src/client/tsconfig.json diff --git a/src/080-configuring-typescript/196-multiple-tsconfig-json-files.solution/src/server/index.ts b/src/080-configuring-typescript/193-multiple-tsconfig-json-files.solution/src/server/index.ts similarity index 100% rename from src/080-configuring-typescript/196-multiple-tsconfig-json-files.solution/src/server/index.ts rename to src/080-configuring-typescript/193-multiple-tsconfig-json-files.solution/src/server/index.ts diff --git a/src/080-configuring-typescript/197-globals-are-tied-to-a-single-tsconfig.explainer/src/server/tsconfig.json b/src/080-configuring-typescript/193-multiple-tsconfig-json-files.solution/src/server/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/197-globals-are-tied-to-a-single-tsconfig.explainer/src/server/tsconfig.json rename to src/080-configuring-typescript/193-multiple-tsconfig-json-files.solution/src/server/tsconfig.json diff --git a/src/080-configuring-typescript/197-globals-are-tied-to-a-single-tsconfig.explainer/package.json b/src/080-configuring-typescript/194-globals-are-tied-to-a-single-tsconfig.explainer/package.json similarity index 100% rename from src/080-configuring-typescript/197-globals-are-tied-to-a-single-tsconfig.explainer/package.json rename to src/080-configuring-typescript/194-globals-are-tied-to-a-single-tsconfig.explainer/package.json diff --git a/src/080-configuring-typescript/197-globals-are-tied-to-a-single-tsconfig.explainer/src/client/index.ts b/src/080-configuring-typescript/194-globals-are-tied-to-a-single-tsconfig.explainer/src/client/index.ts similarity index 100% rename from src/080-configuring-typescript/197-globals-are-tied-to-a-single-tsconfig.explainer/src/client/index.ts rename to src/080-configuring-typescript/194-globals-are-tied-to-a-single-tsconfig.explainer/src/client/index.ts diff --git a/src/080-configuring-typescript/197-globals-are-tied-to-a-single-tsconfig.explainer/src/client/tsconfig.json b/src/080-configuring-typescript/194-globals-are-tied-to-a-single-tsconfig.explainer/src/client/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/197-globals-are-tied-to-a-single-tsconfig.explainer/src/client/tsconfig.json rename to src/080-configuring-typescript/194-globals-are-tied-to-a-single-tsconfig.explainer/src/client/tsconfig.json diff --git a/src/080-configuring-typescript/197-globals-are-tied-to-a-single-tsconfig.explainer/src/server/index.ts b/src/080-configuring-typescript/194-globals-are-tied-to-a-single-tsconfig.explainer/src/server/index.ts similarity index 100% rename from src/080-configuring-typescript/197-globals-are-tied-to-a-single-tsconfig.explainer/src/server/index.ts rename to src/080-configuring-typescript/194-globals-are-tied-to-a-single-tsconfig.explainer/src/server/index.ts diff --git a/src/080-configuring-typescript/197-globals-are-tied-to-a-single-tsconfig.explainer/src/server/server.d.ts b/src/080-configuring-typescript/194-globals-are-tied-to-a-single-tsconfig.explainer/src/server/server.d.ts similarity index 100% rename from src/080-configuring-typescript/197-globals-are-tied-to-a-single-tsconfig.explainer/src/server/server.d.ts rename to src/080-configuring-typescript/194-globals-are-tied-to-a-single-tsconfig.explainer/src/server/server.d.ts diff --git a/src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.problem/src/server/tsconfig.json b/src/080-configuring-typescript/194-globals-are-tied-to-a-single-tsconfig.explainer/src/server/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.problem/src/server/tsconfig.json rename to src/080-configuring-typescript/194-globals-are-tied-to-a-single-tsconfig.explainer/src/server/tsconfig.json diff --git a/src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.problem/package.json b/src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.problem/package.json similarity index 100% rename from src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.problem/package.json rename to src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.problem/package.json diff --git a/src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.problem/src/client/index.ts b/src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.problem/src/client/index.ts similarity index 100% rename from src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.problem/src/client/index.ts rename to src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.problem/src/client/index.ts diff --git a/src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.problem/src/client/tsconfig.json b/src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.problem/src/client/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.problem/src/client/tsconfig.json rename to src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.problem/src/client/tsconfig.json diff --git a/src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.problem/src/server/index.ts b/src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.problem/src/server/index.ts similarity index 100% rename from src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.problem/src/server/index.ts rename to src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.problem/src/server/index.ts diff --git a/src/080-configuring-typescript/194-lib-dom.problem/tsconfig.json b/src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.problem/src/server/tsconfig.json similarity index 94% rename from src/080-configuring-typescript/194-lib-dom.problem/tsconfig.json rename to src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.problem/src/server/tsconfig.json index a049c98..f82bfb3 100644 --- a/src/080-configuring-typescript/194-lib-dom.problem/tsconfig.json +++ b/src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.problem/src/server/tsconfig.json @@ -9,7 +9,7 @@ "skipLibCheck": true, "isolatedModules": true, "lib": [ - "ES2020" + "ES2022" ] }, } \ No newline at end of file diff --git a/src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.solution/package.json b/src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.solution/package.json similarity index 100% rename from src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.solution/package.json rename to src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.solution/package.json diff --git a/src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.solution/src/client/index.ts b/src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.solution/src/client/index.ts similarity index 100% rename from src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.solution/src/client/index.ts rename to src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.solution/src/client/index.ts diff --git a/src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.solution/src/client/tsconfig.json b/src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.solution/src/client/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.solution/src/client/tsconfig.json rename to src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.solution/src/client/tsconfig.json diff --git a/src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.solution/src/server/index.ts b/src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.solution/src/server/index.ts similarity index 100% rename from src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.solution/src/server/index.ts rename to src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.solution/src/server/index.ts diff --git a/src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.solution/src/server/tsconfig.json b/src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.solution/src/server/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.solution/src/server/tsconfig.json rename to src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.solution/src/server/tsconfig.json diff --git a/src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.solution/tsconfig.base.json b/src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.solution/tsconfig.base.json similarity index 100% rename from src/080-configuring-typescript/198-extending-from-other-tsconfig-json-files.solution/tsconfig.base.json rename to src/080-configuring-typescript/195-extending-from-other-tsconfig-json-files.solution/tsconfig.base.json diff --git a/src/080-configuring-typescript/199-project-references.problem/package.json b/src/080-configuring-typescript/196-project-references.problem/package.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.problem/package.json rename to src/080-configuring-typescript/196-project-references.problem/package.json diff --git a/src/080-configuring-typescript/199-project-references.problem/src/client/index.ts b/src/080-configuring-typescript/196-project-references.problem/src/client/index.ts similarity index 100% rename from src/080-configuring-typescript/199-project-references.problem/src/client/index.ts rename to src/080-configuring-typescript/196-project-references.problem/src/client/index.ts diff --git a/src/080-configuring-typescript/199-project-references.problem/src/client/tsconfig.json b/src/080-configuring-typescript/196-project-references.problem/src/client/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.problem/src/client/tsconfig.json rename to src/080-configuring-typescript/196-project-references.problem/src/client/tsconfig.json diff --git a/src/080-configuring-typescript/199-project-references.problem/src/server/index.ts b/src/080-configuring-typescript/196-project-references.problem/src/server/index.ts similarity index 100% rename from src/080-configuring-typescript/199-project-references.problem/src/server/index.ts rename to src/080-configuring-typescript/196-project-references.problem/src/server/index.ts diff --git a/src/080-configuring-typescript/199-project-references.problem/src/server/tsconfig.json b/src/080-configuring-typescript/196-project-references.problem/src/server/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.problem/src/server/tsconfig.json rename to src/080-configuring-typescript/196-project-references.problem/src/server/tsconfig.json diff --git a/src/080-configuring-typescript/199-project-references.problem/tsconfig.base.json b/src/080-configuring-typescript/196-project-references.problem/tsconfig.base.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.problem/tsconfig.base.json rename to src/080-configuring-typescript/196-project-references.problem/tsconfig.base.json diff --git a/src/080-configuring-typescript/199-project-references.solution.1/package.json b/src/080-configuring-typescript/196-project-references.solution.1/package.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.1/package.json rename to src/080-configuring-typescript/196-project-references.solution.1/package.json diff --git a/src/080-configuring-typescript/199-project-references.solution.1/pnpm-lock.yaml b/src/080-configuring-typescript/196-project-references.solution.1/pnpm-lock.yaml similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.1/pnpm-lock.yaml rename to src/080-configuring-typescript/196-project-references.solution.1/pnpm-lock.yaml diff --git a/src/080-configuring-typescript/199-project-references.solution.1/src/client/index.ts b/src/080-configuring-typescript/196-project-references.solution.1/src/client/index.ts similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.1/src/client/index.ts rename to src/080-configuring-typescript/196-project-references.solution.1/src/client/index.ts diff --git a/src/080-configuring-typescript/199-project-references.solution.1/src/client/tsconfig.json b/src/080-configuring-typescript/196-project-references.solution.1/src/client/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.1/src/client/tsconfig.json rename to src/080-configuring-typescript/196-project-references.solution.1/src/client/tsconfig.json diff --git a/src/080-configuring-typescript/199-project-references.solution.1/src/server/index.ts b/src/080-configuring-typescript/196-project-references.solution.1/src/server/index.ts similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.1/src/server/index.ts rename to src/080-configuring-typescript/196-project-references.solution.1/src/server/index.ts diff --git a/src/080-configuring-typescript/199-project-references.solution.1/src/server/tsconfig.json b/src/080-configuring-typescript/196-project-references.solution.1/src/server/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.1/src/server/tsconfig.json rename to src/080-configuring-typescript/196-project-references.solution.1/src/server/tsconfig.json diff --git a/src/080-configuring-typescript/199-project-references.solution.1/tsconfig.base.json b/src/080-configuring-typescript/196-project-references.solution.1/tsconfig.base.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.1/tsconfig.base.json rename to src/080-configuring-typescript/196-project-references.solution.1/tsconfig.base.json diff --git a/src/080-configuring-typescript/199-project-references.solution.1/tsconfig.json b/src/080-configuring-typescript/196-project-references.solution.1/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.1/tsconfig.json rename to src/080-configuring-typescript/196-project-references.solution.1/tsconfig.json diff --git a/src/080-configuring-typescript/199-project-references.solution.2/package.json b/src/080-configuring-typescript/196-project-references.solution.2/package.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.2/package.json rename to src/080-configuring-typescript/196-project-references.solution.2/package.json diff --git a/src/080-configuring-typescript/199-project-references.solution.2/pnpm-lock.yaml b/src/080-configuring-typescript/196-project-references.solution.2/pnpm-lock.yaml similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.2/pnpm-lock.yaml rename to src/080-configuring-typescript/196-project-references.solution.2/pnpm-lock.yaml diff --git a/src/080-configuring-typescript/199-project-references.solution.2/src/client/index.ts b/src/080-configuring-typescript/196-project-references.solution.2/src/client/index.ts similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.2/src/client/index.ts rename to src/080-configuring-typescript/196-project-references.solution.2/src/client/index.ts diff --git a/src/080-configuring-typescript/199-project-references.solution.2/src/server/index.ts b/src/080-configuring-typescript/196-project-references.solution.2/src/server/index.ts similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.2/src/server/index.ts rename to src/080-configuring-typescript/196-project-references.solution.2/src/server/index.ts diff --git a/src/080-configuring-typescript/199-project-references.solution.2/tsconfig.base.json b/src/080-configuring-typescript/196-project-references.solution.2/tsconfig.base.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.2/tsconfig.base.json rename to src/080-configuring-typescript/196-project-references.solution.2/tsconfig.base.json diff --git a/src/080-configuring-typescript/199-project-references.solution.2/tsconfig.client.json b/src/080-configuring-typescript/196-project-references.solution.2/tsconfig.client.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.2/tsconfig.client.json rename to src/080-configuring-typescript/196-project-references.solution.2/tsconfig.client.json diff --git a/src/080-configuring-typescript/199-project-references.solution.2/tsconfig.json b/src/080-configuring-typescript/196-project-references.solution.2/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.2/tsconfig.json rename to src/080-configuring-typescript/196-project-references.solution.2/tsconfig.json diff --git a/src/080-configuring-typescript/199-project-references.solution.2/tsconfig.server.json b/src/080-configuring-typescript/196-project-references.solution.2/tsconfig.server.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.2/tsconfig.server.json rename to src/080-configuring-typescript/196-project-references.solution.2/tsconfig.server.json diff --git a/src/080-configuring-typescript/199-project-references.solution.3/.config/tsconfig.base.json b/src/080-configuring-typescript/196-project-references.solution.3/.config/tsconfig.base.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.3/.config/tsconfig.base.json rename to src/080-configuring-typescript/196-project-references.solution.3/.config/tsconfig.base.json diff --git a/src/080-configuring-typescript/199-project-references.solution.3/.config/tsconfig.client.json b/src/080-configuring-typescript/196-project-references.solution.3/.config/tsconfig.client.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.3/.config/tsconfig.client.json rename to src/080-configuring-typescript/196-project-references.solution.3/.config/tsconfig.client.json diff --git a/src/080-configuring-typescript/199-project-references.solution.3/.config/tsconfig.server.json b/src/080-configuring-typescript/196-project-references.solution.3/.config/tsconfig.server.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.3/.config/tsconfig.server.json rename to src/080-configuring-typescript/196-project-references.solution.3/.config/tsconfig.server.json diff --git a/src/080-configuring-typescript/199-project-references.solution.3/package.json b/src/080-configuring-typescript/196-project-references.solution.3/package.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.3/package.json rename to src/080-configuring-typescript/196-project-references.solution.3/package.json diff --git a/src/080-configuring-typescript/199-project-references.solution.3/pnpm-lock.yaml b/src/080-configuring-typescript/196-project-references.solution.3/pnpm-lock.yaml similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.3/pnpm-lock.yaml rename to src/080-configuring-typescript/196-project-references.solution.3/pnpm-lock.yaml diff --git a/src/080-configuring-typescript/199-project-references.solution.3/src/client/index.ts b/src/080-configuring-typescript/196-project-references.solution.3/src/client/index.ts similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.3/src/client/index.ts rename to src/080-configuring-typescript/196-project-references.solution.3/src/client/index.ts diff --git a/src/080-configuring-typescript/199-project-references.solution.3/src/server/index.ts b/src/080-configuring-typescript/196-project-references.solution.3/src/server/index.ts similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.3/src/server/index.ts rename to src/080-configuring-typescript/196-project-references.solution.3/src/server/index.ts diff --git a/src/080-configuring-typescript/199-project-references.solution.3/tsconfig.json b/src/080-configuring-typescript/196-project-references.solution.3/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/199-project-references.solution.3/tsconfig.json rename to src/080-configuring-typescript/196-project-references.solution.3/tsconfig.json diff --git a/src/075-designing-your-types/185-template-literal-types.problem.ts b/src/080-configuring-typescript/197-jsx.problem.ts similarity index 100% rename from src/075-designing-your-types/185-template-literal-types.problem.ts rename to src/080-configuring-typescript/197-jsx.problem.ts diff --git a/src/075-designing-your-types/185-template-literal-types.solution.ts b/src/080-configuring-typescript/197-jsx.solution.ts similarity index 100% rename from src/075-designing-your-types/185-template-literal-types.solution.ts rename to src/080-configuring-typescript/197-jsx.solution.ts diff --git a/src/080-configuring-typescript/202-declaration-maps.solution/package.json b/src/080-configuring-typescript/198-creating-declaration-files.problem/package.json similarity index 100% rename from src/080-configuring-typescript/202-declaration-maps.solution/package.json rename to src/080-configuring-typescript/198-creating-declaration-files.problem/package.json diff --git a/src/080-configuring-typescript/201-creating-declaration-files.problem/pnpm-lock.yaml b/src/080-configuring-typescript/198-creating-declaration-files.problem/pnpm-lock.yaml similarity index 100% rename from src/080-configuring-typescript/201-creating-declaration-files.problem/pnpm-lock.yaml rename to src/080-configuring-typescript/198-creating-declaration-files.problem/pnpm-lock.yaml diff --git a/src/080-configuring-typescript/201-creating-declaration-files.problem/src-2/otherFile.ts b/src/080-configuring-typescript/198-creating-declaration-files.problem/src-2/otherFile.ts similarity index 100% rename from src/080-configuring-typescript/201-creating-declaration-files.problem/src-2/otherFile.ts rename to src/080-configuring-typescript/198-creating-declaration-files.problem/src-2/otherFile.ts diff --git a/src/080-configuring-typescript/201-creating-declaration-files.problem/src/index.ts b/src/080-configuring-typescript/198-creating-declaration-files.problem/src/index.ts similarity index 100% rename from src/080-configuring-typescript/201-creating-declaration-files.problem/src/index.ts rename to src/080-configuring-typescript/198-creating-declaration-files.problem/src/index.ts diff --git a/src/080-configuring-typescript/201-creating-declaration-files.problem/tsconfig.json b/src/080-configuring-typescript/198-creating-declaration-files.problem/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/201-creating-declaration-files.problem/tsconfig.json rename to src/080-configuring-typescript/198-creating-declaration-files.problem/tsconfig.json diff --git a/src/080-configuring-typescript/198-creating-declaration-files.solution/package.json b/src/080-configuring-typescript/198-creating-declaration-files.solution/package.json new file mode 100644 index 0000000..e93efae --- /dev/null +++ b/src/080-configuring-typescript/198-creating-declaration-files.solution/package.json @@ -0,0 +1,9 @@ +{ + "name": "exercise", + "version": "1.0.0", + "main": "index.js", + "type": "module", + "scripts": { + "dev": "tsc --watch" + } +} diff --git a/src/080-configuring-typescript/201-creating-declaration-files.solution/pnpm-lock.yaml b/src/080-configuring-typescript/198-creating-declaration-files.solution/pnpm-lock.yaml similarity index 100% rename from src/080-configuring-typescript/201-creating-declaration-files.solution/pnpm-lock.yaml rename to src/080-configuring-typescript/198-creating-declaration-files.solution/pnpm-lock.yaml diff --git a/src/080-configuring-typescript/201-creating-declaration-files.solution/src-2/otherFile.ts b/src/080-configuring-typescript/198-creating-declaration-files.solution/src-2/otherFile.ts similarity index 100% rename from src/080-configuring-typescript/201-creating-declaration-files.solution/src-2/otherFile.ts rename to src/080-configuring-typescript/198-creating-declaration-files.solution/src-2/otherFile.ts diff --git a/src/080-configuring-typescript/201-creating-declaration-files.solution/src/index.ts b/src/080-configuring-typescript/198-creating-declaration-files.solution/src/index.ts similarity index 100% rename from src/080-configuring-typescript/201-creating-declaration-files.solution/src/index.ts rename to src/080-configuring-typescript/198-creating-declaration-files.solution/src/index.ts diff --git a/src/080-configuring-typescript/201-creating-declaration-files.solution/tsconfig.json b/src/080-configuring-typescript/198-creating-declaration-files.solution/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/201-creating-declaration-files.solution/tsconfig.json rename to src/080-configuring-typescript/198-creating-declaration-files.solution/tsconfig.json diff --git a/src/080-configuring-typescript/199-declaration-maps.problem/package.json b/src/080-configuring-typescript/199-declaration-maps.problem/package.json new file mode 100644 index 0000000..e93efae --- /dev/null +++ b/src/080-configuring-typescript/199-declaration-maps.problem/package.json @@ -0,0 +1,9 @@ +{ + "name": "exercise", + "version": "1.0.0", + "main": "index.js", + "type": "module", + "scripts": { + "dev": "tsc --watch" + } +} diff --git a/src/080-configuring-typescript/202-declaration-maps.problem/pnpm-lock.yaml b/src/080-configuring-typescript/199-declaration-maps.problem/pnpm-lock.yaml similarity index 100% rename from src/080-configuring-typescript/202-declaration-maps.problem/pnpm-lock.yaml rename to src/080-configuring-typescript/199-declaration-maps.problem/pnpm-lock.yaml diff --git a/src/080-configuring-typescript/202-declaration-maps.problem/src-2/otherFile.ts b/src/080-configuring-typescript/199-declaration-maps.problem/src-2/otherFile.ts similarity index 100% rename from src/080-configuring-typescript/202-declaration-maps.problem/src-2/otherFile.ts rename to src/080-configuring-typescript/199-declaration-maps.problem/src-2/otherFile.ts diff --git a/src/080-configuring-typescript/202-declaration-maps.problem/src/index.ts b/src/080-configuring-typescript/199-declaration-maps.problem/src/index.ts similarity index 100% rename from src/080-configuring-typescript/202-declaration-maps.problem/src/index.ts rename to src/080-configuring-typescript/199-declaration-maps.problem/src/index.ts diff --git a/src/080-configuring-typescript/202-declaration-maps.problem/tsconfig.json b/src/080-configuring-typescript/199-declaration-maps.problem/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/202-declaration-maps.problem/tsconfig.json rename to src/080-configuring-typescript/199-declaration-maps.problem/tsconfig.json diff --git a/src/080-configuring-typescript/199-declaration-maps.solution/package.json b/src/080-configuring-typescript/199-declaration-maps.solution/package.json new file mode 100644 index 0000000..e93efae --- /dev/null +++ b/src/080-configuring-typescript/199-declaration-maps.solution/package.json @@ -0,0 +1,9 @@ +{ + "name": "exercise", + "version": "1.0.0", + "main": "index.js", + "type": "module", + "scripts": { + "dev": "tsc --watch" + } +} diff --git a/src/080-configuring-typescript/202-declaration-maps.solution/pnpm-lock.yaml b/src/080-configuring-typescript/199-declaration-maps.solution/pnpm-lock.yaml similarity index 100% rename from src/080-configuring-typescript/202-declaration-maps.solution/pnpm-lock.yaml rename to src/080-configuring-typescript/199-declaration-maps.solution/pnpm-lock.yaml diff --git a/src/080-configuring-typescript/202-declaration-maps.solution/src-2/otherFile.ts b/src/080-configuring-typescript/199-declaration-maps.solution/src-2/otherFile.ts similarity index 100% rename from src/080-configuring-typescript/202-declaration-maps.solution/src-2/otherFile.ts rename to src/080-configuring-typescript/199-declaration-maps.solution/src-2/otherFile.ts diff --git a/src/080-configuring-typescript/202-declaration-maps.solution/src/index.ts b/src/080-configuring-typescript/199-declaration-maps.solution/src/index.ts similarity index 100% rename from src/080-configuring-typescript/202-declaration-maps.solution/src/index.ts rename to src/080-configuring-typescript/199-declaration-maps.solution/src/index.ts diff --git a/src/080-configuring-typescript/202-declaration-maps.solution/tsconfig.json b/src/080-configuring-typescript/199-declaration-maps.solution/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/202-declaration-maps.solution/tsconfig.json rename to src/080-configuring-typescript/199-declaration-maps.solution/tsconfig.json diff --git a/src/080-configuring-typescript/203-setting-up-types-for-node.explainer/package.json b/src/080-configuring-typescript/200-setting-up-types-for-node.explainer/package.json similarity index 100% rename from src/080-configuring-typescript/203-setting-up-types-for-node.explainer/package.json rename to src/080-configuring-typescript/200-setting-up-types-for-node.explainer/package.json diff --git a/src/080-configuring-typescript/203-setting-up-types-for-node.explainer/pnpm-lock.yaml b/src/080-configuring-typescript/200-setting-up-types-for-node.explainer/pnpm-lock.yaml similarity index 100% rename from src/080-configuring-typescript/203-setting-up-types-for-node.explainer/pnpm-lock.yaml rename to src/080-configuring-typescript/200-setting-up-types-for-node.explainer/pnpm-lock.yaml diff --git a/src/080-configuring-typescript/203-setting-up-types-for-node.explainer/src/index.ts b/src/080-configuring-typescript/200-setting-up-types-for-node.explainer/src/index.ts similarity index 100% rename from src/080-configuring-typescript/203-setting-up-types-for-node.explainer/src/index.ts rename to src/080-configuring-typescript/200-setting-up-types-for-node.explainer/src/index.ts diff --git a/src/080-configuring-typescript/203-setting-up-types-for-node.explainer/tsconfig.json b/src/080-configuring-typescript/200-setting-up-types-for-node.explainer/tsconfig.json similarity index 100% rename from src/080-configuring-typescript/203-setting-up-types-for-node.explainer/tsconfig.json rename to src/080-configuring-typescript/200-setting-up-types-for-node.explainer/tsconfig.json diff --git a/src/075-designing-your-types/186-passing-unions-to-template-literal-types.problem.ts b/src/080-configuring-typescript/201-set-up-types-for-simple-scripts.problem.ts similarity index 100% rename from src/075-designing-your-types/186-passing-unions-to-template-literal-types.problem.ts rename to src/080-configuring-typescript/201-set-up-types-for-simple-scripts.problem.ts diff --git a/src/075-designing-your-types/186-passing-unions-to-template-literal-types.solution.ts b/src/080-configuring-typescript/201-set-up-types-for-simple-scripts.solution.ts similarity index 100% rename from src/075-designing-your-types/186-passing-unions-to-template-literal-types.solution.ts rename to src/080-configuring-typescript/201-set-up-types-for-simple-scripts.solution.ts diff --git a/src/075-designing-your-types/187-mapped-types.problem.ts b/src/080-configuring-typescript/202-set-up-types-for-test-files.problem.ts similarity index 100% rename from src/075-designing-your-types/187-mapped-types.problem.ts rename to src/080-configuring-typescript/202-set-up-types-for-test-files.problem.ts diff --git a/src/075-designing-your-types/187-mapped-types.solution.ts b/src/080-configuring-typescript/202-set-up-types-for-test-files.solution.ts similarity index 100% rename from src/075-designing-your-types/187-mapped-types.solution.ts rename to src/080-configuring-typescript/202-set-up-types-for-test-files.solution.ts diff --git a/src/075-designing-your-types/188-as-in-mapped-types.problem.ts b/src/080-configuring-typescript/203-set-up-types-for-bundled-web-app.problem.ts similarity index 100% rename from src/075-designing-your-types/188-as-in-mapped-types.problem.ts rename to src/080-configuring-typescript/203-set-up-types-for-bundled-web-app.problem.ts diff --git a/src/075-designing-your-types/188-as-in-mapped-types.solution.ts b/src/080-configuring-typescript/203-set-up-types-for-bundled-web-app.solution.ts similarity index 100% rename from src/075-designing-your-types/188-as-in-mapped-types.solution.ts rename to src/080-configuring-typescript/203-set-up-types-for-bundled-web-app.solution.ts diff --git a/src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.problem/package.json b/src/082-cjs-vs-esm/204-cant-import-esm-into-cjs.problem/package.json similarity index 100% rename from src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.problem/package.json rename to src/082-cjs-vs-esm/204-cant-import-esm-into-cjs.problem/package.json diff --git a/src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.problem/pnpm-lock.yaml b/src/082-cjs-vs-esm/204-cant-import-esm-into-cjs.problem/pnpm-lock.yaml similarity index 100% rename from src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.problem/pnpm-lock.yaml rename to src/082-cjs-vs-esm/204-cant-import-esm-into-cjs.problem/pnpm-lock.yaml diff --git a/src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.problem/src/esm-module.js b/src/082-cjs-vs-esm/204-cant-import-esm-into-cjs.problem/src/esm-module.js similarity index 100% rename from src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.problem/src/esm-module.js rename to src/082-cjs-vs-esm/204-cant-import-esm-into-cjs.problem/src/esm-module.js diff --git a/src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.problem/src/index.js b/src/082-cjs-vs-esm/204-cant-import-esm-into-cjs.problem/src/index.js similarity index 100% rename from src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.problem/src/index.js rename to src/082-cjs-vs-esm/204-cant-import-esm-into-cjs.problem/src/index.js diff --git a/src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.solution/package.json b/src/082-cjs-vs-esm/204-cant-import-esm-into-cjs.solution/package.json similarity index 100% rename from src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.solution/package.json rename to src/082-cjs-vs-esm/204-cant-import-esm-into-cjs.solution/package.json diff --git a/src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.solution/pnpm-lock.yaml b/src/082-cjs-vs-esm/204-cant-import-esm-into-cjs.solution/pnpm-lock.yaml similarity index 100% rename from src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.solution/pnpm-lock.yaml rename to src/082-cjs-vs-esm/204-cant-import-esm-into-cjs.solution/pnpm-lock.yaml diff --git a/src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.solution/src/esm-module.mjs b/src/082-cjs-vs-esm/204-cant-import-esm-into-cjs.solution/src/esm-module.mjs similarity index 100% rename from src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.solution/src/esm-module.mjs rename to src/082-cjs-vs-esm/204-cant-import-esm-into-cjs.solution/src/esm-module.mjs diff --git a/src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.solution/src/index.js b/src/082-cjs-vs-esm/204-cant-import-esm-into-cjs.solution/src/index.js similarity index 100% rename from src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.solution/src/index.js rename to src/082-cjs-vs-esm/204-cant-import-esm-into-cjs.solution/src/index.js diff --git a/src/082-cjs-vs-esm/208-can-import-cjs-into-esm.explainer/package.json b/src/082-cjs-vs-esm/205-can-import-cjs-into-esm.explainer/package.json similarity index 100% rename from src/082-cjs-vs-esm/208-can-import-cjs-into-esm.explainer/package.json rename to src/082-cjs-vs-esm/205-can-import-cjs-into-esm.explainer/package.json diff --git a/src/082-cjs-vs-esm/208-can-import-cjs-into-esm.explainer/pnpm-lock.yaml b/src/082-cjs-vs-esm/205-can-import-cjs-into-esm.explainer/pnpm-lock.yaml similarity index 100% rename from src/082-cjs-vs-esm/208-can-import-cjs-into-esm.explainer/pnpm-lock.yaml rename to src/082-cjs-vs-esm/205-can-import-cjs-into-esm.explainer/pnpm-lock.yaml diff --git a/src/082-cjs-vs-esm/208-can-import-cjs-into-esm.explainer/src/cjs-module.cjs b/src/082-cjs-vs-esm/205-can-import-cjs-into-esm.explainer/src/cjs-module.cjs similarity index 100% rename from src/082-cjs-vs-esm/208-can-import-cjs-into-esm.explainer/src/cjs-module.cjs rename to src/082-cjs-vs-esm/205-can-import-cjs-into-esm.explainer/src/cjs-module.cjs diff --git a/src/082-cjs-vs-esm/208-can-import-cjs-into-esm.explainer/src/index.mjs b/src/082-cjs-vs-esm/205-can-import-cjs-into-esm.explainer/src/index.mjs similarity index 100% rename from src/082-cjs-vs-esm/208-can-import-cjs-into-esm.explainer/src/index.mjs rename to src/082-cjs-vs-esm/205-can-import-cjs-into-esm.explainer/src/index.mjs diff --git a/src/082-cjs-vs-esm/209-mts-files.problem/package.json b/src/082-cjs-vs-esm/206-mts-files.problem/package.json similarity index 100% rename from src/082-cjs-vs-esm/209-mts-files.problem/package.json rename to src/082-cjs-vs-esm/206-mts-files.problem/package.json diff --git a/src/082-cjs-vs-esm/209-mts-files.problem/src/esm-module.ts b/src/082-cjs-vs-esm/206-mts-files.problem/src/esm-module.ts similarity index 100% rename from src/082-cjs-vs-esm/209-mts-files.problem/src/esm-module.ts rename to src/082-cjs-vs-esm/206-mts-files.problem/src/esm-module.ts diff --git a/src/082-cjs-vs-esm/209-mts-files.problem/src/index.ts b/src/082-cjs-vs-esm/206-mts-files.problem/src/index.ts similarity index 100% rename from src/082-cjs-vs-esm/209-mts-files.problem/src/index.ts rename to src/082-cjs-vs-esm/206-mts-files.problem/src/index.ts diff --git a/src/082-cjs-vs-esm/209-mts-files.problem/tsconfig.json b/src/082-cjs-vs-esm/206-mts-files.problem/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/209-mts-files.problem/tsconfig.json rename to src/082-cjs-vs-esm/206-mts-files.problem/tsconfig.json diff --git a/src/082-cjs-vs-esm/209-mts-files.solution/package.json b/src/082-cjs-vs-esm/206-mts-files.solution/package.json similarity index 100% rename from src/082-cjs-vs-esm/209-mts-files.solution/package.json rename to src/082-cjs-vs-esm/206-mts-files.solution/package.json diff --git a/src/082-cjs-vs-esm/209-mts-files.solution/src/esm-module.mts b/src/082-cjs-vs-esm/206-mts-files.solution/src/esm-module.mts similarity index 100% rename from src/082-cjs-vs-esm/209-mts-files.solution/src/esm-module.mts rename to src/082-cjs-vs-esm/206-mts-files.solution/src/esm-module.mts diff --git a/src/082-cjs-vs-esm/209-mts-files.solution/src/index.ts b/src/082-cjs-vs-esm/206-mts-files.solution/src/index.ts similarity index 100% rename from src/082-cjs-vs-esm/209-mts-files.solution/src/index.ts rename to src/082-cjs-vs-esm/206-mts-files.solution/src/index.ts diff --git a/src/082-cjs-vs-esm/209-mts-files.solution/tsconfig.json b/src/082-cjs-vs-esm/206-mts-files.solution/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/209-mts-files.solution/tsconfig.json rename to src/082-cjs-vs-esm/206-mts-files.solution/tsconfig.json diff --git a/src/082-cjs-vs-esm/210-verbatim-module-syntax.problem/package.json b/src/082-cjs-vs-esm/207-verbatim-module-syntax.problem/package.json similarity index 100% rename from src/082-cjs-vs-esm/210-verbatim-module-syntax.problem/package.json rename to src/082-cjs-vs-esm/207-verbatim-module-syntax.problem/package.json diff --git a/src/082-cjs-vs-esm/210-verbatim-module-syntax.problem/src/esm-module.ts b/src/082-cjs-vs-esm/207-verbatim-module-syntax.problem/src/esm-module.ts similarity index 100% rename from src/082-cjs-vs-esm/210-verbatim-module-syntax.problem/src/esm-module.ts rename to src/082-cjs-vs-esm/207-verbatim-module-syntax.problem/src/esm-module.ts diff --git a/src/082-cjs-vs-esm/210-verbatim-module-syntax.problem/tsconfig.json b/src/082-cjs-vs-esm/207-verbatim-module-syntax.problem/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/210-verbatim-module-syntax.problem/tsconfig.json rename to src/082-cjs-vs-esm/207-verbatim-module-syntax.problem/tsconfig.json diff --git a/src/082-cjs-vs-esm/210-verbatim-module-syntax.solution/package.json b/src/082-cjs-vs-esm/207-verbatim-module-syntax.solution/package.json similarity index 100% rename from src/082-cjs-vs-esm/210-verbatim-module-syntax.solution/package.json rename to src/082-cjs-vs-esm/207-verbatim-module-syntax.solution/package.json diff --git a/src/082-cjs-vs-esm/210-verbatim-module-syntax.solution/src/esm-module.ts b/src/082-cjs-vs-esm/207-verbatim-module-syntax.solution/src/esm-module.ts similarity index 100% rename from src/082-cjs-vs-esm/210-verbatim-module-syntax.solution/src/esm-module.ts rename to src/082-cjs-vs-esm/207-verbatim-module-syntax.solution/src/esm-module.ts diff --git a/src/082-cjs-vs-esm/210-verbatim-module-syntax.solution/tsconfig.json b/src/082-cjs-vs-esm/207-verbatim-module-syntax.solution/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/210-verbatim-module-syntax.solution/tsconfig.json rename to src/082-cjs-vs-esm/207-verbatim-module-syntax.solution/tsconfig.json diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.problem/package.json b/src/082-cjs-vs-esm/208-treat-ts-files-as-esm.problem/package.json similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-esm.problem/package.json rename to src/082-cjs-vs-esm/208-treat-ts-files-as-esm.problem/package.json diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.problem/src/esm-module.ts b/src/082-cjs-vs-esm/208-treat-ts-files-as-esm.problem/src/esm-module.ts similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-esm.problem/src/esm-module.ts rename to src/082-cjs-vs-esm/208-treat-ts-files-as-esm.problem/src/esm-module.ts diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.problem/src/index.ts b/src/082-cjs-vs-esm/208-treat-ts-files-as-esm.problem/src/index.ts similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-esm.problem/src/index.ts rename to src/082-cjs-vs-esm/208-treat-ts-files-as-esm.problem/src/index.ts diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.problem/tsconfig.json b/src/082-cjs-vs-esm/208-treat-ts-files-as-esm.problem/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-esm.problem/tsconfig.json rename to src/082-cjs-vs-esm/208-treat-ts-files-as-esm.problem/tsconfig.json diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.1/package.json b/src/082-cjs-vs-esm/208-treat-ts-files-as-esm.solution.1/package.json similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.1/package.json rename to src/082-cjs-vs-esm/208-treat-ts-files-as-esm.solution.1/package.json diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.1/src/esm-module.ts b/src/082-cjs-vs-esm/208-treat-ts-files-as-esm.solution.1/src/esm-module.ts similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.1/src/esm-module.ts rename to src/082-cjs-vs-esm/208-treat-ts-files-as-esm.solution.1/src/esm-module.ts diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.1/src/index.ts b/src/082-cjs-vs-esm/208-treat-ts-files-as-esm.solution.1/src/index.ts similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.1/src/index.ts rename to src/082-cjs-vs-esm/208-treat-ts-files-as-esm.solution.1/src/index.ts diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.1/tsconfig.json b/src/082-cjs-vs-esm/208-treat-ts-files-as-esm.solution.1/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.1/tsconfig.json rename to src/082-cjs-vs-esm/208-treat-ts-files-as-esm.solution.1/tsconfig.json diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.2/package.json b/src/082-cjs-vs-esm/208-treat-ts-files-as-esm.solution.2/package.json similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.2/package.json rename to src/082-cjs-vs-esm/208-treat-ts-files-as-esm.solution.2/package.json diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.2/src/esm-module.mts b/src/082-cjs-vs-esm/208-treat-ts-files-as-esm.solution.2/src/esm-module.mts similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.2/src/esm-module.mts rename to src/082-cjs-vs-esm/208-treat-ts-files-as-esm.solution.2/src/esm-module.mts diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.2/src/index.mts b/src/082-cjs-vs-esm/208-treat-ts-files-as-esm.solution.2/src/index.mts similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.2/src/index.mts rename to src/082-cjs-vs-esm/208-treat-ts-files-as-esm.solution.2/src/index.mts diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.2/tsconfig.json b/src/082-cjs-vs-esm/208-treat-ts-files-as-esm.solution.2/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.2/tsconfig.json rename to src/082-cjs-vs-esm/208-treat-ts-files-as-esm.solution.2/tsconfig.json diff --git a/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.problem/package.json b/src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.problem/package.json similarity index 100% rename from src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.problem/package.json rename to src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.problem/package.json diff --git a/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.problem/src/index.ts b/src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.problem/src/index.ts similarity index 100% rename from src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.problem/src/index.ts rename to src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.problem/src/index.ts diff --git a/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.problem/src/other-module.ts b/src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.problem/src/other-module.ts similarity index 100% rename from src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.problem/src/other-module.ts rename to src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.problem/src/other-module.ts diff --git a/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.problem/tsconfig.json b/src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.problem/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.problem/tsconfig.json rename to src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.problem/tsconfig.json diff --git a/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.1/package.json b/src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.solution.1/package.json similarity index 100% rename from src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.1/package.json rename to src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.solution.1/package.json diff --git a/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.1/src/index.ts b/src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.solution.1/src/index.ts similarity index 100% rename from src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.1/src/index.ts rename to src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.solution.1/src/index.ts diff --git a/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.1/src/other-module.ts b/src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.solution.1/src/other-module.ts similarity index 100% rename from src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.1/src/other-module.ts rename to src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.solution.1/src/other-module.ts diff --git a/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.1/tsconfig.json b/src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.solution.1/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.1/tsconfig.json rename to src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.solution.1/tsconfig.json diff --git a/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.2/package.json b/src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.solution.2/package.json similarity index 100% rename from src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.2/package.json rename to src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.solution.2/package.json diff --git a/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.2/src/index.cts b/src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.solution.2/src/index.cts similarity index 100% rename from src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.2/src/index.cts rename to src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.solution.2/src/index.cts diff --git a/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.2/src/other-module.cts b/src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.solution.2/src/other-module.cts similarity index 100% rename from src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.2/src/other-module.cts rename to src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.solution.2/src/other-module.cts diff --git a/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.2/tsconfig.json b/src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.solution.2/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.2/tsconfig.json rename to src/082-cjs-vs-esm/209-treat-ts-files-as-cjs.solution.2/tsconfig.json diff --git a/src/082-cjs-vs-esm/213-import-syntax-for-cts.problem/package.json b/src/082-cjs-vs-esm/210-import-syntax-for-cts.problem/package.json similarity index 100% rename from src/082-cjs-vs-esm/213-import-syntax-for-cts.problem/package.json rename to src/082-cjs-vs-esm/210-import-syntax-for-cts.problem/package.json diff --git a/src/082-cjs-vs-esm/213-import-syntax-for-cts.problem/src/index.cts b/src/082-cjs-vs-esm/210-import-syntax-for-cts.problem/src/index.cts similarity index 100% rename from src/082-cjs-vs-esm/213-import-syntax-for-cts.problem/src/index.cts rename to src/082-cjs-vs-esm/210-import-syntax-for-cts.problem/src/index.cts diff --git a/src/082-cjs-vs-esm/213-import-syntax-for-cts.problem/src/other-module.cts b/src/082-cjs-vs-esm/210-import-syntax-for-cts.problem/src/other-module.cts similarity index 100% rename from src/082-cjs-vs-esm/213-import-syntax-for-cts.problem/src/other-module.cts rename to src/082-cjs-vs-esm/210-import-syntax-for-cts.problem/src/other-module.cts diff --git a/src/082-cjs-vs-esm/213-import-syntax-for-cts.problem/tsconfig.json b/src/082-cjs-vs-esm/210-import-syntax-for-cts.problem/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/213-import-syntax-for-cts.problem/tsconfig.json rename to src/082-cjs-vs-esm/210-import-syntax-for-cts.problem/tsconfig.json diff --git a/src/082-cjs-vs-esm/213-import-syntax-for-cts.solution/package.json b/src/082-cjs-vs-esm/210-import-syntax-for-cts.solution/package.json similarity index 100% rename from src/082-cjs-vs-esm/213-import-syntax-for-cts.solution/package.json rename to src/082-cjs-vs-esm/210-import-syntax-for-cts.solution/package.json diff --git a/src/082-cjs-vs-esm/213-import-syntax-for-cts.solution/src/index.cts b/src/082-cjs-vs-esm/210-import-syntax-for-cts.solution/src/index.cts similarity index 100% rename from src/082-cjs-vs-esm/213-import-syntax-for-cts.solution/src/index.cts rename to src/082-cjs-vs-esm/210-import-syntax-for-cts.solution/src/index.cts diff --git a/src/082-cjs-vs-esm/213-import-syntax-for-cts.solution/src/other-module.cts b/src/082-cjs-vs-esm/210-import-syntax-for-cts.solution/src/other-module.cts similarity index 100% rename from src/082-cjs-vs-esm/213-import-syntax-for-cts.solution/src/other-module.cts rename to src/082-cjs-vs-esm/210-import-syntax-for-cts.solution/src/other-module.cts diff --git a/src/082-cjs-vs-esm/213-import-syntax-for-cts.solution/tsconfig.json b/src/082-cjs-vs-esm/210-import-syntax-for-cts.solution/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/213-import-syntax-for-cts.solution/tsconfig.json rename to src/082-cjs-vs-esm/210-import-syntax-for-cts.solution/tsconfig.json diff --git a/src/082-cjs-vs-esm/214-why-module-nodenext.explainer/package.json b/src/082-cjs-vs-esm/211-why-module-nodenext.explainer/package.json similarity index 100% rename from src/082-cjs-vs-esm/214-why-module-nodenext.explainer/package.json rename to src/082-cjs-vs-esm/211-why-module-nodenext.explainer/package.json diff --git a/src/082-cjs-vs-esm/214-why-module-nodenext.explainer/pnpm-lock.yaml b/src/082-cjs-vs-esm/211-why-module-nodenext.explainer/pnpm-lock.yaml similarity index 100% rename from src/082-cjs-vs-esm/214-why-module-nodenext.explainer/pnpm-lock.yaml rename to src/082-cjs-vs-esm/211-why-module-nodenext.explainer/pnpm-lock.yaml diff --git a/src/082-cjs-vs-esm/214-why-module-nodenext.explainer/src/cjs-module.cts b/src/082-cjs-vs-esm/211-why-module-nodenext.explainer/src/cjs-module.cts similarity index 100% rename from src/082-cjs-vs-esm/214-why-module-nodenext.explainer/src/cjs-module.cts rename to src/082-cjs-vs-esm/211-why-module-nodenext.explainer/src/cjs-module.cts diff --git a/src/082-cjs-vs-esm/214-why-module-nodenext.explainer/src/esm-module.mts b/src/082-cjs-vs-esm/211-why-module-nodenext.explainer/src/esm-module.mts similarity index 100% rename from src/082-cjs-vs-esm/214-why-module-nodenext.explainer/src/esm-module.mts rename to src/082-cjs-vs-esm/211-why-module-nodenext.explainer/src/esm-module.mts diff --git a/src/082-cjs-vs-esm/214-why-module-nodenext.explainer/src/index.ts b/src/082-cjs-vs-esm/211-why-module-nodenext.explainer/src/index.ts similarity index 100% rename from src/082-cjs-vs-esm/214-why-module-nodenext.explainer/src/index.ts rename to src/082-cjs-vs-esm/211-why-module-nodenext.explainer/src/index.ts diff --git a/src/082-cjs-vs-esm/214-why-module-nodenext.explainer/tsconfig.json b/src/082-cjs-vs-esm/211-why-module-nodenext.explainer/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/214-why-module-nodenext.explainer/tsconfig.json rename to src/082-cjs-vs-esm/211-why-module-nodenext.explainer/tsconfig.json diff --git a/src/082-cjs-vs-esm/215-should-i-use-cjs-or-esm.explainer.ts b/src/082-cjs-vs-esm/212-should-i-use-cjs-or-esm.explainer.ts similarity index 100% rename from src/082-cjs-vs-esm/215-should-i-use-cjs-or-esm.explainer.ts rename to src/082-cjs-vs-esm/212-should-i-use-cjs-or-esm.explainer.ts diff --git a/src/080-configuring-typescript/200-jsx.problem.ts b/src/085-the-utils-folder/213-intro-to-the-utils-folder.problem.ts similarity index 100% rename from src/080-configuring-typescript/200-jsx.problem.ts rename to src/085-the-utils-folder/213-intro-to-the-utils-folder.problem.ts diff --git a/src/080-configuring-typescript/200-jsx.solution.ts b/src/085-the-utils-folder/213-intro-to-the-utils-folder.solution.ts similarity index 100% rename from src/080-configuring-typescript/200-jsx.solution.ts rename to src/085-the-utils-folder/213-intro-to-the-utils-folder.solution.ts diff --git a/src/080-configuring-typescript/204-set-up-types-for-simple-scripts.problem.ts b/src/085-the-utils-folder/214-generic-functions-without-inference.problem.ts similarity index 100% rename from src/080-configuring-typescript/204-set-up-types-for-simple-scripts.problem.ts rename to src/085-the-utils-folder/214-generic-functions-without-inference.problem.ts diff --git a/src/080-configuring-typescript/204-set-up-types-for-simple-scripts.solution.ts b/src/085-the-utils-folder/214-generic-functions-without-inference.solution.ts similarity index 100% rename from src/080-configuring-typescript/204-set-up-types-for-simple-scripts.solution.ts rename to src/085-the-utils-folder/214-generic-functions-without-inference.solution.ts diff --git a/src/080-configuring-typescript/205-set-up-types-for-test-files.problem.ts b/src/085-the-utils-folder/215-type-parameter-defaults-in-generic-functions.problem.ts similarity index 100% rename from src/080-configuring-typescript/205-set-up-types-for-test-files.problem.ts rename to src/085-the-utils-folder/215-type-parameter-defaults-in-generic-functions.problem.ts diff --git a/src/080-configuring-typescript/205-set-up-types-for-test-files.solution.ts b/src/085-the-utils-folder/215-type-parameter-defaults-in-generic-functions.solution.ts similarity index 100% rename from src/080-configuring-typescript/205-set-up-types-for-test-files.solution.ts rename to src/085-the-utils-folder/215-type-parameter-defaults-in-generic-functions.solution.ts diff --git a/src/080-configuring-typescript/206-set-up-types-for-bundled-web-app.problem.ts b/src/085-the-utils-folder/216-type-parameter-constraints-with-generic-functions.problem.ts similarity index 100% rename from src/080-configuring-typescript/206-set-up-types-for-bundled-web-app.problem.ts rename to src/085-the-utils-folder/216-type-parameter-constraints-with-generic-functions.problem.ts diff --git a/src/080-configuring-typescript/206-set-up-types-for-bundled-web-app.solution.ts b/src/085-the-utils-folder/216-type-parameter-constraints-with-generic-functions.solution.ts similarity index 100% rename from src/080-configuring-typescript/206-set-up-types-for-bundled-web-app.solution.ts rename to src/085-the-utils-folder/216-type-parameter-constraints-with-generic-functions.solution.ts diff --git a/src/085-the-utils-folder/216-intro-to-the-utils-folder.problem.ts b/src/085-the-utils-folder/217-generic-functions-with-inference.problem.ts similarity index 100% rename from src/085-the-utils-folder/216-intro-to-the-utils-folder.problem.ts rename to src/085-the-utils-folder/217-generic-functions-with-inference.problem.ts diff --git a/src/085-the-utils-folder/216-intro-to-the-utils-folder.solution.ts b/src/085-the-utils-folder/217-generic-functions-with-inference.solution.ts similarity index 100% rename from src/085-the-utils-folder/216-intro-to-the-utils-folder.solution.ts rename to src/085-the-utils-folder/217-generic-functions-with-inference.solution.ts diff --git a/src/085-the-utils-folder/217-generic-functions-without-inference.problem.ts b/src/085-the-utils-folder/218-as-any-inside-generic-functions.problem.ts similarity index 100% rename from src/085-the-utils-folder/217-generic-functions-without-inference.problem.ts rename to src/085-the-utils-folder/218-as-any-inside-generic-functions.problem.ts diff --git a/src/085-the-utils-folder/217-generic-functions-without-inference.solution.ts b/src/085-the-utils-folder/218-as-any-inside-generic-functions.solution.ts similarity index 100% rename from src/085-the-utils-folder/217-generic-functions-without-inference.solution.ts rename to src/085-the-utils-folder/218-as-any-inside-generic-functions.solution.ts diff --git a/src/085-the-utils-folder/218-type-parameter-defaults-in-generic-functions.problem.ts b/src/085-the-utils-folder/219-multiple-type-arguments.problem.ts similarity index 100% rename from src/085-the-utils-folder/218-type-parameter-defaults-in-generic-functions.problem.ts rename to src/085-the-utils-folder/219-multiple-type-arguments.problem.ts diff --git a/src/085-the-utils-folder/218-type-parameter-defaults-in-generic-functions.solution.ts b/src/085-the-utils-folder/219-multiple-type-arguments.solution.ts similarity index 100% rename from src/085-the-utils-folder/218-type-parameter-defaults-in-generic-functions.solution.ts rename to src/085-the-utils-folder/219-multiple-type-arguments.solution.ts diff --git a/src/085-the-utils-folder/219-type-parameter-constraints-with-generic-functions.problem.ts b/src/085-the-utils-folder/220-create-group-by-function.problem.ts similarity index 100% rename from src/085-the-utils-folder/219-type-parameter-constraints-with-generic-functions.problem.ts rename to src/085-the-utils-folder/220-create-group-by-function.problem.ts diff --git a/src/085-the-utils-folder/219-type-parameter-constraints-with-generic-functions.solution.ts b/src/085-the-utils-folder/220-create-group-by-function.solution.ts similarity index 100% rename from src/085-the-utils-folder/219-type-parameter-constraints-with-generic-functions.solution.ts rename to src/085-the-utils-folder/220-create-group-by-function.solution.ts diff --git a/src/085-the-utils-folder/220-generic-functions-with-inference.problem.ts b/src/085-the-utils-folder/221-type-predicates.problem.ts similarity index 100% rename from src/085-the-utils-folder/220-generic-functions-with-inference.problem.ts rename to src/085-the-utils-folder/221-type-predicates.problem.ts diff --git a/src/085-the-utils-folder/220-generic-functions-with-inference.solution.ts b/src/085-the-utils-folder/221-type-predicates.solution.ts similarity index 100% rename from src/085-the-utils-folder/220-generic-functions-with-inference.solution.ts rename to src/085-the-utils-folder/221-type-predicates.solution.ts diff --git a/src/085-the-utils-folder/221-as-any-inside-generic-functions.problem.ts b/src/085-the-utils-folder/222-assertion-functions.problem.ts similarity index 100% rename from src/085-the-utils-folder/221-as-any-inside-generic-functions.problem.ts rename to src/085-the-utils-folder/222-assertion-functions.problem.ts diff --git a/src/085-the-utils-folder/221-as-any-inside-generic-functions.solution.ts b/src/085-the-utils-folder/222-assertion-functions.solution.ts similarity index 100% rename from src/085-the-utils-folder/221-as-any-inside-generic-functions.solution.ts rename to src/085-the-utils-folder/222-assertion-functions.solution.ts diff --git a/src/085-the-utils-folder/222-multiple-type-arguments.problem.ts b/src/085-the-utils-folder/223-function-overloads.problem.ts similarity index 100% rename from src/085-the-utils-folder/222-multiple-type-arguments.problem.ts rename to src/085-the-utils-folder/223-function-overloads.problem.ts diff --git a/src/085-the-utils-folder/222-multiple-type-arguments.solution.ts b/src/085-the-utils-folder/223-function-overloads.solution.ts similarity index 100% rename from src/085-the-utils-folder/222-multiple-type-arguments.solution.ts rename to src/085-the-utils-folder/223-function-overloads.solution.ts diff --git a/src/085-the-utils-folder/223-create-group-by-function.problem.ts b/src/090-the-style-guide/224-hungarian-notation.problem.ts similarity index 100% rename from src/085-the-utils-folder/223-create-group-by-function.problem.ts rename to src/090-the-style-guide/224-hungarian-notation.problem.ts diff --git a/src/085-the-utils-folder/223-create-group-by-function.solution.ts b/src/090-the-style-guide/224-hungarian-notation.solution.ts similarity index 100% rename from src/085-the-utils-folder/223-create-group-by-function.solution.ts rename to src/090-the-style-guide/224-hungarian-notation.solution.ts diff --git a/src/085-the-utils-folder/224-type-predicates.problem.ts b/src/090-the-style-guide/225-where-to-put-your-types.problem.ts similarity index 100% rename from src/085-the-utils-folder/224-type-predicates.problem.ts rename to src/090-the-style-guide/225-where-to-put-your-types.problem.ts diff --git a/src/085-the-utils-folder/224-type-predicates.solution.ts b/src/090-the-style-guide/225-where-to-put-your-types.solution.ts similarity index 100% rename from src/085-the-utils-folder/224-type-predicates.solution.ts rename to src/090-the-style-guide/225-where-to-put-your-types.solution.ts diff --git a/src/085-the-utils-folder/225-assertion-functions.problem.ts b/src/090-the-style-guide/226-colocation-of-types.problem.ts similarity index 100% rename from src/085-the-utils-folder/225-assertion-functions.problem.ts rename to src/090-the-style-guide/226-colocation-of-types.problem.ts diff --git a/src/085-the-utils-folder/225-assertion-functions.solution.ts b/src/090-the-style-guide/226-colocation-of-types.solution.ts similarity index 100% rename from src/085-the-utils-folder/225-assertion-functions.solution.ts rename to src/090-the-style-guide/226-colocation-of-types.solution.ts diff --git a/src/085-the-utils-folder/226-function-overloads.problem.ts b/src/090-the-style-guide/227-setting-up-eslint.explainer.ts similarity index 100% rename from src/085-the-utils-folder/226-function-overloads.problem.ts rename to src/090-the-style-guide/227-setting-up-eslint.explainer.ts diff --git a/src/085-the-utils-folder/226-function-overloads.solution.ts b/src/090-the-style-guide/228-explicit-any-rule-or-not.problem.ts similarity index 100% rename from src/085-the-utils-folder/226-function-overloads.solution.ts rename to src/090-the-style-guide/228-explicit-any-rule-or-not.problem.ts diff --git a/src/090-the-style-guide/227-hungarian-notation.problem.ts b/src/090-the-style-guide/228-explicit-any-rule-or-not.solution.ts similarity index 100% rename from src/090-the-style-guide/227-hungarian-notation.problem.ts rename to src/090-the-style-guide/228-explicit-any-rule-or-not.solution.ts diff --git a/src/090-the-style-guide/227-hungarian-notation.solution.ts b/src/090-the-style-guide/229-explicit-return-types-or-not.problem.ts similarity index 100% rename from src/090-the-style-guide/227-hungarian-notation.solution.ts rename to src/090-the-style-guide/229-explicit-return-types-or-not.problem.ts diff --git a/src/090-the-style-guide/228-where-to-put-your-types.problem.ts b/src/090-the-style-guide/229-explicit-return-types-or-not.solution.ts similarity index 100% rename from src/090-the-style-guide/228-where-to-put-your-types.problem.ts rename to src/090-the-style-guide/229-explicit-return-types-or-not.solution.ts diff --git a/src/090-the-style-guide/228-where-to-put-your-types.solution.ts b/src/090-the-style-guide/230-any-vs-ts-ignore-vs-ts-expect-error.problem.ts similarity index 100% rename from src/090-the-style-guide/228-where-to-put-your-types.solution.ts rename to src/090-the-style-guide/230-any-vs-ts-ignore-vs-ts-expect-error.problem.ts diff --git a/src/090-the-style-guide/229-colocation-of-types.problem.ts b/src/090-the-style-guide/230-any-vs-ts-ignore-vs-ts-expect-error.solution.ts similarity index 100% rename from src/090-the-style-guide/229-colocation-of-types.problem.ts rename to src/090-the-style-guide/230-any-vs-ts-ignore-vs-ts-expect-error.solution.ts diff --git a/src/090-the-style-guide/229-colocation-of-types.solution.ts b/src/090-the-style-guide/231-dont-declare-type-and-value-with-the-same-name.problem.ts similarity index 100% rename from src/090-the-style-guide/229-colocation-of-types.solution.ts rename to src/090-the-style-guide/231-dont-declare-type-and-value-with-the-same-name.problem.ts diff --git a/src/090-the-style-guide/230-setting-up-eslint.explainer.ts b/src/090-the-style-guide/231-dont-declare-type-and-value-with-the-same-name.solution.ts similarity index 100% rename from src/090-the-style-guide/230-setting-up-eslint.explainer.ts rename to src/090-the-style-guide/231-dont-declare-type-and-value-with-the-same-name.solution.ts diff --git a/src/090-the-style-guide/231-explicit-any-rule-or-not.problem.ts b/src/090-the-style-guide/232-types-vs-interfaces.problem.ts similarity index 100% rename from src/090-the-style-guide/231-explicit-any-rule-or-not.problem.ts rename to src/090-the-style-guide/232-types-vs-interfaces.problem.ts diff --git a/src/090-the-style-guide/231-explicit-any-rule-or-not.solution.ts b/src/090-the-style-guide/232-types-vs-interfaces.solution.ts similarity index 100% rename from src/090-the-style-guide/231-explicit-any-rule-or-not.solution.ts rename to src/090-the-style-guide/232-types-vs-interfaces.solution.ts diff --git a/src/090-the-style-guide/232-explicit-return-types-or-not.problem.ts b/src/090-the-style-guide/233-dont-use-uppercase-function-object-string-boolean-as-types.problem.ts similarity index 100% rename from src/090-the-style-guide/232-explicit-return-types-or-not.problem.ts rename to src/090-the-style-guide/233-dont-use-uppercase-function-object-string-boolean-as-types.problem.ts diff --git a/src/090-the-style-guide/232-explicit-return-types-or-not.solution.ts b/src/090-the-style-guide/233-dont-use-uppercase-function-object-string-boolean-as-types.solution.ts similarity index 100% rename from src/090-the-style-guide/232-explicit-return-types-or-not.solution.ts rename to src/090-the-style-guide/233-dont-use-uppercase-function-object-string-boolean-as-types.solution.ts diff --git a/src/090-the-style-guide/233-any-vs-ts-ignore-vs-ts-expect-error.problem.ts b/src/090-the-style-guide/234-dont-use-globally-available-types.problem.ts similarity index 100% rename from src/090-the-style-guide/233-any-vs-ts-ignore-vs-ts-expect-error.problem.ts rename to src/090-the-style-guide/234-dont-use-globally-available-types.problem.ts diff --git a/src/090-the-style-guide/233-any-vs-ts-ignore-vs-ts-expect-error.solution.ts b/src/090-the-style-guide/234-dont-use-globally-available-types.solution.ts similarity index 100% rename from src/090-the-style-guide/233-any-vs-ts-ignore-vs-ts-expect-error.solution.ts rename to src/090-the-style-guide/234-dont-use-globally-available-types.solution.ts diff --git a/src/090-the-style-guide/234-dont-declare-type-and-value-with-the-same-name.problem.ts b/src/090-the-style-guide/235-how-strict-should-you-configure-ts.problem.ts similarity index 100% rename from src/090-the-style-guide/234-dont-declare-type-and-value-with-the-same-name.problem.ts rename to src/090-the-style-guide/235-how-strict-should-you-configure-ts.problem.ts diff --git a/src/090-the-style-guide/234-dont-declare-type-and-value-with-the-same-name.solution.ts b/src/090-the-style-guide/235-how-strict-should-you-configure-ts.solution.ts similarity index 100% rename from src/090-the-style-guide/234-dont-declare-type-and-value-with-the-same-name.solution.ts rename to src/090-the-style-guide/235-how-strict-should-you-configure-ts.solution.ts diff --git a/src/090-the-style-guide/235-types-vs-interfaces.problem.ts b/src/090-the-style-guide/236-dont-unnecessarily-widen-types.problem.ts similarity index 100% rename from src/090-the-style-guide/235-types-vs-interfaces.problem.ts rename to src/090-the-style-guide/236-dont-unnecessarily-widen-types.problem.ts diff --git a/src/090-the-style-guide/235-types-vs-interfaces.solution.ts b/src/090-the-style-guide/236-dont-unnecessarily-widen-types.solution.ts similarity index 100% rename from src/090-the-style-guide/235-types-vs-interfaces.solution.ts rename to src/090-the-style-guide/236-dont-unnecessarily-widen-types.solution.ts diff --git a/src/090-the-style-guide/236-dont-use-uppercase-function-object-string-boolean-as-types.problem.ts b/src/095-migrating-from-javascript/237-strict-file-by-file-vs-ramp-up-strictness.problem.ts similarity index 100% rename from src/090-the-style-guide/236-dont-use-uppercase-function-object-string-boolean-as-types.problem.ts rename to src/095-migrating-from-javascript/237-strict-file-by-file-vs-ramp-up-strictness.problem.ts diff --git a/src/090-the-style-guide/236-dont-use-uppercase-function-object-string-boolean-as-types.solution.ts b/src/095-migrating-from-javascript/237-strict-file-by-file-vs-ramp-up-strictness.solution.ts similarity index 100% rename from src/090-the-style-guide/236-dont-use-uppercase-function-object-string-boolean-as-types.solution.ts rename to src/095-migrating-from-javascript/237-strict-file-by-file-vs-ramp-up-strictness.solution.ts diff --git a/src/090-the-style-guide/237-dont-use-globally-available-types.problem.ts b/src/095-migrating-from-javascript/238-dependencies-first.problem.ts similarity index 100% rename from src/090-the-style-guide/237-dont-use-globally-available-types.problem.ts rename to src/095-migrating-from-javascript/238-dependencies-first.problem.ts diff --git a/src/090-the-style-guide/237-dont-use-globally-available-types.solution.ts b/src/095-migrating-from-javascript/238-dependencies-first.solution.ts similarity index 100% rename from src/090-the-style-guide/237-dont-use-globally-available-types.solution.ts rename to src/095-migrating-from-javascript/238-dependencies-first.solution.ts diff --git a/src/090-the-style-guide/238-how-strict-should-you-configure-ts.problem.ts b/src/095-migrating-from-javascript/239-typing-third-party-modules.problem.ts similarity index 100% rename from src/090-the-style-guide/238-how-strict-should-you-configure-ts.problem.ts rename to src/095-migrating-from-javascript/239-typing-third-party-modules.problem.ts diff --git a/src/090-the-style-guide/238-how-strict-should-you-configure-ts.solution.ts b/src/095-migrating-from-javascript/239-typing-third-party-modules.solution.ts similarity index 100% rename from src/090-the-style-guide/238-how-strict-should-you-configure-ts.solution.ts rename to src/095-migrating-from-javascript/239-typing-third-party-modules.solution.ts diff --git a/src/090-the-style-guide/239-dont-unnecessarily-widen-types.problem.ts b/src/095-migrating-from-javascript/240-madge.problem.ts similarity index 100% rename from src/090-the-style-guide/239-dont-unnecessarily-widen-types.problem.ts rename to src/095-migrating-from-javascript/240-madge.problem.ts diff --git a/src/090-the-style-guide/239-dont-unnecessarily-widen-types.solution.ts b/src/095-migrating-from-javascript/240-madge.solution.ts similarity index 100% rename from src/090-the-style-guide/239-dont-unnecessarily-widen-types.solution.ts rename to src/095-migrating-from-javascript/240-madge.solution.ts diff --git a/src/095-migrating-from-javascript/240-strict-file-by-file-vs-ramp-up-strictness.problem.ts b/src/095-migrating-from-javascript/241-understanding-the-structure-of-ts-errors.problem.ts similarity index 100% rename from src/095-migrating-from-javascript/240-strict-file-by-file-vs-ramp-up-strictness.problem.ts rename to src/095-migrating-from-javascript/241-understanding-the-structure-of-ts-errors.problem.ts diff --git a/src/095-migrating-from-javascript/240-strict-file-by-file-vs-ramp-up-strictness.solution.ts b/src/095-migrating-from-javascript/241-understanding-the-structure-of-ts-errors.solution.ts similarity index 100% rename from src/095-migrating-from-javascript/240-strict-file-by-file-vs-ramp-up-strictness.solution.ts rename to src/095-migrating-from-javascript/241-understanding-the-structure-of-ts-errors.solution.ts diff --git a/src/095-migrating-from-javascript/241-dependencies-first.problem.ts b/src/095-migrating-from-javascript/242-experiments-with-jsdoc.problem.ts similarity index 100% rename from src/095-migrating-from-javascript/241-dependencies-first.problem.ts rename to src/095-migrating-from-javascript/242-experiments-with-jsdoc.problem.ts diff --git a/src/095-migrating-from-javascript/241-dependencies-first.solution.ts b/src/095-migrating-from-javascript/242-experiments-with-jsdoc.solution.ts similarity index 100% rename from src/095-migrating-from-javascript/241-dependencies-first.solution.ts rename to src/095-migrating-from-javascript/242-experiments-with-jsdoc.solution.ts diff --git a/src/095-migrating-from-javascript/242-typing-third-party-modules.problem.ts b/src/095-migrating-from-javascript/243-jsdoc-cannot-pass-types-to-functions.problem.ts similarity index 100% rename from src/095-migrating-from-javascript/242-typing-third-party-modules.problem.ts rename to src/095-migrating-from-javascript/243-jsdoc-cannot-pass-types-to-functions.problem.ts diff --git a/src/095-migrating-from-javascript/242-typing-third-party-modules.solution.ts b/src/095-migrating-from-javascript/243-jsdoc-cannot-pass-types-to-functions.solution.ts similarity index 100% rename from src/095-migrating-from-javascript/242-typing-third-party-modules.solution.ts rename to src/095-migrating-from-javascript/243-jsdoc-cannot-pass-types-to-functions.solution.ts diff --git a/src/095-migrating-from-javascript/243-madge.problem.ts b/src/095-migrating-from-javascript/243-madge.problem.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/095-migrating-from-javascript/243-madge.solution.ts b/src/095-migrating-from-javascript/243-madge.solution.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/095-migrating-from-javascript/244-understanding-the-structure-of-ts-errors.problem.ts b/src/095-migrating-from-javascript/244-understanding-the-structure-of-ts-errors.problem.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/095-migrating-from-javascript/244-understanding-the-structure-of-ts-errors.solution.ts b/src/095-migrating-from-javascript/244-understanding-the-structure-of-ts-errors.solution.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/095-migrating-from-javascript/245-experiments-with-jsdoc.problem.ts b/src/095-migrating-from-javascript/245-experiments-with-jsdoc.problem.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/095-migrating-from-javascript/245-experiments-with-jsdoc.solution.ts b/src/095-migrating-from-javascript/245-experiments-with-jsdoc.solution.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/095-migrating-from-javascript/246-jsdoc-cannot-pass-types-to-functions.problem.ts b/src/095-migrating-from-javascript/246-jsdoc-cannot-pass-types-to-functions.problem.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/095-migrating-from-javascript/246-jsdoc-cannot-pass-types-to-functions.solution.ts b/src/095-migrating-from-javascript/246-jsdoc-cannot-pass-types-to-functions.solution.ts deleted file mode 100644 index e69de29..0000000