diff --git a/base-exercise/package.json b/base-exercise/package.json index e11b297..e93efae 100644 --- a/base-exercise/package.json +++ b/base-exercise/package.json @@ -2,6 +2,7 @@ "name": "exercise", "version": "1.0.0", "main": "index.js", + "type": "module", "scripts": { "dev": "tsc --watch" } diff --git a/base-exercise/tsconfig.json b/base-exercise/tsconfig.json index 912bd10..6670f99 100644 --- a/base-exercise/tsconfig.json +++ b/base-exercise/tsconfig.json @@ -1,12 +1,15 @@ { "compilerOptions": { "target": "ES2022", - "module": "ESNext", - "moduleResolution": "Bundler", + "module": "NodeNext", + "moduleResolution": "NodeNext", "esModuleInterop": true, - "noEmit": true, + "outDir": "dist", + "rootDir": "src", "strict": true, "skipLibCheck": true, - "isolatedModules": true + "isolatedModules": true, + "moduleDetection": "force", + "verbatimModuleSyntax": true }, } \ No newline at end of file diff --git a/src/080-configuring-typescript/202-setting-up-types-for-node.explainer/package.json b/src/080-configuring-typescript/201-creating-declaration-files.problem/package.json similarity index 85% rename from src/080-configuring-typescript/202-setting-up-types-for-node.explainer/package.json rename to src/080-configuring-typescript/201-creating-declaration-files.problem/package.json index e11b297..e93efae 100644 --- a/src/080-configuring-typescript/202-setting-up-types-for-node.explainer/package.json +++ b/src/080-configuring-typescript/201-creating-declaration-files.problem/package.json @@ -2,6 +2,7 @@ "name": "exercise", "version": "1.0.0", "main": "index.js", + "type": "module", "scripts": { "dev": "tsc --watch" } diff --git a/src/082-cjs-vs-esm/206-cant-import-esm-into-cjs.problem/pnpm-lock.yaml b/src/080-configuring-typescript/201-creating-declaration-files.problem/pnpm-lock.yaml similarity index 100% rename from src/082-cjs-vs-esm/206-cant-import-esm-into-cjs.problem/pnpm-lock.yaml rename to src/080-configuring-typescript/201-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/201-creating-declaration-files.problem/src-2/otherFile.ts new file mode 100644 index 0000000..ff4a00f --- /dev/null +++ b/src/080-configuring-typescript/201-creating-declaration-files.problem/src-2/otherFile.ts @@ -0,0 +1,8 @@ +import { myFunc } from "../dist/index.js"; + +myFunc("Hello world"); + +myFunc( + // @ts-expect-error + 123, +); diff --git a/src/080-configuring-typescript/201-creating-declaration-files.problem/src/index.ts b/src/080-configuring-typescript/201-creating-declaration-files.problem/src/index.ts new file mode 100644 index 0000000..a8f1910 --- /dev/null +++ b/src/080-configuring-typescript/201-creating-declaration-files.problem/src/index.ts @@ -0,0 +1 @@ +export const myFunc = (input: string) => {}; diff --git a/src/080-configuring-typescript/201-creating-declaration-files.problem/tsconfig.json b/src/080-configuring-typescript/201-creating-declaration-files.problem/tsconfig.json new file mode 100644 index 0000000..9cc101e --- /dev/null +++ b/src/080-configuring-typescript/201-creating-declaration-files.problem/tsconfig.json @@ -0,0 +1,18 @@ +{ + "compilerOptions": { + "target": "ES2022", + "module": "NodeNext", + "moduleResolution": "NodeNext", + "esModuleInterop": true, + "outDir": "dist", + "rootDir": "src", + "strict": true, + "skipLibCheck": true, + "isolatedModules": true, + "moduleDetection": "force", + "verbatimModuleSyntax": true, + }, + "include": [ + "src" + ] +} \ No newline at end of file diff --git a/src/080-configuring-typescript/201-creating-declaration-files.solution/package.json b/src/080-configuring-typescript/201-creating-declaration-files.solution/package.json new file mode 100644 index 0000000..e93efae --- /dev/null +++ b/src/080-configuring-typescript/201-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/082-cjs-vs-esm/206-cant-import-esm-into-cjs.solution/pnpm-lock.yaml b/src/080-configuring-typescript/201-creating-declaration-files.solution/pnpm-lock.yaml similarity index 100% rename from src/082-cjs-vs-esm/206-cant-import-esm-into-cjs.solution/pnpm-lock.yaml rename to src/080-configuring-typescript/201-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/201-creating-declaration-files.solution/src-2/otherFile.ts new file mode 100644 index 0000000..ff4a00f --- /dev/null +++ b/src/080-configuring-typescript/201-creating-declaration-files.solution/src-2/otherFile.ts @@ -0,0 +1,8 @@ +import { myFunc } from "../dist/index.js"; + +myFunc("Hello world"); + +myFunc( + // @ts-expect-error + 123, +); diff --git a/src/080-configuring-typescript/201-creating-declaration-files.solution/src/index.ts b/src/080-configuring-typescript/201-creating-declaration-files.solution/src/index.ts new file mode 100644 index 0000000..a8f1910 --- /dev/null +++ b/src/080-configuring-typescript/201-creating-declaration-files.solution/src/index.ts @@ -0,0 +1 @@ +export const myFunc = (input: string) => {}; diff --git a/src/080-configuring-typescript/201-creating-declaration-files.solution/tsconfig.json b/src/080-configuring-typescript/201-creating-declaration-files.solution/tsconfig.json new file mode 100644 index 0000000..a6757eb --- /dev/null +++ b/src/080-configuring-typescript/201-creating-declaration-files.solution/tsconfig.json @@ -0,0 +1,19 @@ +{ + "compilerOptions": { + "target": "ES2022", + "module": "NodeNext", + "moduleResolution": "NodeNext", + "esModuleInterop": true, + "outDir": "dist", + "rootDir": "src", + "strict": true, + "skipLibCheck": true, + "isolatedModules": true, + "moduleDetection": "force", + "verbatimModuleSyntax": true, + "declaration": true + }, + "include": [ + "src" + ] +} \ No newline at end of file diff --git a/src/080-configuring-typescript/202-declaration-maps.problem/package.json b/src/080-configuring-typescript/202-declaration-maps.problem/package.json new file mode 100644 index 0000000..e93efae --- /dev/null +++ b/src/080-configuring-typescript/202-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/082-cjs-vs-esm/207-can-import-cjs-into-esm.explainer/pnpm-lock.yaml b/src/080-configuring-typescript/202-declaration-maps.problem/pnpm-lock.yaml similarity index 100% rename from src/082-cjs-vs-esm/207-can-import-cjs-into-esm.explainer/pnpm-lock.yaml rename to src/080-configuring-typescript/202-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/202-declaration-maps.problem/src-2/otherFile.ts new file mode 100644 index 0000000..ff4a00f --- /dev/null +++ b/src/080-configuring-typescript/202-declaration-maps.problem/src-2/otherFile.ts @@ -0,0 +1,8 @@ +import { myFunc } from "../dist/index.js"; + +myFunc("Hello world"); + +myFunc( + // @ts-expect-error + 123, +); diff --git a/src/080-configuring-typescript/202-declaration-maps.problem/src/index.ts b/src/080-configuring-typescript/202-declaration-maps.problem/src/index.ts new file mode 100644 index 0000000..a8f1910 --- /dev/null +++ b/src/080-configuring-typescript/202-declaration-maps.problem/src/index.ts @@ -0,0 +1 @@ +export const myFunc = (input: string) => {}; diff --git a/src/080-configuring-typescript/202-declaration-maps.problem/tsconfig.json b/src/080-configuring-typescript/202-declaration-maps.problem/tsconfig.json new file mode 100644 index 0000000..a6757eb --- /dev/null +++ b/src/080-configuring-typescript/202-declaration-maps.problem/tsconfig.json @@ -0,0 +1,19 @@ +{ + "compilerOptions": { + "target": "ES2022", + "module": "NodeNext", + "moduleResolution": "NodeNext", + "esModuleInterop": true, + "outDir": "dist", + "rootDir": "src", + "strict": true, + "skipLibCheck": true, + "isolatedModules": true, + "moduleDetection": "force", + "verbatimModuleSyntax": true, + "declaration": true + }, + "include": [ + "src" + ] +} \ No newline at end of file diff --git a/src/080-configuring-typescript/202-declaration-maps.solution/package.json b/src/080-configuring-typescript/202-declaration-maps.solution/package.json new file mode 100644 index 0000000..e93efae --- /dev/null +++ b/src/080-configuring-typescript/202-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/082-cjs-vs-esm/213-why-module-nodenext.explainer/pnpm-lock.yaml b/src/080-configuring-typescript/202-declaration-maps.solution/pnpm-lock.yaml similarity index 100% rename from src/082-cjs-vs-esm/213-why-module-nodenext.explainer/pnpm-lock.yaml rename to src/080-configuring-typescript/202-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/202-declaration-maps.solution/src-2/otherFile.ts new file mode 100644 index 0000000..ff4a00f --- /dev/null +++ b/src/080-configuring-typescript/202-declaration-maps.solution/src-2/otherFile.ts @@ -0,0 +1,8 @@ +import { myFunc } from "../dist/index.js"; + +myFunc("Hello world"); + +myFunc( + // @ts-expect-error + 123, +); diff --git a/src/080-configuring-typescript/202-declaration-maps.solution/src/index.ts b/src/080-configuring-typescript/202-declaration-maps.solution/src/index.ts new file mode 100644 index 0000000..a8f1910 --- /dev/null +++ b/src/080-configuring-typescript/202-declaration-maps.solution/src/index.ts @@ -0,0 +1 @@ +export const myFunc = (input: string) => {}; diff --git a/src/080-configuring-typescript/202-declaration-maps.solution/tsconfig.json b/src/080-configuring-typescript/202-declaration-maps.solution/tsconfig.json new file mode 100644 index 0000000..e57bc70 --- /dev/null +++ b/src/080-configuring-typescript/202-declaration-maps.solution/tsconfig.json @@ -0,0 +1,20 @@ +{ + "compilerOptions": { + "target": "ES2022", + "module": "NodeNext", + "moduleResolution": "NodeNext", + "esModuleInterop": true, + "outDir": "dist", + "rootDir": "src", + "strict": true, + "skipLibCheck": true, + "isolatedModules": true, + "moduleDetection": "force", + "verbatimModuleSyntax": true, + "declaration": true, + "declarationMap": true + }, + "include": [ + "src" + ] +} \ No newline at end of file diff --git a/src/080-configuring-typescript/202-setting-up-types-for-node.explainer/tsconfig.json b/src/080-configuring-typescript/202-setting-up-types-for-node.explainer/tsconfig.json deleted file mode 100644 index 912bd10..0000000 --- a/src/080-configuring-typescript/202-setting-up-types-for-node.explainer/tsconfig.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "compilerOptions": { - "target": "ES2022", - "module": "ESNext", - "moduleResolution": "Bundler", - "esModuleInterop": true, - "noEmit": true, - "strict": true, - "skipLibCheck": true, - "isolatedModules": true - }, -} \ No newline at end of file diff --git a/src/080-configuring-typescript/203-setting-up-types-for-node.explainer/package.json b/src/080-configuring-typescript/203-setting-up-types-for-node.explainer/package.json new file mode 100644 index 0000000..96801ab --- /dev/null +++ b/src/080-configuring-typescript/203-setting-up-types-for-node.explainer/package.json @@ -0,0 +1,11 @@ +{ + "name": "exercise", + "version": "1.0.0", + "main": "index.js", + "scripts": { + "dev": "nodemon --exec \"tsc && node dist/index.js || exit 1\" -e ts,tsx,json --watch src" + }, + "devDependencies": { + "@types/node": "^20.6.2" + } +} diff --git a/src/080-configuring-typescript/203-setting-up-types-for-node.explainer/pnpm-lock.yaml b/src/080-configuring-typescript/203-setting-up-types-for-node.explainer/pnpm-lock.yaml new file mode 100644 index 0000000..2b9f188 --- /dev/null +++ b/src/080-configuring-typescript/203-setting-up-types-for-node.explainer/pnpm-lock.yaml @@ -0,0 +1,5 @@ +lockfileVersion: '6.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false diff --git a/src/080-configuring-typescript/203-setting-up-types-for-node.explainer/src/index.ts b/src/080-configuring-typescript/203-setting-up-types-for-node.explainer/src/index.ts new file mode 100644 index 0000000..b6211f2 --- /dev/null +++ b/src/080-configuring-typescript/203-setting-up-types-for-node.explainer/src/index.ts @@ -0,0 +1 @@ +console.log("Hello!"); diff --git a/src/080-configuring-typescript/203-setting-up-types-for-node.explainer/tsconfig.json b/src/080-configuring-typescript/203-setting-up-types-for-node.explainer/tsconfig.json new file mode 100644 index 0000000..f1a85a3 --- /dev/null +++ b/src/080-configuring-typescript/203-setting-up-types-for-node.explainer/tsconfig.json @@ -0,0 +1,21 @@ +{ + "compilerOptions": { + "esModuleInterop": true, + "skipLibCheck": true, + "target": "es2022", + "verbatimModuleSyntax": true, + "allowJs": true, + "resolveJsonModule": true, + "moduleDetection": "force", + "strict": true, + "noUncheckedIndexedAccess": true, + "moduleResolution": "NodeNext", + "module": "NodeNext", + "outDir": "dist", + "rootDir": "src", + "sourceMap": true, + "lib": [ + "es2022" + ], + } +} \ No newline at end of file diff --git a/src/080-configuring-typescript/201-creating-declaration-files-and-declaration-maps.problem.ts b/src/080-configuring-typescript/204-set-up-types-for-simple-scripts.problem.ts similarity index 100% rename from src/080-configuring-typescript/201-creating-declaration-files-and-declaration-maps.problem.ts rename to src/080-configuring-typescript/204-set-up-types-for-simple-scripts.problem.ts diff --git a/src/080-configuring-typescript/201-creating-declaration-files-and-declaration-maps.solution.ts b/src/080-configuring-typescript/204-set-up-types-for-simple-scripts.solution.ts similarity index 100% rename from src/080-configuring-typescript/201-creating-declaration-files-and-declaration-maps.solution.ts rename to src/080-configuring-typescript/204-set-up-types-for-simple-scripts.solution.ts diff --git a/src/080-configuring-typescript/202-setting-up-types-for-node.explainer/src/index.ts b/src/080-configuring-typescript/205-set-up-types-for-test-files.problem.ts similarity index 100% rename from src/080-configuring-typescript/202-setting-up-types-for-node.explainer/src/index.ts rename to src/080-configuring-typescript/205-set-up-types-for-test-files.problem.ts diff --git a/src/080-configuring-typescript/202-setting-up-types-for-node.problem.ts b/src/080-configuring-typescript/205-set-up-types-for-test-files.solution.ts similarity index 100% rename from src/080-configuring-typescript/202-setting-up-types-for-node.problem.ts rename to src/080-configuring-typescript/205-set-up-types-for-test-files.solution.ts diff --git a/src/080-configuring-typescript/202-setting-up-types-for-node.solution.ts b/src/080-configuring-typescript/206-set-up-types-for-bundled-web-app.problem.ts similarity index 100% rename from src/080-configuring-typescript/202-setting-up-types-for-node.solution.ts rename to src/080-configuring-typescript/206-set-up-types-for-bundled-web-app.problem.ts diff --git a/src/080-configuring-typescript/203-set-up-types-for-simple-scripts.problem.ts b/src/080-configuring-typescript/206-set-up-types-for-bundled-web-app.solution.ts similarity index 100% rename from src/080-configuring-typescript/203-set-up-types-for-simple-scripts.problem.ts rename to src/080-configuring-typescript/206-set-up-types-for-bundled-web-app.solution.ts diff --git a/src/082-cjs-vs-esm/206-cant-import-esm-into-cjs.problem/package.json b/src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.problem/package.json similarity index 100% rename from src/082-cjs-vs-esm/206-cant-import-esm-into-cjs.problem/package.json rename to src/082-cjs-vs-esm/207-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/207-cant-import-esm-into-cjs.problem/pnpm-lock.yaml new file mode 100644 index 0000000..2b9f188 --- /dev/null +++ b/src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.problem/pnpm-lock.yaml @@ -0,0 +1,5 @@ +lockfileVersion: '6.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false diff --git a/src/082-cjs-vs-esm/206-cant-import-esm-into-cjs.problem/src/esm-module.js b/src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.problem/src/esm-module.js similarity index 100% rename from src/082-cjs-vs-esm/206-cant-import-esm-into-cjs.problem/src/esm-module.js rename to src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.problem/src/esm-module.js diff --git a/src/082-cjs-vs-esm/206-cant-import-esm-into-cjs.problem/src/index.js b/src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.problem/src/index.js similarity index 100% rename from src/082-cjs-vs-esm/206-cant-import-esm-into-cjs.problem/src/index.js rename to src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.problem/src/index.js diff --git a/src/082-cjs-vs-esm/206-cant-import-esm-into-cjs.solution/package.json b/src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.solution/package.json similarity index 100% rename from src/082-cjs-vs-esm/206-cant-import-esm-into-cjs.solution/package.json rename to src/082-cjs-vs-esm/207-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/207-cant-import-esm-into-cjs.solution/pnpm-lock.yaml new file mode 100644 index 0000000..2b9f188 --- /dev/null +++ b/src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.solution/pnpm-lock.yaml @@ -0,0 +1,5 @@ +lockfileVersion: '6.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false diff --git a/src/082-cjs-vs-esm/206-cant-import-esm-into-cjs.solution/src/esm-module.mjs b/src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.solution/src/esm-module.mjs similarity index 100% rename from src/082-cjs-vs-esm/206-cant-import-esm-into-cjs.solution/src/esm-module.mjs rename to src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.solution/src/esm-module.mjs diff --git a/src/082-cjs-vs-esm/206-cant-import-esm-into-cjs.solution/src/index.js b/src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.solution/src/index.js similarity index 100% rename from src/082-cjs-vs-esm/206-cant-import-esm-into-cjs.solution/src/index.js rename to src/082-cjs-vs-esm/207-cant-import-esm-into-cjs.solution/src/index.js diff --git a/src/082-cjs-vs-esm/207-can-import-cjs-into-esm.explainer/package.json b/src/082-cjs-vs-esm/208-can-import-cjs-into-esm.explainer/package.json similarity index 100% rename from src/082-cjs-vs-esm/207-can-import-cjs-into-esm.explainer/package.json rename to src/082-cjs-vs-esm/208-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/208-can-import-cjs-into-esm.explainer/pnpm-lock.yaml new file mode 100644 index 0000000..2b9f188 --- /dev/null +++ b/src/082-cjs-vs-esm/208-can-import-cjs-into-esm.explainer/pnpm-lock.yaml @@ -0,0 +1,5 @@ +lockfileVersion: '6.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false diff --git a/src/082-cjs-vs-esm/207-can-import-cjs-into-esm.explainer/src/cjs-module.cjs b/src/082-cjs-vs-esm/208-can-import-cjs-into-esm.explainer/src/cjs-module.cjs similarity index 100% rename from src/082-cjs-vs-esm/207-can-import-cjs-into-esm.explainer/src/cjs-module.cjs rename to src/082-cjs-vs-esm/208-can-import-cjs-into-esm.explainer/src/cjs-module.cjs diff --git a/src/082-cjs-vs-esm/207-can-import-cjs-into-esm.explainer/src/index.mjs b/src/082-cjs-vs-esm/208-can-import-cjs-into-esm.explainer/src/index.mjs similarity index 100% rename from src/082-cjs-vs-esm/207-can-import-cjs-into-esm.explainer/src/index.mjs rename to src/082-cjs-vs-esm/208-can-import-cjs-into-esm.explainer/src/index.mjs diff --git a/src/082-cjs-vs-esm/208-mts-files.problem/package.json b/src/082-cjs-vs-esm/209-mts-files.problem/package.json similarity index 100% rename from src/082-cjs-vs-esm/208-mts-files.problem/package.json rename to src/082-cjs-vs-esm/209-mts-files.problem/package.json diff --git a/src/082-cjs-vs-esm/208-mts-files.problem/src/esm-module.ts b/src/082-cjs-vs-esm/209-mts-files.problem/src/esm-module.ts similarity index 100% rename from src/082-cjs-vs-esm/208-mts-files.problem/src/esm-module.ts rename to src/082-cjs-vs-esm/209-mts-files.problem/src/esm-module.ts diff --git a/src/082-cjs-vs-esm/208-mts-files.problem/src/index.ts b/src/082-cjs-vs-esm/209-mts-files.problem/src/index.ts similarity index 100% rename from src/082-cjs-vs-esm/208-mts-files.problem/src/index.ts rename to src/082-cjs-vs-esm/209-mts-files.problem/src/index.ts diff --git a/src/082-cjs-vs-esm/208-mts-files.problem/tsconfig.json b/src/082-cjs-vs-esm/209-mts-files.problem/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/208-mts-files.problem/tsconfig.json rename to src/082-cjs-vs-esm/209-mts-files.problem/tsconfig.json diff --git a/src/082-cjs-vs-esm/208-mts-files.solution/package.json b/src/082-cjs-vs-esm/209-mts-files.solution/package.json similarity index 100% rename from src/082-cjs-vs-esm/208-mts-files.solution/package.json rename to src/082-cjs-vs-esm/209-mts-files.solution/package.json diff --git a/src/082-cjs-vs-esm/208-mts-files.solution/src/esm-module.mts b/src/082-cjs-vs-esm/209-mts-files.solution/src/esm-module.mts similarity index 100% rename from src/082-cjs-vs-esm/208-mts-files.solution/src/esm-module.mts rename to src/082-cjs-vs-esm/209-mts-files.solution/src/esm-module.mts diff --git a/src/082-cjs-vs-esm/208-mts-files.solution/src/index.ts b/src/082-cjs-vs-esm/209-mts-files.solution/src/index.ts similarity index 100% rename from src/082-cjs-vs-esm/208-mts-files.solution/src/index.ts rename to src/082-cjs-vs-esm/209-mts-files.solution/src/index.ts diff --git a/src/082-cjs-vs-esm/208-mts-files.solution/tsconfig.json b/src/082-cjs-vs-esm/209-mts-files.solution/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/208-mts-files.solution/tsconfig.json rename to src/082-cjs-vs-esm/209-mts-files.solution/tsconfig.json diff --git a/src/082-cjs-vs-esm/209-verbatim-module-syntax.problem/package.json b/src/082-cjs-vs-esm/210-verbatim-module-syntax.problem/package.json similarity index 100% rename from src/082-cjs-vs-esm/209-verbatim-module-syntax.problem/package.json rename to src/082-cjs-vs-esm/210-verbatim-module-syntax.problem/package.json diff --git a/src/082-cjs-vs-esm/209-verbatim-module-syntax.problem/src/esm-module.ts b/src/082-cjs-vs-esm/210-verbatim-module-syntax.problem/src/esm-module.ts similarity index 100% rename from src/082-cjs-vs-esm/209-verbatim-module-syntax.problem/src/esm-module.ts rename to src/082-cjs-vs-esm/210-verbatim-module-syntax.problem/src/esm-module.ts diff --git a/src/082-cjs-vs-esm/209-verbatim-module-syntax.problem/tsconfig.json b/src/082-cjs-vs-esm/210-verbatim-module-syntax.problem/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/209-verbatim-module-syntax.problem/tsconfig.json rename to src/082-cjs-vs-esm/210-verbatim-module-syntax.problem/tsconfig.json diff --git a/src/082-cjs-vs-esm/209-verbatim-module-syntax.solution/package.json b/src/082-cjs-vs-esm/210-verbatim-module-syntax.solution/package.json similarity index 100% rename from src/082-cjs-vs-esm/209-verbatim-module-syntax.solution/package.json rename to src/082-cjs-vs-esm/210-verbatim-module-syntax.solution/package.json diff --git a/src/082-cjs-vs-esm/209-verbatim-module-syntax.solution/src/esm-module.ts b/src/082-cjs-vs-esm/210-verbatim-module-syntax.solution/src/esm-module.ts similarity index 100% rename from src/082-cjs-vs-esm/209-verbatim-module-syntax.solution/src/esm-module.ts rename to src/082-cjs-vs-esm/210-verbatim-module-syntax.solution/src/esm-module.ts diff --git a/src/082-cjs-vs-esm/209-verbatim-module-syntax.solution/tsconfig.json b/src/082-cjs-vs-esm/210-verbatim-module-syntax.solution/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/209-verbatim-module-syntax.solution/tsconfig.json rename to src/082-cjs-vs-esm/210-verbatim-module-syntax.solution/tsconfig.json diff --git a/src/082-cjs-vs-esm/210-treat-ts-files-as-esm.problem/package.json b/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.problem/package.json similarity index 100% rename from src/082-cjs-vs-esm/210-treat-ts-files-as-esm.problem/package.json rename to src/082-cjs-vs-esm/211-treat-ts-files-as-esm.problem/package.json diff --git a/src/082-cjs-vs-esm/210-treat-ts-files-as-esm.problem/src/esm-module.ts b/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.problem/src/esm-module.ts similarity index 100% rename from src/082-cjs-vs-esm/210-treat-ts-files-as-esm.problem/src/esm-module.ts rename to src/082-cjs-vs-esm/211-treat-ts-files-as-esm.problem/src/esm-module.ts diff --git a/src/082-cjs-vs-esm/210-treat-ts-files-as-esm.problem/src/index.ts b/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.problem/src/index.ts similarity index 100% rename from src/082-cjs-vs-esm/210-treat-ts-files-as-esm.problem/src/index.ts rename to src/082-cjs-vs-esm/211-treat-ts-files-as-esm.problem/src/index.ts diff --git a/src/082-cjs-vs-esm/210-treat-ts-files-as-esm.problem/tsconfig.json b/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.problem/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/210-treat-ts-files-as-esm.problem/tsconfig.json rename to src/082-cjs-vs-esm/211-treat-ts-files-as-esm.problem/tsconfig.json diff --git a/src/082-cjs-vs-esm/210-treat-ts-files-as-esm.solution.1/package.json b/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.1/package.json similarity index 100% rename from src/082-cjs-vs-esm/210-treat-ts-files-as-esm.solution.1/package.json rename to src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.1/package.json diff --git a/src/082-cjs-vs-esm/210-treat-ts-files-as-esm.solution.1/src/esm-module.ts b/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.1/src/esm-module.ts similarity index 100% rename from src/082-cjs-vs-esm/210-treat-ts-files-as-esm.solution.1/src/esm-module.ts rename to src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.1/src/esm-module.ts diff --git a/src/082-cjs-vs-esm/210-treat-ts-files-as-esm.solution.1/src/index.ts b/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.1/src/index.ts similarity index 100% rename from src/082-cjs-vs-esm/210-treat-ts-files-as-esm.solution.1/src/index.ts rename to src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.1/src/index.ts diff --git a/src/082-cjs-vs-esm/210-treat-ts-files-as-esm.solution.1/tsconfig.json b/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.1/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/210-treat-ts-files-as-esm.solution.1/tsconfig.json rename to src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.1/tsconfig.json diff --git a/src/082-cjs-vs-esm/210-treat-ts-files-as-esm.solution.2/package.json b/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.2/package.json similarity index 100% rename from src/082-cjs-vs-esm/210-treat-ts-files-as-esm.solution.2/package.json rename to src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.2/package.json diff --git a/src/082-cjs-vs-esm/210-treat-ts-files-as-esm.solution.2/src/esm-module.mts b/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.2/src/esm-module.mts similarity index 100% rename from src/082-cjs-vs-esm/210-treat-ts-files-as-esm.solution.2/src/esm-module.mts rename to src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.2/src/esm-module.mts diff --git a/src/082-cjs-vs-esm/210-treat-ts-files-as-esm.solution.2/src/index.mts b/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.2/src/index.mts similarity index 100% rename from src/082-cjs-vs-esm/210-treat-ts-files-as-esm.solution.2/src/index.mts rename to src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.2/src/index.mts diff --git a/src/082-cjs-vs-esm/210-treat-ts-files-as-esm.solution.2/tsconfig.json b/src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.2/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/210-treat-ts-files-as-esm.solution.2/tsconfig.json rename to src/082-cjs-vs-esm/211-treat-ts-files-as-esm.solution.2/tsconfig.json diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.problem/package.json b/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.problem/package.json similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.problem/package.json rename to src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.problem/package.json diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.problem/src/index.ts b/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.problem/src/index.ts similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.problem/src/index.ts rename to src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.problem/src/index.ts diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.problem/src/other-module.ts b/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.problem/src/other-module.ts similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.problem/src/other-module.ts rename to src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.problem/src/other-module.ts diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.problem/tsconfig.json b/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.problem/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.problem/tsconfig.json rename to src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.problem/tsconfig.json diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.solution.1/package.json b/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.1/package.json similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.solution.1/package.json rename to src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.1/package.json diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.solution.1/src/index.ts b/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.1/src/index.ts similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.solution.1/src/index.ts rename to src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.1/src/index.ts diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.solution.1/src/other-module.ts b/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.1/src/other-module.ts similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.solution.1/src/other-module.ts rename to src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.1/src/other-module.ts diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.solution.1/tsconfig.json b/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.1/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.solution.1/tsconfig.json rename to src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.1/tsconfig.json diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.solution.2/package.json b/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.2/package.json similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.solution.2/package.json rename to src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.2/package.json diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.solution.2/src/index.cts b/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.2/src/index.cts similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.solution.2/src/index.cts rename to src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.2/src/index.cts diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.solution.2/src/other-module.cts b/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.2/src/other-module.cts similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.solution.2/src/other-module.cts rename to src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.2/src/other-module.cts diff --git a/src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.solution.2/tsconfig.json b/src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.2/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/211-treat-ts-files-as-cjs.solution.2/tsconfig.json rename to src/082-cjs-vs-esm/212-treat-ts-files-as-cjs.solution.2/tsconfig.json diff --git a/src/082-cjs-vs-esm/212-import-syntax-for-cts.problem/package.json b/src/082-cjs-vs-esm/213-import-syntax-for-cts.problem/package.json similarity index 100% rename from src/082-cjs-vs-esm/212-import-syntax-for-cts.problem/package.json rename to src/082-cjs-vs-esm/213-import-syntax-for-cts.problem/package.json diff --git a/src/082-cjs-vs-esm/212-import-syntax-for-cts.problem/src/index.cts b/src/082-cjs-vs-esm/213-import-syntax-for-cts.problem/src/index.cts similarity index 100% rename from src/082-cjs-vs-esm/212-import-syntax-for-cts.problem/src/index.cts rename to src/082-cjs-vs-esm/213-import-syntax-for-cts.problem/src/index.cts diff --git a/src/082-cjs-vs-esm/212-import-syntax-for-cts.problem/src/other-module.cts b/src/082-cjs-vs-esm/213-import-syntax-for-cts.problem/src/other-module.cts similarity index 100% rename from src/082-cjs-vs-esm/212-import-syntax-for-cts.problem/src/other-module.cts rename to src/082-cjs-vs-esm/213-import-syntax-for-cts.problem/src/other-module.cts diff --git a/src/082-cjs-vs-esm/212-import-syntax-for-cts.problem/tsconfig.json b/src/082-cjs-vs-esm/213-import-syntax-for-cts.problem/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/212-import-syntax-for-cts.problem/tsconfig.json rename to src/082-cjs-vs-esm/213-import-syntax-for-cts.problem/tsconfig.json diff --git a/src/082-cjs-vs-esm/212-import-syntax-for-cts.solution/package.json b/src/082-cjs-vs-esm/213-import-syntax-for-cts.solution/package.json similarity index 100% rename from src/082-cjs-vs-esm/212-import-syntax-for-cts.solution/package.json rename to src/082-cjs-vs-esm/213-import-syntax-for-cts.solution/package.json diff --git a/src/082-cjs-vs-esm/212-import-syntax-for-cts.solution/src/index.cts b/src/082-cjs-vs-esm/213-import-syntax-for-cts.solution/src/index.cts similarity index 100% rename from src/082-cjs-vs-esm/212-import-syntax-for-cts.solution/src/index.cts rename to src/082-cjs-vs-esm/213-import-syntax-for-cts.solution/src/index.cts diff --git a/src/082-cjs-vs-esm/212-import-syntax-for-cts.solution/src/other-module.cts b/src/082-cjs-vs-esm/213-import-syntax-for-cts.solution/src/other-module.cts similarity index 100% rename from src/082-cjs-vs-esm/212-import-syntax-for-cts.solution/src/other-module.cts rename to src/082-cjs-vs-esm/213-import-syntax-for-cts.solution/src/other-module.cts diff --git a/src/082-cjs-vs-esm/212-import-syntax-for-cts.solution/tsconfig.json b/src/082-cjs-vs-esm/213-import-syntax-for-cts.solution/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/212-import-syntax-for-cts.solution/tsconfig.json rename to src/082-cjs-vs-esm/213-import-syntax-for-cts.solution/tsconfig.json diff --git a/src/082-cjs-vs-esm/213-why-module-nodenext.explainer/package.json b/src/082-cjs-vs-esm/214-why-module-nodenext.explainer/package.json similarity index 100% rename from src/082-cjs-vs-esm/213-why-module-nodenext.explainer/package.json rename to src/082-cjs-vs-esm/214-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/214-why-module-nodenext.explainer/pnpm-lock.yaml new file mode 100644 index 0000000..2b9f188 --- /dev/null +++ b/src/082-cjs-vs-esm/214-why-module-nodenext.explainer/pnpm-lock.yaml @@ -0,0 +1,5 @@ +lockfileVersion: '6.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false diff --git a/src/082-cjs-vs-esm/213-why-module-nodenext.explainer/src/cjs-module.cts b/src/082-cjs-vs-esm/214-why-module-nodenext.explainer/src/cjs-module.cts similarity index 100% rename from src/082-cjs-vs-esm/213-why-module-nodenext.explainer/src/cjs-module.cts rename to src/082-cjs-vs-esm/214-why-module-nodenext.explainer/src/cjs-module.cts diff --git a/src/082-cjs-vs-esm/213-why-module-nodenext.explainer/src/esm-module.mts b/src/082-cjs-vs-esm/214-why-module-nodenext.explainer/src/esm-module.mts similarity index 100% rename from src/082-cjs-vs-esm/213-why-module-nodenext.explainer/src/esm-module.mts rename to src/082-cjs-vs-esm/214-why-module-nodenext.explainer/src/esm-module.mts diff --git a/src/082-cjs-vs-esm/213-why-module-nodenext.explainer/src/index.ts b/src/082-cjs-vs-esm/214-why-module-nodenext.explainer/src/index.ts similarity index 100% rename from src/082-cjs-vs-esm/213-why-module-nodenext.explainer/src/index.ts rename to src/082-cjs-vs-esm/214-why-module-nodenext.explainer/src/index.ts diff --git a/src/082-cjs-vs-esm/213-why-module-nodenext.explainer/tsconfig.json b/src/082-cjs-vs-esm/214-why-module-nodenext.explainer/tsconfig.json similarity index 100% rename from src/082-cjs-vs-esm/213-why-module-nodenext.explainer/tsconfig.json rename to src/082-cjs-vs-esm/214-why-module-nodenext.explainer/tsconfig.json diff --git a/src/082-cjs-vs-esm/214-should-i-use-cjs-or-esm.explainer.ts b/src/082-cjs-vs-esm/215-should-i-use-cjs-or-esm.explainer.ts similarity index 100% rename from src/082-cjs-vs-esm/214-should-i-use-cjs-or-esm.explainer.ts rename to src/082-cjs-vs-esm/215-should-i-use-cjs-or-esm.explainer.ts diff --git a/src/080-configuring-typescript/203-set-up-types-for-simple-scripts.solution.ts b/src/085-the-utils-folder/216-intro-to-the-utils-folder.problem.ts similarity index 100% rename from src/080-configuring-typescript/203-set-up-types-for-simple-scripts.solution.ts rename to src/085-the-utils-folder/216-intro-to-the-utils-folder.problem.ts diff --git a/src/080-configuring-typescript/204-set-up-types-for-test-files.problem.ts b/src/085-the-utils-folder/216-intro-to-the-utils-folder.solution.ts similarity index 100% rename from src/080-configuring-typescript/204-set-up-types-for-test-files.problem.ts rename to src/085-the-utils-folder/216-intro-to-the-utils-folder.solution.ts diff --git a/src/080-configuring-typescript/204-set-up-types-for-test-files.solution.ts b/src/085-the-utils-folder/217-generic-functions-without-inference.problem.ts similarity index 100% rename from src/080-configuring-typescript/204-set-up-types-for-test-files.solution.ts rename to src/085-the-utils-folder/217-generic-functions-without-inference.problem.ts diff --git a/src/080-configuring-typescript/205-set-up-types-for-bundled-web-app.problem.ts b/src/085-the-utils-folder/217-generic-functions-without-inference.solution.ts similarity index 100% rename from src/080-configuring-typescript/205-set-up-types-for-bundled-web-app.problem.ts rename to src/085-the-utils-folder/217-generic-functions-without-inference.solution.ts diff --git a/src/080-configuring-typescript/205-set-up-types-for-bundled-web-app.solution.ts b/src/085-the-utils-folder/218-type-parameter-defaults-in-generic-functions.problem.ts similarity index 100% rename from src/080-configuring-typescript/205-set-up-types-for-bundled-web-app.solution.ts rename to src/085-the-utils-folder/218-type-parameter-defaults-in-generic-functions.problem.ts diff --git a/src/085-the-utils-folder/215-intro-to-the-utils-folder.problem.ts b/src/085-the-utils-folder/218-type-parameter-defaults-in-generic-functions.solution.ts similarity index 100% rename from src/085-the-utils-folder/215-intro-to-the-utils-folder.problem.ts rename to src/085-the-utils-folder/218-type-parameter-defaults-in-generic-functions.solution.ts diff --git a/src/085-the-utils-folder/215-intro-to-the-utils-folder.solution.ts b/src/085-the-utils-folder/219-type-parameter-constraints-with-generic-functions.problem.ts similarity index 100% rename from src/085-the-utils-folder/215-intro-to-the-utils-folder.solution.ts rename to src/085-the-utils-folder/219-type-parameter-constraints-with-generic-functions.problem.ts diff --git a/src/085-the-utils-folder/216-generic-functions-without-inference.problem.ts b/src/085-the-utils-folder/219-type-parameter-constraints-with-generic-functions.solution.ts similarity index 100% rename from src/085-the-utils-folder/216-generic-functions-without-inference.problem.ts rename to src/085-the-utils-folder/219-type-parameter-constraints-with-generic-functions.solution.ts diff --git a/src/085-the-utils-folder/216-generic-functions-without-inference.solution.ts b/src/085-the-utils-folder/220-generic-functions-with-inference.problem.ts similarity index 100% rename from src/085-the-utils-folder/216-generic-functions-without-inference.solution.ts rename to src/085-the-utils-folder/220-generic-functions-with-inference.problem.ts diff --git a/src/085-the-utils-folder/217-type-parameter-defaults-in-generic-functions.problem.ts b/src/085-the-utils-folder/220-generic-functions-with-inference.solution.ts similarity index 100% rename from src/085-the-utils-folder/217-type-parameter-defaults-in-generic-functions.problem.ts rename to src/085-the-utils-folder/220-generic-functions-with-inference.solution.ts diff --git a/src/085-the-utils-folder/217-type-parameter-defaults-in-generic-functions.solution.ts b/src/085-the-utils-folder/221-as-any-inside-generic-functions.problem.ts similarity index 100% rename from src/085-the-utils-folder/217-type-parameter-defaults-in-generic-functions.solution.ts rename to src/085-the-utils-folder/221-as-any-inside-generic-functions.problem.ts diff --git a/src/085-the-utils-folder/218-type-parameter-constraints-with-generic-functions.problem.ts b/src/085-the-utils-folder/221-as-any-inside-generic-functions.solution.ts similarity index 100% rename from src/085-the-utils-folder/218-type-parameter-constraints-with-generic-functions.problem.ts rename to src/085-the-utils-folder/221-as-any-inside-generic-functions.solution.ts diff --git a/src/085-the-utils-folder/218-type-parameter-constraints-with-generic-functions.solution.ts b/src/085-the-utils-folder/222-multiple-type-arguments.problem.ts similarity index 100% rename from src/085-the-utils-folder/218-type-parameter-constraints-with-generic-functions.solution.ts rename to src/085-the-utils-folder/222-multiple-type-arguments.problem.ts diff --git a/src/085-the-utils-folder/219-generic-functions-with-inference.problem.ts b/src/085-the-utils-folder/222-multiple-type-arguments.solution.ts similarity index 100% rename from src/085-the-utils-folder/219-generic-functions-with-inference.problem.ts rename to src/085-the-utils-folder/222-multiple-type-arguments.solution.ts diff --git a/src/085-the-utils-folder/219-generic-functions-with-inference.solution.ts b/src/085-the-utils-folder/223-create-group-by-function.problem.ts similarity index 100% rename from src/085-the-utils-folder/219-generic-functions-with-inference.solution.ts rename to src/085-the-utils-folder/223-create-group-by-function.problem.ts diff --git a/src/085-the-utils-folder/220-as-any-inside-generic-functions.problem.ts b/src/085-the-utils-folder/223-create-group-by-function.solution.ts similarity index 100% rename from src/085-the-utils-folder/220-as-any-inside-generic-functions.problem.ts rename to src/085-the-utils-folder/223-create-group-by-function.solution.ts diff --git a/src/085-the-utils-folder/220-as-any-inside-generic-functions.solution.ts b/src/085-the-utils-folder/224-type-predicates.problem.ts similarity index 100% rename from src/085-the-utils-folder/220-as-any-inside-generic-functions.solution.ts rename to src/085-the-utils-folder/224-type-predicates.problem.ts diff --git a/src/085-the-utils-folder/221-multiple-type-arguments.problem.ts b/src/085-the-utils-folder/224-type-predicates.solution.ts similarity index 100% rename from src/085-the-utils-folder/221-multiple-type-arguments.problem.ts rename to src/085-the-utils-folder/224-type-predicates.solution.ts diff --git a/src/085-the-utils-folder/221-multiple-type-arguments.solution.ts b/src/085-the-utils-folder/225-assertion-functions.problem.ts similarity index 100% rename from src/085-the-utils-folder/221-multiple-type-arguments.solution.ts rename to src/085-the-utils-folder/225-assertion-functions.problem.ts diff --git a/src/085-the-utils-folder/222-create-group-by-function.problem.ts b/src/085-the-utils-folder/225-assertion-functions.solution.ts similarity index 100% rename from src/085-the-utils-folder/222-create-group-by-function.problem.ts rename to src/085-the-utils-folder/225-assertion-functions.solution.ts diff --git a/src/085-the-utils-folder/222-create-group-by-function.solution.ts b/src/085-the-utils-folder/226-function-overloads.problem.ts similarity index 100% rename from src/085-the-utils-folder/222-create-group-by-function.solution.ts rename to src/085-the-utils-folder/226-function-overloads.problem.ts diff --git a/src/085-the-utils-folder/223-type-predicates.problem.ts b/src/085-the-utils-folder/226-function-overloads.solution.ts similarity index 100% rename from src/085-the-utils-folder/223-type-predicates.problem.ts rename to src/085-the-utils-folder/226-function-overloads.solution.ts diff --git a/src/085-the-utils-folder/223-type-predicates.solution.ts b/src/090-the-style-guide/227-hungarian-notation.problem.ts similarity index 100% rename from src/085-the-utils-folder/223-type-predicates.solution.ts rename to src/090-the-style-guide/227-hungarian-notation.problem.ts diff --git a/src/085-the-utils-folder/224-assertion-functions.problem.ts b/src/090-the-style-guide/227-hungarian-notation.solution.ts similarity index 100% rename from src/085-the-utils-folder/224-assertion-functions.problem.ts rename to src/090-the-style-guide/227-hungarian-notation.solution.ts diff --git a/src/085-the-utils-folder/224-assertion-functions.solution.ts b/src/090-the-style-guide/228-where-to-put-your-types.problem.ts similarity index 100% rename from src/085-the-utils-folder/224-assertion-functions.solution.ts rename to src/090-the-style-guide/228-where-to-put-your-types.problem.ts diff --git a/src/085-the-utils-folder/225-function-overloads.problem.ts b/src/090-the-style-guide/228-where-to-put-your-types.solution.ts similarity index 100% rename from src/085-the-utils-folder/225-function-overloads.problem.ts rename to src/090-the-style-guide/228-where-to-put-your-types.solution.ts diff --git a/src/085-the-utils-folder/225-function-overloads.solution.ts b/src/090-the-style-guide/229-colocation-of-types.problem.ts similarity index 100% rename from src/085-the-utils-folder/225-function-overloads.solution.ts rename to src/090-the-style-guide/229-colocation-of-types.problem.ts diff --git a/src/090-the-style-guide/226-hungarian-notation.problem.ts b/src/090-the-style-guide/229-colocation-of-types.solution.ts similarity index 100% rename from src/090-the-style-guide/226-hungarian-notation.problem.ts rename to src/090-the-style-guide/229-colocation-of-types.solution.ts diff --git a/src/090-the-style-guide/226-hungarian-notation.solution.ts b/src/090-the-style-guide/230-setting-up-eslint.explainer.ts similarity index 100% rename from src/090-the-style-guide/226-hungarian-notation.solution.ts rename to src/090-the-style-guide/230-setting-up-eslint.explainer.ts diff --git a/src/090-the-style-guide/227-where-to-put-your-types.problem.ts b/src/090-the-style-guide/231-explicit-any-rule-or-not.problem.ts similarity index 100% rename from src/090-the-style-guide/227-where-to-put-your-types.problem.ts rename to src/090-the-style-guide/231-explicit-any-rule-or-not.problem.ts diff --git a/src/090-the-style-guide/227-where-to-put-your-types.solution.ts b/src/090-the-style-guide/231-explicit-any-rule-or-not.solution.ts similarity index 100% rename from src/090-the-style-guide/227-where-to-put-your-types.solution.ts rename to src/090-the-style-guide/231-explicit-any-rule-or-not.solution.ts diff --git a/src/090-the-style-guide/228-colocation-of-types.problem.ts b/src/090-the-style-guide/232-explicit-return-types-or-not.problem.ts similarity index 100% rename from src/090-the-style-guide/228-colocation-of-types.problem.ts rename to src/090-the-style-guide/232-explicit-return-types-or-not.problem.ts diff --git a/src/090-the-style-guide/228-colocation-of-types.solution.ts b/src/090-the-style-guide/232-explicit-return-types-or-not.solution.ts similarity index 100% rename from src/090-the-style-guide/228-colocation-of-types.solution.ts rename to src/090-the-style-guide/232-explicit-return-types-or-not.solution.ts diff --git a/src/090-the-style-guide/229-setting-up-eslint.explainer.ts b/src/090-the-style-guide/233-any-vs-ts-ignore-vs-ts-expect-error.problem.ts similarity index 100% rename from src/090-the-style-guide/229-setting-up-eslint.explainer.ts rename to src/090-the-style-guide/233-any-vs-ts-ignore-vs-ts-expect-error.problem.ts diff --git a/src/090-the-style-guide/230-explicit-any-rule-or-not.problem.ts b/src/090-the-style-guide/233-any-vs-ts-ignore-vs-ts-expect-error.solution.ts similarity index 100% rename from src/090-the-style-guide/230-explicit-any-rule-or-not.problem.ts rename to src/090-the-style-guide/233-any-vs-ts-ignore-vs-ts-expect-error.solution.ts diff --git a/src/090-the-style-guide/230-explicit-any-rule-or-not.solution.ts b/src/090-the-style-guide/234-dont-declare-type-and-value-with-the-same-name.problem.ts similarity index 100% rename from src/090-the-style-guide/230-explicit-any-rule-or-not.solution.ts rename to src/090-the-style-guide/234-dont-declare-type-and-value-with-the-same-name.problem.ts diff --git a/src/090-the-style-guide/231-explicit-return-types-or-not.problem.ts b/src/090-the-style-guide/234-dont-declare-type-and-value-with-the-same-name.solution.ts similarity index 100% rename from src/090-the-style-guide/231-explicit-return-types-or-not.problem.ts rename to src/090-the-style-guide/234-dont-declare-type-and-value-with-the-same-name.solution.ts diff --git a/src/090-the-style-guide/231-explicit-return-types-or-not.solution.ts b/src/090-the-style-guide/235-types-vs-interfaces.problem.ts similarity index 100% rename from src/090-the-style-guide/231-explicit-return-types-or-not.solution.ts rename to src/090-the-style-guide/235-types-vs-interfaces.problem.ts diff --git a/src/090-the-style-guide/232-any-vs-ts-ignore-vs-ts-expect-error.problem.ts b/src/090-the-style-guide/235-types-vs-interfaces.solution.ts similarity index 100% rename from src/090-the-style-guide/232-any-vs-ts-ignore-vs-ts-expect-error.problem.ts rename to src/090-the-style-guide/235-types-vs-interfaces.solution.ts diff --git a/src/090-the-style-guide/232-any-vs-ts-ignore-vs-ts-expect-error.solution.ts b/src/090-the-style-guide/236-dont-use-uppercase-function-object-string-boolean-as-types.problem.ts similarity index 100% rename from src/090-the-style-guide/232-any-vs-ts-ignore-vs-ts-expect-error.solution.ts rename to src/090-the-style-guide/236-dont-use-uppercase-function-object-string-boolean-as-types.problem.ts diff --git a/src/090-the-style-guide/233-dont-declare-type-and-value-with-the-same-name.problem.ts b/src/090-the-style-guide/236-dont-use-uppercase-function-object-string-boolean-as-types.solution.ts similarity index 100% rename from src/090-the-style-guide/233-dont-declare-type-and-value-with-the-same-name.problem.ts rename to src/090-the-style-guide/236-dont-use-uppercase-function-object-string-boolean-as-types.solution.ts diff --git a/src/090-the-style-guide/233-dont-declare-type-and-value-with-the-same-name.solution.ts b/src/090-the-style-guide/237-dont-use-globally-available-types.problem.ts similarity index 100% rename from src/090-the-style-guide/233-dont-declare-type-and-value-with-the-same-name.solution.ts rename to src/090-the-style-guide/237-dont-use-globally-available-types.problem.ts diff --git a/src/090-the-style-guide/234-types-vs-interfaces.problem.ts b/src/090-the-style-guide/237-dont-use-globally-available-types.solution.ts similarity index 100% rename from src/090-the-style-guide/234-types-vs-interfaces.problem.ts rename to src/090-the-style-guide/237-dont-use-globally-available-types.solution.ts diff --git a/src/090-the-style-guide/234-types-vs-interfaces.solution.ts b/src/090-the-style-guide/238-how-strict-should-you-configure-ts.problem.ts similarity index 100% rename from src/090-the-style-guide/234-types-vs-interfaces.solution.ts rename to src/090-the-style-guide/238-how-strict-should-you-configure-ts.problem.ts diff --git a/src/090-the-style-guide/235-dont-use-uppercase-function-object-string-boolean-as-types.problem.ts b/src/090-the-style-guide/238-how-strict-should-you-configure-ts.solution.ts similarity index 100% rename from src/090-the-style-guide/235-dont-use-uppercase-function-object-string-boolean-as-types.problem.ts rename to src/090-the-style-guide/238-how-strict-should-you-configure-ts.solution.ts diff --git a/src/090-the-style-guide/235-dont-use-uppercase-function-object-string-boolean-as-types.solution.ts b/src/090-the-style-guide/239-dont-unnecessarily-widen-types.problem.ts similarity index 100% rename from src/090-the-style-guide/235-dont-use-uppercase-function-object-string-boolean-as-types.solution.ts rename to src/090-the-style-guide/239-dont-unnecessarily-widen-types.problem.ts diff --git a/src/090-the-style-guide/236-dont-use-globally-available-types.problem.ts b/src/090-the-style-guide/239-dont-unnecessarily-widen-types.solution.ts similarity index 100% rename from src/090-the-style-guide/236-dont-use-globally-available-types.problem.ts rename to src/090-the-style-guide/239-dont-unnecessarily-widen-types.solution.ts diff --git a/src/090-the-style-guide/236-dont-use-globally-available-types.solution.ts b/src/095-migrating-from-javascript/240-strict-file-by-file-vs-ramp-up-strictness.problem.ts similarity index 100% rename from src/090-the-style-guide/236-dont-use-globally-available-types.solution.ts rename to src/095-migrating-from-javascript/240-strict-file-by-file-vs-ramp-up-strictness.problem.ts diff --git a/src/090-the-style-guide/237-how-strict-should-you-configure-ts.problem.ts b/src/095-migrating-from-javascript/240-strict-file-by-file-vs-ramp-up-strictness.solution.ts similarity index 100% rename from src/090-the-style-guide/237-how-strict-should-you-configure-ts.problem.ts rename to src/095-migrating-from-javascript/240-strict-file-by-file-vs-ramp-up-strictness.solution.ts diff --git a/src/090-the-style-guide/237-how-strict-should-you-configure-ts.solution.ts b/src/095-migrating-from-javascript/241-dependencies-first.problem.ts similarity index 100% rename from src/090-the-style-guide/237-how-strict-should-you-configure-ts.solution.ts rename to src/095-migrating-from-javascript/241-dependencies-first.problem.ts diff --git a/src/090-the-style-guide/238-dont-unnecessarily-widen-types.problem.ts b/src/095-migrating-from-javascript/241-dependencies-first.solution.ts similarity index 100% rename from src/090-the-style-guide/238-dont-unnecessarily-widen-types.problem.ts rename to src/095-migrating-from-javascript/241-dependencies-first.solution.ts diff --git a/src/090-the-style-guide/238-dont-unnecessarily-widen-types.solution.ts b/src/095-migrating-from-javascript/242-typing-third-party-modules.problem.ts similarity index 100% rename from src/090-the-style-guide/238-dont-unnecessarily-widen-types.solution.ts rename to src/095-migrating-from-javascript/242-typing-third-party-modules.problem.ts diff --git a/src/095-migrating-from-javascript/239-strict-file-by-file-vs-ramp-up-strictness.problem.ts b/src/095-migrating-from-javascript/242-typing-third-party-modules.solution.ts similarity index 100% rename from src/095-migrating-from-javascript/239-strict-file-by-file-vs-ramp-up-strictness.problem.ts rename to src/095-migrating-from-javascript/242-typing-third-party-modules.solution.ts diff --git a/src/095-migrating-from-javascript/239-strict-file-by-file-vs-ramp-up-strictness.solution.ts b/src/095-migrating-from-javascript/243-madge.problem.ts similarity index 100% rename from src/095-migrating-from-javascript/239-strict-file-by-file-vs-ramp-up-strictness.solution.ts rename to src/095-migrating-from-javascript/243-madge.problem.ts diff --git a/src/095-migrating-from-javascript/240-dependencies-first.problem.ts b/src/095-migrating-from-javascript/243-madge.solution.ts similarity index 100% rename from src/095-migrating-from-javascript/240-dependencies-first.problem.ts rename to src/095-migrating-from-javascript/243-madge.solution.ts diff --git a/src/095-migrating-from-javascript/243-understanding-the-structure-of-ts-errors.solution.ts b/src/095-migrating-from-javascript/243-understanding-the-structure-of-ts-errors.solution.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/095-migrating-from-javascript/244-experiments-with-jsdoc.problem.ts b/src/095-migrating-from-javascript/244-experiments-with-jsdoc.problem.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/095-migrating-from-javascript/244-experiments-with-jsdoc.solution.ts b/src/095-migrating-from-javascript/244-experiments-with-jsdoc.solution.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/095-migrating-from-javascript/240-dependencies-first.solution.ts b/src/095-migrating-from-javascript/244-understanding-the-structure-of-ts-errors.problem.ts similarity index 100% rename from src/095-migrating-from-javascript/240-dependencies-first.solution.ts rename to src/095-migrating-from-javascript/244-understanding-the-structure-of-ts-errors.problem.ts diff --git a/src/095-migrating-from-javascript/241-typing-third-party-modules.problem.ts b/src/095-migrating-from-javascript/244-understanding-the-structure-of-ts-errors.solution.ts similarity index 100% rename from src/095-migrating-from-javascript/241-typing-third-party-modules.problem.ts rename to src/095-migrating-from-javascript/244-understanding-the-structure-of-ts-errors.solution.ts diff --git a/src/095-migrating-from-javascript/241-typing-third-party-modules.solution.ts b/src/095-migrating-from-javascript/245-experiments-with-jsdoc.problem.ts similarity index 100% rename from src/095-migrating-from-javascript/241-typing-third-party-modules.solution.ts rename to src/095-migrating-from-javascript/245-experiments-with-jsdoc.problem.ts diff --git a/src/095-migrating-from-javascript/242-madge.problem.ts b/src/095-migrating-from-javascript/245-experiments-with-jsdoc.solution.ts similarity index 100% rename from src/095-migrating-from-javascript/242-madge.problem.ts rename to src/095-migrating-from-javascript/245-experiments-with-jsdoc.solution.ts diff --git a/src/095-migrating-from-javascript/245-jsdoc-cannot-pass-types-to-functions.problem.ts b/src/095-migrating-from-javascript/245-jsdoc-cannot-pass-types-to-functions.problem.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/095-migrating-from-javascript/245-jsdoc-cannot-pass-types-to-functions.solution.ts b/src/095-migrating-from-javascript/245-jsdoc-cannot-pass-types-to-functions.solution.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/095-migrating-from-javascript/242-madge.solution.ts b/src/095-migrating-from-javascript/246-jsdoc-cannot-pass-types-to-functions.problem.ts similarity index 100% rename from src/095-migrating-from-javascript/242-madge.solution.ts rename to src/095-migrating-from-javascript/246-jsdoc-cannot-pass-types-to-functions.problem.ts diff --git a/src/095-migrating-from-javascript/243-understanding-the-structure-of-ts-errors.problem.ts b/src/095-migrating-from-javascript/246-jsdoc-cannot-pass-types-to-functions.solution.ts similarity index 100% rename from src/095-migrating-from-javascript/243-understanding-the-structure-of-ts-errors.problem.ts rename to src/095-migrating-from-javascript/246-jsdoc-cannot-pass-types-to-functions.solution.ts