diff --git a/src/google-clasp/devcontainer-feature.json b/src/google-clasp/devcontainer-feature.json index a23c733..010fa3a 100644 --- a/src/google-clasp/devcontainer-feature.json +++ b/src/google-clasp/devcontainer-feature.json @@ -2,19 +2,13 @@ "name": "@google/clasp (via npm)", "id": "google-clasp", "version": "1.0.0", - "description": "Install the @google/clasp with @types/google-apps-script package via NPM registry", + "description": "Install the @google/clasp package via NPM registry", "options": { "version": { "type": "string", "proposals": ["latest"], "default": "latest", "description": "Select or enter a @google/clasp version." - }, - "types": { - "type": "string", - "proposals": ["latest"], - "default": "latest", - "description": "Select or enter a @types/google-apps-script version(pass blank to not install)." } }, "installsAfter": [ diff --git a/src/google-clasp/install.sh b/src/google-clasp/install.sh index 38c4633..2bd4ff9 100644 --- a/src/google-clasp/install.sh +++ b/src/google-clasp/install.sh @@ -2,8 +2,6 @@ TARGET_PACKAGE="@google/clasp" TARGET_VERSION=${VERSION:-"latest"} -TARGET_TYPES_PACKAGE="@types/google-apps-script" -TARGET_TYPES_VERSION=${TYPES:-"latest"} set -e @@ -21,10 +19,6 @@ install_packages() { echo "Installing npm package: ${TARGET_PACKAGE}@${TARGET_VERSION}" npm install --global --omit=dev --no-progress --cache "${TEMP_CACHE}" "${TARGET_PACKAGE}@${TARGET_VERSION}" - if test "${TARGET_TYPES_PACKAGE}" != ""; then - echo "Installing npm package: ${TARGET_TYPES_PACKAGE}@${TARGET_TYPES_VERSION}" - npm install --global --omit=dev --no-progress --cache "${TEMP_CACHE}" "${TARGET_TYPES_PACKAGE}@${TARGET_TYPES_VERSION}" - fi } # Check if npm is installed diff --git a/test/google-clasp/scenarios.json b/test/google-clasp/scenarios.json index 180ef46..35abea6 100644 --- a/test/google-clasp/scenarios.json +++ b/test/google-clasp/scenarios.json @@ -14,37 +14,5 @@ } }, "remoteUser": "node" - }, - "types_v1.0.0": { - "image": "mcr.microsoft.com/devcontainers/base:ubuntu", - "features": { - "ghcr.io/devcontainers/features/common-utils:1": { - "installZsh": false, - "installOhMyZsh": false, - "upgradePackages": false, - "username": "node" - }, - "ghcr.io/devcontainers/features/node:1": {}, - "google-clasp": { - "types": "1.0.0" - } - }, - "remoteUser": "node" - }, - "types_none": { - "image": "mcr.microsoft.com/devcontainers/base:ubuntu", - "features": { - "ghcr.io/devcontainers/features/common-utils:1": { - "installZsh": false, - "installOhMyZsh": false, - "upgradePackages": false, - "username": "node" - }, - "ghcr.io/devcontainers/features/node:1": {}, - "google-clasp": { - "types": "" - } - }, - "remoteUser": "node" } } diff --git a/test/google-clasp/test.sh b/test/google-clasp/test.sh index 62ae4dd..9f61c94 100644 --- a/test/google-clasp/test.sh +++ b/test/google-clasp/test.sh @@ -14,7 +14,6 @@ source dev-container-features-test-lib # The 'check' command comes from the dev-container-features-test-lib. check "Check @google/clasp is installed" clasp --version -check "Check types(@types/google-apps-script) is installed" npm list --global --depth 0 | grep -q "@types/google-apps-script@" # Report result # If any of the checks above exited with a non-zero exit code, the test will fail. diff --git a/test/google-clasp/types_none.sh b/test/google-clasp/types_none.sh deleted file mode 100644 index bd8fd7c..0000000 --- a/test/google-clasp/types_none.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -set -e - -# Optional: Import test library bundled with the devcontainer CLI -# Provides the 'check' and 'reportResults' commands. -# shellcheck source=/dev/null -source dev-container-features-test-lib - -# Feature-specific tests -# The 'check' command comes from the dev-container-features-test-lib. -check "Check @google/clasp is installed" clasp --version -check "Check types(@types/google-apps-script) is not installed" npm list --global --depth 0 | grep -v -q "@types/google-apps-script@" - -# Report result -# If any of the checks above exited with a non-zero exit code, the test will fail. -reportResults diff --git a/test/google-clasp/types_v1.0.0.sh b/test/google-clasp/types_v1.0.0.sh deleted file mode 100644 index 554c6ce..0000000 --- a/test/google-clasp/types_v1.0.0.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -set -e - -# Optional: Import test library bundled with the devcontainer CLI -# Provides the 'check' and 'reportResults' commands. -# shellcheck source=/dev/null -source dev-container-features-test-lib - -# Feature-specific tests -# The 'check' command comes from the dev-container-features-test-lib. -check "Check @google/clasp is installed" clasp --version -check "Check types(@types/google-apps-script) is installed" npm list --global --depth 0 | grep -q "@types/google-apps-script@1.0.0" - -# Report result -# If any of the checks above exited with a non-zero exit code, the test will fail. -reportResults diff --git a/test/google-clasp/v2.4.0.sh b/test/google-clasp/v2.4.0.sh index cf99055..fed1cab 100644 --- a/test/google-clasp/v2.4.0.sh +++ b/test/google-clasp/v2.4.0.sh @@ -11,7 +11,6 @@ source dev-container-features-test-lib # The 'check' command comes from the dev-container-features-test-lib. # clasp 2.4.0 は動作しないので、パッケージの存在確認のみ行う。 check "Check @google/clasp@2.4.0 is installed" npm list --global --depth 0 | grep -q "@google/clasp@2.4.0" -check "Check types(@types/google-apps-script) is installed" npm list --global --depth 0 | grep -q "@types/google-apps-script@" # Report result # If any of the checks above exited with a non-zero exit code, the test will fail.