diff --git a/.circleci/config.yml b/.circleci/config.yml index 9dbc1f39528b..d5310992f947 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: system: docker: - - image: circleci/node:10.18-browsers + - image: circleci/node:12-browsers working_directory: ~/repo steps: - checkout diff --git a/.github/workflows/deploy-react-storybook.yml b/.github/workflows/deploy-react-storybook.yml index 4a51a5777b7a..2a1675ee96ec 100644 --- a/.github/workflows/deploy-react-storybook.yml +++ b/.github/workflows/deploy-react-storybook.yml @@ -16,10 +16,10 @@ jobs: runs-on: macOS-latest steps: - uses: actions/checkout@master - - name: Use Node.js 10.x + - name: Use Node.js 12.x uses: actions/setup-node@v1 with: - node-version: '10.x' + node-version: '12.x' - name: Install dependencies run: yarn install --offline - name: Build project diff --git a/.github/workflows/deploy-vanilla-devenv.yml b/.github/workflows/deploy-vanilla-devenv.yml index 9dcc5172e914..dbedd8921b24 100644 --- a/.github/workflows/deploy-vanilla-devenv.yml +++ b/.github/workflows/deploy-vanilla-devenv.yml @@ -16,10 +16,10 @@ jobs: runs-on: macOS-latest steps: - uses: actions/checkout@master - - name: Use Node.js 10.x + - name: Use Node.js 12.x uses: actions/setup-node@v1 with: - node-version: '10.x' + node-version: '12.x' - name: Install dependencies run: yarn install --offline - name: Build project diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml index 36c2b8802997..fbf6aa027ee2 100644 --- a/.github/workflows/nightly-release.yml +++ b/.github/workflows/nightly-release.yml @@ -10,10 +10,10 @@ jobs: runs-on: macOS-latest steps: - uses: actions/checkout@master - - name: Use Node.js 10.x + - name: Use Node.js 12.x uses: actions/setup-node@v1 with: - node-version: '10.x' + node-version: '12.x' - name: Install dependencies run: yarn install --offline - name: Build project diff --git a/.github/workflows/sync-generated-files.yml b/.github/workflows/sync-generated-files.yml index 7fc445e1b35c..1645ebb7e82c 100644 --- a/.github/workflows/sync-generated-files.yml +++ b/.github/workflows/sync-generated-files.yml @@ -8,10 +8,10 @@ jobs: runs-on: macOS-latest steps: - uses: actions/checkout@v1 - - name: Use Node.js 10.x + - name: Use Node.js 12.x uses: actions/setup-node@v1 with: - node-version: '10.x' + node-version: '12.x' - name: Install dependencies run: yarn install --offline - name: Build project diff --git a/.nvmrc b/.nvmrc index f599e28b8ab0..3cacc0b93c9c 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -10 +12 \ No newline at end of file diff --git a/.yarn/offline-mirror/node-sass-3.13.1.tgz b/.yarn/offline-mirror/node-sass-3.13.1.tgz deleted file mode 100644 index 43164a4c1e27..000000000000 Binary files a/.yarn/offline-mirror/node-sass-3.13.1.tgz and /dev/null differ diff --git a/.yarn/offline-mirror/scss-to-json-1.1.0.tgz b/.yarn/offline-mirror/scss-to-json-1.1.0.tgz deleted file mode 100644 index b3ab00564099..000000000000 Binary files a/.yarn/offline-mirror/scss-to-json-1.1.0.tgz and /dev/null differ diff --git a/.yarn/offline-mirror/scss-to-json-2.0.0.tgz b/.yarn/offline-mirror/scss-to-json-2.0.0.tgz new file mode 100644 index 000000000000..e33229ce4874 Binary files /dev/null and b/.yarn/offline-mirror/scss-to-json-2.0.0.tgz differ diff --git a/package.json b/package.json index 72f9d7a9c5af..81cd9b3ad8df 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "repository": "git@github.com:carbon-design-system/carbon.git", "license": "Apache-2.0", "engines": { - "node": "10.x" + "node": "12.x" }, "workspaces": { "packages": [ diff --git a/packages/components/package.json b/packages/components/package.json index a14598b2290c..baf08543e3f7 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -69,6 +69,7 @@ "carbon-icons": "^7.0.7", "flatpickr": "4.6.1", "lodash.debounce": "^4.0.8", + "scss-to-json": "^2.0.0", "warning": "^3.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index a2e81d2da627..d049fc1b270e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15694,7 +15694,7 @@ mz@^2.5.0: object-assign "^4.0.1" thenify-all "^1.0.0" -nan@^2.12.1, nan@^2.13.2, nan@^2.3.2: +nan@^2.12.1, nan@^2.13.2: version "2.14.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== @@ -15886,7 +15886,7 @@ node-fetch@^2.3.0, node-fetch@^2.5.0, node-fetch@^2.6.0: resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== -node-gyp@^3.3.1, node-gyp@^3.8.0: +node-gyp@^3.8.0: version "3.8.0" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c" integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA== @@ -15992,29 +15992,7 @@ node-releases@^1.1.29, node-releases@^1.1.46: dependencies: semver "^6.3.0" -node-sass@^3.1.2: - version "3.13.1" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-3.13.1.tgz#7240fbbff2396304b4223527ed3020589c004fc2" - integrity sha1-ckD7v/I5YwS0IjUn7TAgWJwAT8I= - dependencies: - async-foreach "^0.1.3" - chalk "^1.1.1" - cross-spawn "^3.0.0" - gaze "^1.0.0" - get-stdin "^4.0.1" - glob "^7.0.3" - in-publish "^2.0.0" - lodash.assign "^4.2.0" - lodash.clonedeep "^4.3.2" - meow "^3.7.0" - mkdirp "^0.5.1" - nan "^2.3.2" - node-gyp "^3.3.1" - npmlog "^4.0.0" - request "^2.61.0" - sass-graph "^2.1.1" - -node-sass@^4.13.1, node-sass@^4.8.3: +"node-sass@^3.1.2, ^4.0.0", node-sass@^4.13.1, node-sass@^4.8.3: version "4.13.1" resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.1.tgz#9db5689696bb2eec2c32b98bfea4c7a2e992d0a3" integrity sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw== @@ -19303,7 +19281,7 @@ request-promise-native@^1.0.5: stealthy-require "^1.1.1" tough-cookie "^2.3.3" -"request@>=2.76.0 <3.0.0", request@^2.61.0, request@^2.76.0, request@^2.87.0, request@^2.88.0: +"request@>=2.76.0 <3.0.0", request@^2.76.0, request@^2.87.0, request@^2.88.0: version "2.88.0" resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== @@ -19923,7 +19901,7 @@ sass-convert@^0.5.0: through2 "^2.0.0" which "^1.0.5" -sass-graph@^2.1.1, sass-graph@^2.2.4: +sass-graph@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k= @@ -20076,14 +20054,14 @@ scss-comment-parser@^0.8.4: dependencies: cdocparser "^0.13.0" -scss-to-json@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/scss-to-json/-/scss-to-json-1.1.0.tgz#a76555605b27db15114156797928e3d3ddf62128" - integrity sha1-p2VVYFsn2xURQVZ5eSjj0932ISg= +scss-to-json@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/scss-to-json/-/scss-to-json-2.0.0.tgz#dd8f74869da3d99fb44c8f5235f534ebb130ea47" + integrity sha512-XIh0Va7RiozUtUBznXiaxlqam6FQiEvJQs7HnnNZ5o7qn3KwswF1sLd8Rn9ezVufSK7VnCEKkbwkVNZ+JXNnfA== dependencies: cssmin "^0.4.3" minimist "^1.2.0" - node-sass "^3.1.2" + node-sass "^3.1.2, ^4.0.0" scss-tokenizer@^0.2.3: version "0.2.3"