Merge pull request #68 from codecrafters-io/CC-1157-js-npm

ryan-gang · web-flow · commit 093f5bd0bf57 · 2024-04-27T11:38:47.000+05:30
CC-1157: add dependency resolution for js projects + update nodejs
diff --git a/compiled_starters/javascript/.gitignore b/compiled_starters/javascript/.gitignore
@@ -1 +1,2 @@
 *.db
+node_modules/
diff --git a/compiled_starters/javascript/README.md b/compiled_starters/javascript/README.md
@@ -30,7 +30,7 @@ Time to move on to the next stage!
 
 Note: This section is for stages 2 and beyond.
 
-1. Ensure you have `node (16)` installed locally
+1. Ensure you have `node (21)` installed locally
 1. Run `./your_sqlite3.sh` to run your program, which is implemented in
    `app/main.js`.
 1. Commit your changes and run `git push origin master` to submit your solution
diff --git a/compiled_starters/javascript/codecrafters.yml b/compiled_starters/javascript/codecrafters.yml
@@ -7,5 +7,5 @@ debug: false
 # Use this to change the JavaScript version used to run your code
 # on Codecrafters.
 #
-# Available versions: nodejs-18
-language_pack: nodejs-18
+# Available versions: nodejs-21
+language_pack: nodejs-21
diff --git a/compiled_starters/javascript/package-lock.json b/compiled_starters/javascript/package-lock.json
diff --git a/compiled_starters/javascript/package.json b/compiled_starters/javascript/package.json
@@ -1,9 +1,16 @@
 {
-  "name": "sqlite-starter-javascript",
-  "version": "1.0.0",
-  "description": "This is a starting point for JavaScript solutions to the Build Your Own SQLite challenge",
-  "main": "app/main.js",
-  "author": "CodeCrafters",
-  "type": "module",
-  "license": "MIT"
-}
+    "name": "@codecrafters/build-your-own-sqlite",
+    "version": "1.0.0",
+    "description": "Build your own SQLite challenge, from CodeCrafters",
+    "main": "main.js",
+    "type": "module",
+    "scripts": {
+        "dev": "node app/main.js"
+    },
+    "keywords": [
+        "build-your-own-x"
+    ],
+    "author": "",
+    "license": "MIT",
+    "dependencies": {}
+}
diff --git a/dockerfiles/nodejs-21.Dockerfile b/dockerfiles/nodejs-21.Dockerfile
@@ -0,0 +1,15 @@
+FROM node:21.7-alpine3.19
+
+ENV CODECRAFTERS_DEPENDENCY_FILE_PATHS="package.json,package-lock.json"
+
+WORKDIR /app
+
+COPY package.json ./
+COPY package-lock.json ./
+
+# If dependencies in the package lock do not match those in package.json, instead of updating the package lock, npm ci will exit with an error. 
+RUN npm ci
+
+RUN mkdir -p /app-cached
+# If the node_modules directory exists, move it to /app-cached
+RUN if [ -d "/app/node_modules" ]; then mv /app/node_modules /app-cached; fi
diff --git a/solutions/javascript/01-init/code/.gitignore b/solutions/javascript/01-init/code/.gitignore
@@ -1 +1,2 @@
 *.db
+node_modules/
diff --git a/solutions/javascript/01-init/code/README.md b/solutions/javascript/01-init/code/README.md
@@ -30,7 +30,7 @@ Time to move on to the next stage!
 
 Note: This section is for stages 2 and beyond.
 
-1. Ensure you have `node (16)` installed locally
+1. Ensure you have `node (21)` installed locally
 1. Run `./your_sqlite3.sh` to run your program, which is implemented in
    `app/main.js`.
 1. Commit your changes and run `git push origin master` to submit your solution
diff --git a/solutions/javascript/01-init/code/codecrafters.yml b/solutions/javascript/01-init/code/codecrafters.yml
@@ -7,5 +7,5 @@ debug: false
 # Use this to change the JavaScript version used to run your code
 # on Codecrafters.
 #
-# Available versions: nodejs-18
-language_pack: nodejs-18
+# Available versions: nodejs-21
+language_pack: nodejs-21
diff --git a/solutions/javascript/01-init/code/package-lock.json b/solutions/javascript/01-init/code/package-lock.json
diff --git a/solutions/javascript/01-init/code/package.json b/solutions/javascript/01-init/code/package.json
@@ -1,9 +1,16 @@
 {
-  "name": "sqlite-starter-javascript",
-  "version": "1.0.0",
-  "description": "This is a starting point for JavaScript solutions to the Build Your Own SQLite challenge",
-  "main": "app/main.js",
-  "author": "CodeCrafters",
-  "type": "module",
-  "license": "MIT"
-}
+    "name": "@codecrafters/build-your-own-sqlite",
+    "version": "1.0.0",
+    "description": "Build your own SQLite challenge, from CodeCrafters",
+    "main": "main.js",
+    "type": "module",
+    "scripts": {
+        "dev": "node app/main.js"
+    },
+    "keywords": [
+        "build-your-own-x"
+    ],
+    "author": "",
+    "license": "MIT",
+    "dependencies": {}
+}
diff --git a/starter-repository-definitions.yml b/starter-repository-definitions.yml
@@ -67,14 +67,18 @@
       target: app/main.js
     - source: starter_templates/javascript/package.json
       target: package.json
+    - source: starter_templates/javascript/package-lock.json
+      target: package-lock.json
     - source: starter_templates/.gitignore
       target: .gitignore
     - source: starter_templates/javascript/your_sqlite3.sh
       target: your_sqlite3.sh
     - source: starter_templates/.gitattributes
       target: .gitattributes
+    - source: starter_templates/javascript/.gitignore
+      target: .gitignore
   template_attributes:
-    required_executable: "node (16)"
+    required_executable: "node (21)"
     user_editable_file: "app/main.js"
 
 - language: rust
diff --git a/starter_templates/codecrafters.yml b/starter_templates/codecrafters.yml
@@ -24,8 +24,8 @@ language_pack: go-1.22
 language_pack: php-7.4
 {{/ language_is_php }}
 {{# language_is_javascript }}
-# Available versions: nodejs-18
-language_pack: nodejs-18
+# Available versions: nodejs-21
+language_pack: nodejs-21
 {{/ language_is_javascript }}
 {{# language_is_c }}
 # Available versions: c-9.2
diff --git a/starter_templates/javascript/.gitignore b/starter_templates/javascript/.gitignore
@@ -0,0 +1,2 @@
+*.db
+node_modules/
diff --git a/starter_templates/javascript/package-lock.json b/starter_templates/javascript/package-lock.json
diff --git a/starter_templates/javascript/package.json b/starter_templates/javascript/package.json
@@ -1,9 +1,16 @@
 {
-  "name": "sqlite-starter-javascript",
-  "version": "1.0.0",
-  "description": "This is a starting point for JavaScript solutions to the Build Your Own SQLite challenge",
-  "main": "app/main.js",
-  "author": "CodeCrafters",
-  "type": "module",
-  "license": "MIT"
-}
+    "name": "@codecrafters/build-your-own-sqlite",
+    "version": "1.0.0",
+    "description": "Build your own SQLite challenge, from CodeCrafters",
+    "main": "main.js",
+    "type": "module",
+    "scripts": {
+        "dev": "node app/main.js"
+    },
+    "keywords": [
+        "build-your-own-x"
+    ],
+    "author": "",
+    "license": "MIT",
+    "dependencies": {}
+}

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ debug: false`
`7`	`7`	`# Use this to change the JavaScript version used to run your code`
`8`	`8`	`# on Codecrafters.`
`9`	`9`	`#`
`10`		`-# Available versions: nodejs-18`
`11`		`-language_pack: nodejs-18`
	`10`	`+# Available versions: nodejs-21`
	`11`	`+language_pack: nodejs-21`